From 8bb175c056f5020948ccaf6e8f5d4cda1f564a49 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Tue, 14 Oct 2025 13:45:25 +0800
Subject: [PATCH] =?UTF-8?q?orderDetail=E4=B8=AD=E5=90=84=E6=97=B6=E6=AE=B5?=
 =?UTF-8?q?=E7=94=A8=E7=94=B5=E9=87=8F=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../programlogic/AbstractProgramLogic.java    | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

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 d0986c23f..571654ba6 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
@@ -655,10 +655,26 @@ public abstract class AbstractProgramLogic implements InitializingBean {
         /*
         orderDetail需要更新的字段
          */
-        orderDetail.setSharpUsedElectricity(sharpUsedElectricity); // 尖时段用电量
-        orderDetail.setPeakUsedElectricity(peakUsedElectricity); // 峰时段用电量
-        orderDetail.setFlatUsedElectricity(flatUsedElectricity); // 平时段用电量
-        orderDetail.setValleyUsedElectricity(valleyUsedElectricity); // 谷时段用电量
+        // 如果sharpUsedElectricity比orderDetail.getSharpUsedElectricity大，则更新sharpUsedElectricity
+        if (sharpUsedElectricity.compareTo(orderDetail.getSharpUsedElectricity()) > 0) {
+            orderDetail.setSharpUsedElectricity(sharpUsedElectricity); // 尖时段用电量
+        }
+
+        // 如果peakUsedElectricity比orderDetail.getPeakUsedElectricity大，则更新
+        if (peakUsedElectricity.compareTo(orderDetail.getPeakUsedElectricity()) > 0) {
+            orderDetail.setPeakUsedElectricity(peakUsedElectricity); // 峰时段用电量
+        }
+
+        // 如果flatUsedElectricity比orderDetail.getFlatUsedElectricity大，则更新
+        if (flatUsedElectricity.compareTo(orderDetail.getFlatUsedElectricity()) > 0) {
+            orderDetail.setFlatUsedElectricity(flatUsedElectricity); // 平时段用电量
+        }
+
+        // 如果valleyUsedElectricity比orderDetail.getValleyUsedElectricity大，则更新
+        if (valleyUsedElectricity.compareTo(orderDetail.getValleyUsedElectricity()) > 0) {
+            orderDetail.setValleyUsedElectricity(valleyUsedElectricity); // 谷时段用电量
+        }
+
         orderDetail.setTotalElectricityAmount(totalElectricityAmount); // 电费总金额
         orderDetail.setTotalServiceAmount(totalServiceAmount); // 服务费总金额
         // sumUsedElectricity与totalElectricity对比, 取最大的值