diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java index 8c1952a3b..a7d83b5c3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java @@ -583,8 +583,10 @@ public abstract class AbstractProgramLogic implements InitializingBean { logger.info("updateOrderBasicInfoAndOrderDetail:【{}】, 当前为谷时段, 时段单价:{}(电费单价:{}+服务费单价:{}), 耗电量:{}, 平台计算该时段消费金额:{}(电费:{}+服务费:{}), 桩传的单价:{}, 桩传的金额:{}", orderCode, price, electricityPrice, servicePrice, valleyUsedElectricity, amount, electricityAmount, serviceAmount, data.getValleyPrice(), data.getValleyAmount()); } + // 尖峰平谷用电量汇总 BigDecimal sumUsedElectricity = sharpUsedElectricity.add(peakUsedElectricity).add(flatUsedElectricity).add(valleyUsedElectricity); + // 平台计算的总消费金额 平台计算总电费金额 + 平台计算总服务费金额 BigDecimal computeTotalAmount = totalElectricityAmount.add(totalServiceAmount); @@ -595,7 +597,6 @@ public abstract class AbstractProgramLogic implements InitializingBean { */ if (computeTotalAmount.compareTo(dataOrderAmount) != 0 && (sumUsedElectricity.compareTo(BigDecimal.ZERO) > 0)) { // 2025年3月26日15点50分, 订单金额以平台计算为主,所以注释掉, 并打印日志说明 - // totalElectricityAmount = dataOrderAmount.subtract(totalServiceAmount); logger.info("updateOrderBasicInfoAndOrderDetail平台计算出电费金额:{}, 服务费金额:{}, 汇总:{}, 交易记录传来的金额:{}", totalElectricityAmount, totalServiceAmount, computeTotalAmount, dataOrderAmount); dataOrderAmount = computeTotalAmount; }