逻辑

KKSU

2024-07-08 f0922bc416fad3aa6121ffdbdd217bffb94f518f

 src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java

@@ -403,39 +403,41 @@
            teamUpVo.setDirectCntAva(0);
            teamUpVo.setDirectAchieve(BigDecimal.ZERO);
        }else{
            teamUpVo.setDirectCnt(CollUtil.isNotEmpty(directMembers) ? 0 : directMembers.size());
            teamUpVo.setDirectCnt(CollUtil.isEmpty(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());
            teamUpVo.setDirectCntAva(CollUtil.isEmpty(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);
                storageQueryWrapper.eq("state",1);
//                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);
            }else{
                teamUpVo.setDirectAchieve(BigDecimal.ZERO);
            }
            teamUpVo.setDirectAchieve(BigDecimal.ZERO);

            List<DappMemberEntity> teamMembers = dappMemberDao.selectChildMemberDirectOrNot(memberEntity.getInviteId(), 2, null);
            teamUpVo.setTeamCnt(CollUtil.isNotEmpty(teamMembers) ? 0 : teamMembers.size());
            teamUpVo.setTeamCnt(CollUtil.isEmpty(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());
            teamUpVo.setTeamCntAva(CollUtil.isEmpty(teamCntAva) ? 0 : teamCntAva.size());

            if(CollUtil.isNotEmpty(directCntAva)){
            if(CollUtil.isNotEmpty(teamCntAva)){
                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);
//                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);
            }else{
                teamUpVo.setTeamAchieve(BigDecimal.ZERO);
            }
            teamUpVo.setTeamAchieve(BigDecimal.ZERO);
        }
        return teamUpVo;
    }
@@ -447,31 +449,40 @@

        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);
                teamMembers.add(directMember);
                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);