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

update 优化计算订单日报

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-07-14 14:53:12 +08:00
parent 132ec764ae
commit 1258ab42eb
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2115,15 +2115,23 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
}
// 电费金额
totalElectricityAmount = totalElectricityAmount.add(vo.getTotalElectricityAmount());
BigDecimal e = vo.getTotalElectricityAmount() != null ? vo.getTotalElectricityAmount() : BigDecimal.ZERO;
totalElectricityAmount = totalElectricityAmount.add(e);
// 服务费金额
totalServiceAmount = totalServiceAmount.add(vo.getTotalServiceAmount());
BigDecimal serviceAmount = vo.getTotalServiceAmount() != null ? vo.getTotalServiceAmount() : BigDecimal.ZERO;
totalServiceAmount = totalServiceAmount.add(serviceAmount);
// 订单金额
totalOrderAmount = totalOrderAmount.add(new BigDecimal(orderAmount));
// 虚拟金额
totalVirtualAmount = totalVirtualAmount.add(new BigDecimal(vo.getVirtualAmount()));
String virtualAmount = StringUtils.isNotBlank(vo.getVirtualAmount()) ? vo.getVirtualAmount() : Constants.ZERO;
totalVirtualAmount = totalVirtualAmount.add(new BigDecimal(virtualAmount));
// 结算金额
totalSettleAmount = totalSettleAmount.add(new BigDecimal(vo.getSettleAmount()));
String settleAmount = StringUtils.isNotBlank(vo.getSettleAmount()) ? vo.getSettleAmount() : Constants.ZERO;
totalSettleAmount = totalSettleAmount.add(new BigDecimal(settleAmount));
}
// 计算报表