KKSU
2024-07-04 4249f77b8fada31ce5e917fa5b7ccec523a71af1
逻辑
1 files modified
11 ■■■■ changed files
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java 11 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -455,14 +455,18 @@
            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());
                    if(CollUtil.isNotEmpty(collectTeam)){
                    QueryWrapper<DappStorage> collectTeamWrapper = new QueryWrapper<>();
                    collectTeamWrapper.in("member_id",collectTeam);
                    collectTeamWrapper.eq("state",1);
@@ -471,9 +475,12 @@
                            .map(DappStorage::getAmount) // 映射amount到流中
                            .reduce(BigDecimal.ZERO, BigDecimal::add);
                    teamDownVo.setAddress(directMember.getAddress());
                    teamDownVo.setActiveCnt(teamCntAva.size());
                    teamDownVo.setActiveAchieve(teamAchieve);
                    }else{
                        teamDownVo.setActiveCnt(0);
                        teamDownVo.setActiveAchieve(BigDecimal.ZERO);
                    }
                }
                objects.add(teamDownVo);