From f53eb97c0f87c5710e54272790d47426d9629a6e Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Tue, 21 Jan 2025 11:07:04 +0800
Subject: [PATCH] =?UTF-8?q?totalElectricity=20=3D=20sumUsedElectricity?=
 =?UTF-8?q?=E4=B8=8EtotalElectricity,=20=E5=8F=96=E6=9C=80=E5=A4=A7?=
 =?UTF-8?q?=E7=9A=84=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/programlogic/AbstractProgramLogic.java  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 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 76898eca6..7dd07766d 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
@@ -396,12 +396,13 @@ public abstract class AbstractProgramLogic implements InitializingBean {
             BigDecimal sumUsedElectricity = sharpUsedElectricity.add(peakUsedElectricity)
                     .add(flatUsedElectricity).add(valleyUsedElectricity);
             // data中的总用电量
-            BigDecimal totalElectricity = new BigDecimal(data.getTotalElectricity());
-            if (sumUsedElectricity.compareTo(totalElectricity) != 0) {
-                // 汇总数据和data中数据不相等，取汇总的数据
-                totalElectricity = sumUsedElectricity;
-            }
-            orderDetail.setTotalUsedElectricity(totalElectricity);
+            BigDecimal totalElectricity = new BigDecimal(StringUtils.isBlank(data.getTotalElectricity()) ? Constants.ZERO : data.getTotalElectricity());
+            // if (sumUsedElectricity.compareTo(totalElectricity) != 0) {
+            //     // 汇总数据和data中数据不相等，取汇总的数据
+            //     totalElectricity = sumUsedElectricity;
+            // }
+            // totalElectricity = sumUsedElectricity与totalElectricity, 取最大的值
+            orderDetail.setTotalUsedElectricity(totalElectricity.max(sumUsedElectricity));
             // 订单总金额
             orderDetail.setTotalOrderAmount(orderAmount);
         } catch (Exception e) {