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 d781fb81f..b2b1fc00d 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 @@ -613,6 +613,12 @@ public abstract class AbstractProgramLogic implements InitializingBean { // 退款金额 = 支付金额 - 订单消费金额 剩余需要退回的金额 residue BigDecimal refundAmount = payAmount.subtract(dataOrderAmount); + // 如果totalElectricityAmount + totalServiceAmount != dataOrderAmount,则totalElectricityAmount = dataOrderAmount - totalServiceAmount + if (totalElectricityAmount.add(totalServiceAmount).compareTo(dataOrderAmount) != 0) { + logger.info("updateOrderBasicInfoAndOrderDetail结算订单:【{}】, 电费金额({}) + 服务费金额({}) != 订单金额({}), 电费金额设置为订单金额- 服务费金额", orderCode, totalElectricityAmount, totalServiceAmount, dataOrderAmount); + totalElectricityAmount = dataOrderAmount.subtract(totalServiceAmount); + } + /* orderBasicInfo需要更新的字段 */