From 8b917f0285e1cafa034171e0d0fb4b2d3f295b90 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Fri, 11 Apr 2025 10:14:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E8=B4=B9=E6=8A=98=E6=89=A3=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E5=92=8C=E6=9C=8D=E5=8A=A1=E8=B4=B9=E6=8A=98=E6=89=A3?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=20=E5=BA=94=E8=AF=A5=E5=A4=A7=E4=BA=8E?=
 =?UTF-8?q?=E7=AD=89=E4=BA=8E0,=20=E5=A6=82=E5=B0=8F=E4=BA=8E0,=20?=
 =?UTF-8?q?=E5=88=99=E8=AE=BE=E7=BD=AE=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pile/service/programlogic/AbstractProgramLogic.java     | 6 ++++++
 1 file changed, 6 insertions(+)

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;
+
         /*
         更新 数据
          */