KKSU
2024-07-04 bd36316b7a69e38f29f4e6f191d9b5a0638d99e4
逻辑
1 files modified
7 ■■■■ changed files
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java 7 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -406,7 +406,7 @@
            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());
            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);
@@ -416,12 +416,15 @@
                    .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());
            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);
@@ -432,6 +435,8 @@
                    .reduce(BigDecimal.ZERO, BigDecimal::add);
            teamUpVo.setTeamAchieve(teamAchieve);
        }
            teamUpVo.setTeamAchieve(BigDecimal.ZERO);
        }
        return teamUpVo;
    }