From bd36316b7a69e38f29f4e6f191d9b5a0638d99e4 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 04 Jul 2024 16:05:13 +0800
Subject: [PATCH] 逻辑
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 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 10a189c..04e33bd 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
@@ -406,31 +406,36 @@
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());
-
- List<Long> collectDirect = directCntAva.stream().map(DappMemberEntity::getId).collect(Collectors.toList());
- QueryWrapper<DappStorage> storageQueryWrapper = new QueryWrapper<>();
- storageQueryWrapper.in("member_id",collectDirect);
- storageQueryWrapper.eq("state",1);
- List<DappStorage> dappStoragesDirect = dappStorageMapper.selectList(storageQueryWrapper);
- BigDecimal directAchieve = dappStoragesDirect.stream()
- .map(DappStorage::getAmount) // 映射amount到流中
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- teamUpVo.setDirectAchieve(directAchieve);
+ if(CollUtil.isNotEmpty(directCntAva)){
+ List<Long> collectDirect = directCntAva.stream().map(DappMemberEntity::getId).collect(Collectors.toList());
+ QueryWrapper<DappStorage> storageQueryWrapper = new QueryWrapper<>();
+ storageQueryWrapper.in("member_id",collectDirect);
+ storageQueryWrapper.eq("state",1);
+ List<DappStorage> dappStoragesDirect = dappStorageMapper.selectList(storageQueryWrapper);
+ BigDecimal directAchieve = dappStoragesDirect.stream()
+ .map(DappStorage::getAmount) // 映射amount到流中
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ teamUpVo.setDirectAchieve(directAchieve);
+ }
+ teamUpVo.setDirectAchieve(BigDecimal.ZERO);
List<DappMemberEntity> teamMembers = dappMemberDao.selectChildMemberDirectOrNot(memberEntity.getInviteId(), 2, null);
teamUpVo.setTeamCnt(CollUtil.isNotEmpty(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());
- 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);
- teamUpVo.setTeamAchieve(teamAchieve);
+ if(CollUtil.isNotEmpty(directCntAva)){
+ 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);
+ teamUpVo.setTeamAchieve(teamAchieve);
+ }
+ teamUpVo.setTeamAchieve(BigDecimal.ZERO);
}
return teamUpVo;
}
--
Gitblit v1.9.1