From 855b8a7835bfffd7e81ef5fb2d9e6bad133136c9 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sat, 06 Jul 2024 23:02:04 +0800
Subject: [PATCH] 逻辑
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 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..ab6a666 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();
@@ -1009,7 +1014,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