From 4efb428e5f8d63e69da43c6d36f0813a2a9cb0bf Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Mon, 29 Sep 2025 14:15:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=91=E9=A2=9D=E5=8F=96=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=88=86=E8=B4=A6=E8=AE=B0=E5=BD=95=E8=A1=A8=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SettleOrderReportServiceImpl.java      | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
index c50463cc4..43101321f 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
@@ -747,16 +747,21 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
 
             // 电费金额， 如果splitRecordMap中存在，取Rrecord.getElectricitySplitAmount()， 如果不存在取vo.getTotalElectricityAmount()
             OrderSplitRecord record = splitRecordMap.get(vo.getOrderCode());
-            BigDecimal electricityAmount = record != null
-                    ? record.getElectricitySplitAmount()
-                    : vo.getTotalElectricityAmount() != null ? vo.getTotalElectricityAmount() : BigDecimal.ZERO;
+            BigDecimal electricityAmount;
+            BigDecimal serviceAmount;
             // BigDecimal e = vo.getTotalElectricityAmount() != null ? vo.getTotalElectricityAmount() : BigDecimal.ZERO;
+            if (record != null) {
+                electricityAmount = record.getElectricitySplitAmount() != null ? record.getElectricitySplitAmount() : BigDecimal.ZERO;
+                serviceAmount = record.getServiceSplitAmount() != null ? record.getServiceSplitAmount() : BigDecimal.ZERO;
+                log.info("record订单编号:{}, 订单金额:{}, 电费金额:{}, 服务费金额:{}", vo.getOrderCode(), orderAmount, electricityAmount, serviceAmount);
+            } else {
+                electricityAmount = vo.getTotalElectricityAmount() != null ? vo.getTotalElectricityAmount() : BigDecimal.ZERO;
+                serviceAmount = vo.getTotalServiceAmount() != null ? vo.getTotalServiceAmount() : BigDecimal.ZERO;
+                log.info("vo订单编号:{}, 订单金额:{}, 电费金额:{}, 服务费金额:{}", vo.getOrderCode(), orderAmount, electricityAmount, serviceAmount);
+            }
             totalElectricityAmount = totalElectricityAmount.add(electricityAmount);
 
             // 服务费金额，如果splitRecordMap中存在，取Rrecord.getElectricitySplitAmount()， 如果不存在取vo.getTotalElectricityAmount()
-            BigDecimal serviceAmount = record != null
-                    ? record.getServiceSplitAmount()
-                    : vo.getTotalServiceAmount() != null ? vo.getTotalServiceAmount() : BigDecimal.ZERO;
             // BigDecimal serviceAmount = vo.getTotalServiceAmount() != null ? vo.getTotalServiceAmount() : BigDecimal.ZERO;
             totalServiceAmount = totalServiceAmount.add(serviceAmount);