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 a31e7ea0b..473e5fb51 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 @@ -1039,6 +1039,12 @@ public abstract class AbstractProgramLogic implements InitializingBean { orderCode, originalTotalElectricityAmount, afterDiscountElectricityAmount, electricityAmountDiscount, originalTotalServiceAmount, afterDiscountServiceAmount, serviceAmountDiscount); } + /** + * 电费折扣金额和服务费折扣金额 应该大于等于0, 如小于0, 则设置为0 + */ + electricityAmountDiscount = electricityAmountDiscount.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : electricityAmountDiscount; + serviceAmountDiscount = serviceAmountDiscount.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : serviceAmountDiscount; + /* 更新 数据 */