From 4a347c0ab4b88fd792d24d30bed36b1fa769d3a2 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 15 Jul 2024 14:14:04 +0800
Subject: [PATCH] 逻辑
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 80 +++++++++++++++++++++------------------
1 files changed, 43 insertions(+), 37 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
index 8b530f2..6e1372c 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
@@ -606,18 +606,23 @@
* * 21-25代奖励4%
* * 26-30代奖励7%
*/
- DappFundFlowEntity dappFundFlowEntity = dappFundFlowDao.selectById(id);
- if(ObjectUtil.isEmpty(dappFundFlowEntity)){
+// DappFundFlowEntity dappFundFlowEntity = dappFundFlowDao.selectById(id);
+// if(ObjectUtil.isEmpty(dappFundFlowEntity)){
+// return;
+// }
+// if(DappFundFlowEntity.WITHDRAW_STATUS_AGREE != dappFundFlowEntity.getStatus()){
+// return;
+// }
+ DappStorage dappStorage = dappStorageMapper.selectById(id);
+
+ if(ObjectUtil.isEmpty(dappStorage)){
return;
}
- if(DappFundFlowEntity.WITHDRAW_STATUS_AGREE != dappFundFlowEntity.getStatus()){
- return;
- }
- BigDecimal amount = dappFundFlowEntity.getAmount().abs();
+ BigDecimal amount = dappStorage.getReleaseAmount().abs();
/**
* 往上循环30层，判断每一层是否有见点奖
*/
- Long memberId = dappFundFlowEntity.getMemberId();
+ Long memberId = dappStorage.getMemberId();
for(int i = 1;i <= 30;i++){
DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
String refererId = dappMemberEntity.getRefererId();
@@ -830,39 +835,39 @@
if(ObjectUtil.isEmpty(dappMemberEntity)){
return;
}
- if(1 != dappMemberEntity.getActiveStatus()){
- return;
- }
+// if(1 != dappMemberEntity.getActiveStatus()){
+// return;
+// }
//减少用户的总额度
- BigDecimal usdtBalance = dappMemberEntity.getUsdtBalance();
- if(BigDecimal.ZERO.compareTo(usdtBalance) >= 0){
- return;
- }
- if(daoNodeAmount.compareTo(usdtBalance) >= 0){
- daoNodeAmount = usdtBalance;
- usdtBalance = BigDecimal.ZERO;
- }else{
- usdtBalance = usdtBalance.subtract(daoNodeAmount);
- }
+// BigDecimal usdtBalance = dappMemberEntity.getUsdtBalance();
+// if(BigDecimal.ZERO.compareTo(usdtBalance) >= 0){
+// return;
+// }
+// if(daoNodeAmount.compareTo(usdtBalance) >= 0){
+// daoNodeAmount = usdtBalance;
+// usdtBalance = BigDecimal.ZERO;
+// }else{
+// usdtBalance = usdtBalance.subtract(daoNodeAmount);
+// }
//总额度为0，用户变成未激活
- if(BigDecimal.ZERO.compareTo(usdtBalance) >= 0){
- dappMemberEntity.setActiveStatus(2);
- //更新用户所有的业绩为已失效
- QueryWrapper<DappStorage> objectQueryWrapper = new QueryWrapper<>();
- objectQueryWrapper.eq("member_id",memberId);
- objectQueryWrapper.eq("state",1);
- List<DappStorage> dappStorages = dappStorageMapper.selectList(objectQueryWrapper);
- if(CollUtil.isNotEmpty(dappStorages)){
- for(DappStorage dappStorage : dappStorages){
- dappStorage.setState(2);
- dappStorageMapper.updateById(dappStorage);
- }
- }
- }
- dappMemberEntity.setUsdtBalance(usdtBalance);
- dappMemberDao.updateById(dappMemberEntity);
+// if(BigDecimal.ZERO.compareTo(usdtBalance) >= 0){
+// dappMemberEntity.setActiveStatus(2);
+// //更新用户所有的业绩为已失效
+// QueryWrapper<DappStorage> objectQueryWrapper = new QueryWrapper<>();
+// objectQueryWrapper.eq("member_id",memberId);
+// objectQueryWrapper.eq("state",1);
+// List<DappStorage> dappStorages = dappStorageMapper.selectList(objectQueryWrapper);
+// if(CollUtil.isNotEmpty(dappStorages)){
+// for(DappStorage dappStorage : dappStorages){
+// dappStorage.setState(2);
+// dappStorageMapper.updateById(dappStorage);
+// }
+// }
+// }
+// dappMemberEntity.setUsdtBalance(usdtBalance);
+// dappMemberDao.updateById(dappMemberEntity);
dappWalletService.updateWalletCoinWithLock(daoNodeAmount, memberId, 1);
DappFundFlowEntity nodeFlow = new DappFundFlowEntity(
@@ -1002,6 +1007,7 @@
for(DappMemberEntity directMember : directMembers){
//每一个直推的团队
List<DappMemberEntity> direct = dappMemberDao.selectChildMemberDirectOrNot(directMember.getInviteId(), 2, null);
+ direct.add(directMember);
if(CollUtil.isEmpty(direct)){
continue;
}
@@ -1009,7 +1015,7 @@
List<Long> collect = direct.stream().map(DappMemberEntity::getId).collect(Collectors.toList());
QueryWrapper<DappStorage> storageQueryWrapper = new QueryWrapper<>();
storageQueryWrapper.in("member_id",collect);
- storageQueryWrapper.eq("state",1);
+// storageQueryWrapper.eq("state",1);
List<DappStorage> dappStorages = dappStorageMapper.selectList(storageQueryWrapper);
if(CollUtil.isEmpty(dappStorages)){
continue;
--
Gitblit v1.9.1