autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-05 14:38:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

添加字段

Browse Source
This commit is contained in:
Guoqs
2025-10-10 14:18:36 +08:00
parent c3ddcccc80
commit 483e4fd40d
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -2359,13 +2359,27 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
.map(splitData -> new BigDecimal(splitData.getAmount())) .map(splitData -> new BigDecimal(splitData.getAmount()))
.reduce(BigDecimal.ZERO, BigDecimal::add); .reduce(BigDecimal.ZERO, BigDecimal::add);
// 电费汇总
BigDecimal totalElectricityAmount = group.stream()
.map(SplitData::getElecAmount)
.reduce(BigDecimal.ZERO, BigDecimal::add);
// 服务费汇总
BigDecimal totalServiceAmount = group.stream()
.map(SplitData::getServiceAmount)
.reduce(BigDecimal.ZERO, BigDecimal::add);
// 创建新的汇总记录，使用该组第一条记录的 feeFlag // 创建新的汇总记录，使用该组第一条记录的 feeFlag
SplitData aggregatedData = new SplitData(); SplitData aggregatedData = new SplitData();
aggregatedData.setMemberId(memberId); aggregatedData.setMemberId(memberId);
aggregatedData.setAmount(totalAmount.toString()); aggregatedData.setAmount(totalAmount.toString());
aggregatedData.setElecAmount(totalElectricityAmount);
aggregatedData.setServiceAmount(totalServiceAmount);
// 保留原始的 feeFlag 数据（取第一条记录的值） // 保留原始的 feeFlag 数据（取第一条记录的值）
if (!group.isEmpty()) { if (!group.isEmpty()) {
aggregatedData.setFeeFlag(group.get(0).getFeeFlag()); aggregatedData.setFeeFlag(group.get(0).getFeeFlag());
aggregatedData.setElecRatio(group.get(0).getElecRatio());
aggregatedData.setServiceRatio(group.get(0).getServiceRatio());
} }
result.add(aggregatedData); result.add(aggregatedData);
} }