逻辑

KKSU

2024-07-07 c881dcbb782d209f43b9a2878de613e0124e0421

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

@@ -410,7 +410,7 @@
                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到流中
@@ -425,11 +425,11 @@
            List<DappMemberEntity> teamCntAva = teamMembers.stream().filter(dappMemberEntity -> dappMemberEntity.getActiveStatus() == 1).collect(Collectors.toList());
            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到流中
@@ -449,6 +449,7 @@

        DappMemberEntity memberEntity = dappMemberDao.selectById(memberId);
        List<DappMemberEntity> directMembers = dappMemberDao.selectChildMemberDirectOrNot(memberEntity.getInviteId(), 1, null);
        directMembers.add(memberEntity);

        if(CollUtil.isNotEmpty(directMembers)){

@@ -469,7 +470,7 @@
                    if(CollUtil.isNotEmpty(collectTeam)){
                        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到流中