From a84d5dcd9aa54a1d8b3fb97f2415994f0c4fe429 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Fri, 11 Apr 2025 10:31:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=98=E6=89=A3=E5=90=8E=E7=94=B5=E8=B4=B9?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=A4=A7=E4=BA=8E=E5=8E=9F=E5=A7=8B=E7=94=B5?=
 =?UTF-8?q?=E8=B4=B9=E9=87=91=E9=A2=9D,=20=E6=8A=98=E6=89=A3=E5=90=8E?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=B4=B9=E4=B8=8D=E8=83=BD=E5=A4=A7=E4=BA=8E?=
 =?UTF-8?q?=E5=8E=9F=E5=A7=8B=E6=9C=8D=E5=8A=A1=E8=B4=B9=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/programlogic/AbstractProgramLogic.java   | 12 ++++++++++++
 1 file changed, 12 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 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;
+        }
+
+
         /*
         更新 数据
          */