From e2c478aba7fde357ac89fdc8773e792aae3682d4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 15 Aug 2023 17:41:36 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index da79277..f7bb9b9 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -1050,28 +1050,32 @@
//获取每个人的业绩
//业绩集合
List<BigDecimal> list = new ArrayList<>();
- //总业绩
- BigDecimal teamIncomeMax = BigDecimal.ZERO;
//所有直推团队，就是这个会员的所有区域的业绩。
- // 直推用户
- List<DappMemberEntity> childs = dappMemberDao.selectMemberInfoByRefererId(dappMemberEntity.getInviteId());
- List<String> childsInviteIds = childs.stream().map(DappMemberEntity::getInviteId).collect(Collectors.toList());
- if(CollUtil.isNotEmpty(childsInviteIds)){
- for(String inviteId : childsInviteIds){
- BigDecimal totalIncomeMember = dappMemberDao.selectAchieveRecordByInviteId(inviteId);
- teamIncomeMax = teamIncomeMax.add(totalIncomeMember);
- list.add(totalIncomeMember);
- }
- //去掉一个最大区的业绩
- BigDecimal bigMax = list.stream().max(BigDecimal::compareTo).get();
- teamIncomeMax = teamIncomeMax.subtract(bigMax);
-
- MallAchieveRecord mallAchieveRecord = new MallAchieveRecord();
- mallAchieveRecord.setMemberId(dappMemberEntity.getId());
- mallAchieveRecord.setAmount(teamIncomeMax);
- mallAchieveRecordList.add(mallAchieveRecord);
+ BigDecimal teamIncomeMax = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(dappMemberEntity.getId(),
+ FundFlowEnum.ADD_AMOUNT_REAL.getCode(),
+ DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
+ if(BigDecimal.ZERO.compareTo(teamIncomeMax) >= 0){
+ continue;
}
+
+ MallAchieveRecord mallAchieveRecord = new MallAchieveRecord();
+ mallAchieveRecord.setMemberId(dappMemberEntity.getId());
+ mallAchieveRecord.setAmount(teamIncomeMax);
+ mallAchieveRecordList.add(mallAchieveRecord);
+// // 直推用户
+// List<DappMemberEntity> childs = dappMemberDao.selectMemberInfoByRefererId(dappMemberEntity.getInviteId());
+// List<String> childsInviteIds = childs.stream().map(DappMemberEntity::getInviteId).collect(Collectors.toList());
+// if(CollUtil.isNotEmpty(childsInviteIds)){
+// for(String inviteId : childsInviteIds){
+// BigDecimal totalIncomeMember = dappMemberDao.selectAchieveRecordByInviteId(inviteId);
+// teamIncomeMax = teamIncomeMax.add(totalIncomeMember);
+// list.add(totalIncomeMember);
+// }
+// //去掉一个最大区的业绩
+// BigDecimal bigMax = list.stream().max(BigDecimal::compareTo).get();
+// teamIncomeMax = teamIncomeMax.subtract(bigMax);
+// }
}
if(CollUtil.isNotEmpty(mallAchieveRecordList)){
//按照小区业绩的多少排名
--
Gitblit v1.9.1