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

bug fix 修复订单结算空指针

Browse Source
This commit is contained in:
Lemon
2025-11-06 08:32:57 +08:00
parent 3e39c8aa82
commit dd2eb3365c
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java
View File

@@ -656,24 +656,24 @@ public abstract class AbstractProgramLogic implements InitializingBean {
orderDetail需要更新的字段
*/
// 如果sharpUsedElectricity比orderDetail.getSharpUsedElectricity大，则更新sharpUsedElectricity
if (sharpUsedElectricity.compareTo(orderDetail.getSharpUsedElectricity()) > 0) {
orderDetail.setSharpUsedElectricity(sharpUsedElectricity); // 尖时段用电量
}
// 如果peakUsedElectricity比orderDetail.getPeakUsedElectricity大，则更新
if (peakUsedElectricity.compareTo(orderDetail.getPeakUsedElectricity()) > 0) {
orderDetail.setPeakUsedElectricity(peakUsedElectricity); // 峰时段用电量
}
// 如果flatUsedElectricity比orderDetail.getFlatUsedElectricity大，则更新
if (flatUsedElectricity.compareTo(orderDetail.getFlatUsedElectricity()) > 0) {
orderDetail.setFlatUsedElectricity(flatUsedElectricity); // 平时段用电量
}
// 如果valleyUsedElectricity比orderDetail.getValleyUsedElectricity大，则更新
if (valleyUsedElectricity.compareTo(orderDetail.getValleyUsedElectricity()) > 0) {
orderDetail.setValleyUsedElectricity(valleyUsedElectricity); // 谷时段用电量
}
// if (sharpUsedElectricity.compareTo(orderDetail.getSharpUsedElectricity()) > 0) {
// orderDetail.setSharpUsedElectricity(sharpUsedElectricity); // 尖时段用电量
// }
//
// // 如果peakUsedElectricity比orderDetail.getPeakUsedElectricity大，则更新
// if (peakUsedElectricity.compareTo(orderDetail.getPeakUsedElectricity()) > 0) {
// orderDetail.setPeakUsedElectricity(peakUsedElectricity); // 峰时段用电量
// }
//
// // 如果flatUsedElectricity比orderDetail.getFlatUsedElectricity大，则更新
// if (flatUsedElectricity.compareTo(orderDetail.getFlatUsedElectricity()) > 0) {
// orderDetail.setFlatUsedElectricity(flatUsedElectricity); // 平时段用电量
// }
//
// // 如果valleyUsedElectricity比orderDetail.getValleyUsedElectricity大，则更新
// if (valleyUsedElectricity.compareTo(orderDetail.getValleyUsedElectricity()) > 0) {
// orderDetail.setValleyUsedElectricity(valleyUsedElectricity); // 谷时段用电量
// }
orderDetail.setTotalElectricityAmount(totalElectricityAmount); // 电费总金额
orderDetail.setTotalServiceAmount(totalServiceAmount); // 服务费总金额