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 473e5fb51..2202887d9 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 @@ -1045,6 +1045,18 @@ public abstract class AbstractProgramLogic implements InitializingBean { electricityAmountDiscount = electricityAmountDiscount.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : electricityAmountDiscount; serviceAmountDiscount = serviceAmountDiscount.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : serviceAmountDiscount; + /** + * 折扣后电费不能大于原始电费金额 + * 折扣后服务费不能大于原始服务费金额 + */ + if (afterDiscountElectricityAmount.compareTo(originalTotalElectricityAmount) > 0) { + afterDiscountElectricityAmount = originalTotalElectricityAmount; + } + if (afterDiscountServiceAmount.compareTo(originalTotalServiceAmount) > 0) { + afterDiscountServiceAmount = originalTotalServiceAmount; + } + + /* 更新 数据 */