合约监听

KKSU

2024-05-09 7db03fff5f1d089a9c14da450b88d979945df564

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

@@ -188,7 +188,19 @@
        if (currentUser.getDeptId() == null) {
            member.setCurrentUser(currentUser.getUserId());
        }
        return dappMemberDao.selectInPage(member, page);
        IPage<DappMemberEntity> dappMemberEntityIPage = dappMemberDao.selectInPage(member, page);
        List<DappMemberEntity> records = dappMemberEntityIPage.getRecords();
        if(CollUtil.isNotEmpty(records)){
            for(DappMemberEntity dappMemberEntity : records){
                QueryWrapper<DappAchieve> objectQueryWrapper = new QueryWrapper<>();
                objectQueryWrapper.eq("member_id",dappMemberEntity.getId());
                List<DappAchieve> dappAchieves = dappAchieveMapper.selectList(objectQueryWrapper);

                BigDecimal reduce = dappAchieves.stream().map(DappAchieve::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
                dappMemberEntity.setZhiYaAmount(reduce);
            }
        }
        return dappMemberEntityIPage;
    }

    @Override
@@ -367,10 +379,28 @@
            Set<Long> collect1 = filteredList.stream().map(DappAchieve::getMemberId).collect(Collectors.toSet());
            teamListVo.setAvaCount(CollUtil.isEmpty(collect1) ? 0 : collect1.size());

            BigDecimal teamAchieveMemberSum = dappAchieveSumList.stream().map(DappAchieve::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
//            BigDecimal teamAchieveMemberSum = dappAchieveSumList.stream().map(DappAchieve::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
            BigDecimal teamAchieveMemberSum = dappAchieveSumList.stream().map(item-> item.getAmount().multiply(item.getPrice())).reduce(BigDecimal.ZERO, BigDecimal::add);
//            BigDecimal teamAchieveMemberSum = BigDecimal.ZERO;
//            if(CollUtil.isNotEmpty(dappAchieveSumList)){
//                for(DappAchieve dappAchieve : dappAchieveSumList){
//                    BigDecimal price = dappAchieve.getPrice();
//                    BigDecimal amount = dappAchieve.getAmount();
//                    teamAchieveMemberSum = teamAchieveMemberSum.add(price.multiply(amount)).setScale(2,BigDecimal.ROUND_DOWN);
//                }
//            }
            teamListVo.setTeamAmount(teamAchieveMemberSum);

            BigDecimal avaAmount = filteredList.stream().map(DappAchieve::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
//            BigDecimal avaAmount = filteredList.stream().map(item-> item.getAmount().multiply(item.getPrice())).reduce(BigDecimal.ZERO, BigDecimal::add);
//            BigDecimal avaAmount = BigDecimal.ZERO;
//            if(CollUtil.isNotEmpty(filteredList)){
//                for(DappAchieve dappAchieve : filteredList){
//                    BigDecimal price = dappAchieve.getPrice();
//                    BigDecimal amount = dappAchieve.getAmount();
//                    avaAmount = avaAmount.add(price.multiply(amount)).setScale(2,BigDecimal.ROUND_DOWN);
//                }
//            }
            teamListVo.setAvaAmount(avaAmount);
        }else{
            teamListVo.setAvaCount(0);