autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 02:55:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

金额取订单分账记录表中的值

Browse Source
This commit is contained in:
Guoqs
2025-09-29 14:15:41 +08:00
parent 7c51106b17
commit 4efb428e5f
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
View File

@@ -747,16 +747,21 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
// 电费金额， 如果splitRecordMap中存在，取Rrecord.getElectricitySplitAmount()， 如果不存在取vo.getTotalElectricityAmount()
OrderSplitRecord record = splitRecordMap.get(vo.getOrderCode());
BigDecimal electricityAmount = record != null
? record.getElectricitySplitAmount()
: vo.getTotalElectricityAmount() != null ? vo.getTotalElectricityAmount() : BigDecimal.ZERO;
BigDecimal electricityAmount;
BigDecimal serviceAmount;
// BigDecimal e = vo.getTotalElectricityAmount() != null ? vo.getTotalElectricityAmount() : BigDecimal.ZERO;
if (record != null) {
electricityAmount = record.getElectricitySplitAmount() != null ? record.getElectricitySplitAmount() : BigDecimal.ZERO;
serviceAmount = record.getServiceSplitAmount() != null ? record.getServiceSplitAmount() : BigDecimal.ZERO;
log.info("record订单编号:{}, 订单金额:{}, 电费金额:{}, 服务费金额:{}", vo.getOrderCode(), orderAmount, electricityAmount, serviceAmount);
} else {
electricityAmount = vo.getTotalElectricityAmount() != null ? vo.getTotalElectricityAmount() : BigDecimal.ZERO;
serviceAmount = vo.getTotalServiceAmount() != null ? vo.getTotalServiceAmount() : BigDecimal.ZERO;
log.info("vo订单编号:{}, 订单金额:{}, 电费金额:{}, 服务费金额:{}", vo.getOrderCode(), orderAmount, electricityAmount, serviceAmount);
}
totalElectricityAmount = totalElectricityAmount.add(electricityAmount);
// 服务费金额，如果splitRecordMap中存在，取Rrecord.getElectricitySplitAmount()， 如果不存在取vo.getTotalElectricityAmount()
BigDecimal serviceAmount = record != null
? record.getServiceSplitAmount()
: vo.getTotalServiceAmount() != null ? vo.getTotalServiceAmount() : BigDecimal.ZERO;
// BigDecimal serviceAmount = vo.getTotalServiceAmount() != null ? vo.getTotalServiceAmount() : BigDecimal.ZERO;
totalServiceAmount = totalServiceAmount.add(serviceAmount);