KKSU
2024-04-22 3d3734ca69d0894e1e1f77db215c0ffc5a8811b2
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -379,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(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);