From 7b88280d1447b1d2df5a5f44c211534771603a88 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Wed, 2 Apr 2025 11:02:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9CtotalElectricityAmount=20+=20?=
 =?UTF-8?q?totalServiceAmount=20!=3D=20dataOrderAmount=EF=BC=8C=E5=88=99to?=
 =?UTF-8?q?talElectricityAmount=20=3D=20dataOrderAmount=20-=20totalService?=
 =?UTF-8?q?Amount?=
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 d781fb81f..b2b1fc00d 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
@@ -613,6 +613,12 @@ public abstract class AbstractProgramLogic implements InitializingBean {
         // 退款金额 = 支付金额 - 订单消费金额 剩余需要退回的金额 residue
         BigDecimal refundAmount = payAmount.subtract(dataOrderAmount);
 
+        // 如果totalElectricityAmount + totalServiceAmount != dataOrderAmount，则totalElectricityAmount = dataOrderAmount - totalServiceAmount
+        if (totalElectricityAmount.add(totalServiceAmount).compareTo(dataOrderAmount) != 0) {
+            logger.info("updateOrderBasicInfoAndOrderDetail结算订单:【{}】, 电费金额({}) + 服务费金额({}) != 订单金额({}), 电费金额设置为订单金额- 服务费金额", orderCode, totalElectricityAmount, totalServiceAmount, dataOrderAmount);
+            totalElectricityAmount = dataOrderAmount.subtract(totalServiceAmount);
+        }
+
         /*
         orderBasicInfo需要更新的字段
          */