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

优化orderSplitRecord中金额计算方式

Browse Source
This commit is contained in:
Guoqs
2025-07-25 16:18:11 +08:00
parent 6510b849bc
commit 66eb6a7fbd
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -491,10 +491,16 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
orderInfoDetailVO.setRefundAmount(orderBasicInfo.getRefundAmount());
orderInfoDetailVO.setRefundStatus(orderBasicInfo.getRefundStatus());
orderInfoDetailVO.setTotalUsedElectricity(orderDetail.getTotalUsedElectricity());
orderInfoDetailVO.setTotalOrderAmount(orderDetail.getTotalOrderAmount());
orderInfoDetailVO.setTotalElectricityAmount(orderDetail.getTotalElectricityAmount());
// 总订单金额
// orderInfoDetailVO.setTotalOrderAmount(orderDetail.getTotalOrderAmount());
orderInfoDetailVO.setTotalOrderAmount(orderBasicInfo.getSettleAmount()); // 使用订单主表中已经保留两位小数后的结算金额
// 总电费金额
// orderInfoDetailVO.setTotalElectricityAmount(orderDetail.getTotalElectricityAmount());
orderInfoDetailVO.setTotalElectricityAmount(orderDetail.getTotalElectricityAmount().setScale(2, RoundingMode.DOWN));
orderInfoDetailVO.setDiscountElectricityAmount(orderDetail.getDiscountElectricityAmount());
orderInfoDetailVO.setTotalServiceAmount(orderDetail.getTotalServiceAmount());
// 总服务费金额
// orderInfoDetailVO.setTotalServiceAmount(orderDetail.getTotalServiceAmount());
orderInfoDetailVO.setTotalServiceAmount(orderInfoDetailVO.getTotalOrderAmount().subtract(orderDetail.getTotalElectricityAmount()));
orderInfoDetailVO.setDiscountServiceAmount(orderDetail.getDiscountServiceAmount());
orderInfoDetailVO.setSharpPrice(orderDetail.getSharpPrice());
orderInfoDetailVO.setSharpUsedElectricity(orderDetail.getSharpUsedElectricity());