优化结算订单逻辑

This commit is contained in:
Guoqs
2025-03-25 17:06:10 +08:00
parent 0e0f6d6823
commit c5bc4d194f

View File

@@ -391,7 +391,8 @@ public abstract class AbstractProgramLogic implements InitializingBean {
BigDecimal sumUsedElectricity = sharpUsedElectricity.add(peakUsedElectricity).add(flatUsedElectricity).add(valleyUsedElectricity);
// data中的总用电量
BigDecimal totalElectricity = new BigDecimal(StringUtils.isBlank(data.getTotalElectricity()) ? Constants.ZERO : data.getTotalElectricity());
orderDetail.setTotalUsedElectricity(totalElectricity.max(sumUsedElectricity)); // sumUsedElectricity与totalElectricity对比, 取最大的值
// sumUsedElectricity与totalElectricity对比, 取最大的值
orderDetail.setTotalUsedElectricity(totalElectricity.max(sumUsedElectricity));
// 订单总金额
orderDetail.setTotalOrderAmount(orderAmount);
} catch (Exception e) {