From 0df0e610fd929dbcaa39159ff3d917e46c513776 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Tue, 12 Nov 2024 14:35:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=BB=93=E7=AE=97=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E8=AE=A1=E7=AE=97=E6=94=B6=E5=85=A5=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pile/service/impl/SettleOrderReportServiceImpl.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 cfb836bb4..2b0c9bd09 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
@@ -378,7 +378,11 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
             chargeTime = chargeTime.add(new BigDecimal(settleOrderReportVO.getChargeTime()));
             electricityAmount = electricityAmount.add(settleOrderReportVO.getElectricityAmount());
             serviceAmount = serviceAmount.add(settleOrderReportVO.getServiceAmount());
-            totalAmount = totalAmount.add(settleOrderReportVO.getSettleAmount()); // 2024年11月12日14点30分使用结算金额计算收入金额
+            // 2024年11月12日14点30分使用结算金额计算收入金额
+            BigDecimal amount = settleOrderReportVO.getSettleAmount() != null
+                    ? settleOrderReportVO.getSettleAmount()
+                    : settleOrderReportVO.getTotalAmount();
+            totalAmount = totalAmount.add(amount);
             virtualAmount = virtualAmount.add(settleOrderReportVO.getVirtualAmount());
         }
         // 用电度数