From 8607f658554c0c1aa2e2f6d7377ce398efb78902 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 04 Jul 2024 16:12:07 +0800
Subject: [PATCH] 逻辑
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 04e33bd..a068b0a 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
@@ -405,7 +405,7 @@
}else{
teamUpVo.setDirectCnt(CollUtil.isNotEmpty(directMembers) ? 0 : directMembers.size());
List<DappMemberEntity> directCntAva = directMembers.stream().filter(dappMemberEntity -> dappMemberEntity.getActiveStatus() == 1).collect(Collectors.toList());
- teamUpVo.setDirectCntAva(CollUtil.isNotEmpty(directCntAva) ? 0 : directCntAva.size());
+ teamUpVo.setDirectCntAva(CollUtil.isEmpty(directCntAva) ? 0 : directCntAva.size());
if(CollUtil.isNotEmpty(directCntAva)){
List<Long> collectDirect = directCntAva.stream().map(DappMemberEntity::getId).collect(Collectors.toList());
QueryWrapper<DappStorage> storageQueryWrapper = new QueryWrapper<>();
@@ -416,11 +416,12 @@
.map(DappStorage::getAmount) // 映射amount到流中
.reduce(BigDecimal.ZERO, BigDecimal::add);
teamUpVo.setDirectAchieve(directAchieve);
+ }else{
+ teamUpVo.setDirectAchieve(BigDecimal.ZERO);
}
- teamUpVo.setDirectAchieve(BigDecimal.ZERO);
List<DappMemberEntity> teamMembers = dappMemberDao.selectChildMemberDirectOrNot(memberEntity.getInviteId(), 2, null);
- teamUpVo.setTeamCnt(CollUtil.isNotEmpty(teamMembers) ? 0 : teamMembers.size());
+ teamUpVo.setTeamCnt(CollUtil.isEmpty(teamMembers) ? 0 : teamMembers.size());
List<DappMemberEntity> teamCntAva = teamMembers.stream().filter(dappMemberEntity -> dappMemberEntity.getActiveStatus() == 1).collect(Collectors.toList());
teamUpVo.setTeamCntAva(CollUtil.isNotEmpty(teamCntAva) ? 0 : teamCntAva.size());
@@ -434,8 +435,9 @@
.map(DappStorage::getAmount) // 映射amount到流中
.reduce(BigDecimal.ZERO, BigDecimal::add);
teamUpVo.setTeamAchieve(teamAchieve);
+ }else{
+ teamUpVo.setTeamAchieve(BigDecimal.ZERO);
}
- teamUpVo.setTeamAchieve(BigDecimal.ZERO);
}
return teamUpVo;
}
--
Gitblit v1.9.1