KKSU
2024-07-05 be02a8069d9621eab28dc8017e447b3225b3833a
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -449,31 +449,39 @@
        DappMemberEntity memberEntity = dappMemberDao.selectById(memberId);
        List<DappMemberEntity> directMembers = dappMemberDao.selectChildMemberDirectOrNot(memberEntity.getInviteId(), 1, null);
        directMembers.add(memberEntity);
        if(CollUtil.isNotEmpty(directMembers)){
            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);