From 6d331bb3e8abacbf3962c0aada0dead479bf4372 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sun, 28 Apr 2024 21:36:35 +0800
Subject: [PATCH] 测试环境新版
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index ddb6c7e..8d0d904 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/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(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);
--
Gitblit v1.9.1