From 4249f77b8fada31ce5e917fa5b7ccec523a71af1 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 04 Jul 2024 16:48:09 +0800
Subject: [PATCH] 逻辑
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 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 c116238..acd4a94 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
@@ -455,25 +455,32 @@
for(DappMemberEntity directMember : directMembers){
TeamDownVo teamDownVo = new TeamDownVo();
+
+
+ teamDownVo.setAddress(directMember.getAddress());
List<DappMemberEntity> teamMembers = dappMemberDao.selectChildMemberDirectOrNot(directMember.getInviteId(), 2, null);
if(CollUtil.isEmpty(teamMembers)){
- teamDownVo.setAddress(directMember.getAddress());
teamDownVo.setActiveCnt(0);
teamDownVo.setActiveAchieve(BigDecimal.ZERO);
}else{
List<DappMemberEntity> teamCntAva = teamMembers.stream().filter(dappMemberEntity -> dappMemberEntity.getActiveStatus() == 1).collect(Collectors.toList());
List<Long> collectTeam = teamCntAva.stream().map(DappMemberEntity::getId).collect(Collectors.toList());
- QueryWrapper<DappStorage> collectTeamWrapper = new QueryWrapper<>();
- collectTeamWrapper.in("member_id",collectTeam);
- collectTeamWrapper.eq("state",1);
- List<DappStorage> dappStoragesTeam = dappStorageMapper.selectList(collectTeamWrapper);
- BigDecimal teamAchieve = dappStoragesTeam.stream()
- .map(DappStorage::getAmount) // 映射amount到流中
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- teamDownVo.setAddress(directMember.getAddress());
- teamDownVo.setActiveCnt(teamCntAva.size());
- teamDownVo.setActiveAchieve(teamAchieve);
+ if(CollUtil.isNotEmpty(collectTeam)){
+ QueryWrapper<DappStorage> collectTeamWrapper = new QueryWrapper<>();
+ collectTeamWrapper.in("member_id",collectTeam);
+ collectTeamWrapper.eq("state",1);
+ List<DappStorage> dappStoragesTeam = dappStorageMapper.selectList(collectTeamWrapper);
+ BigDecimal teamAchieve = dappStoragesTeam.stream()
+ .map(DappStorage::getAmount) // 映射amount到流中
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ teamDownVo.setActiveCnt(teamCntAva.size());
+ teamDownVo.setActiveAchieve(teamAchieve);
+ }else{
+ teamDownVo.setActiveCnt(0);
+ teamDownVo.setActiveAchieve(BigDecimal.ZERO);
+ }
}
objects.add(teamDownVo);
--
Gitblit v1.9.1