From 923bffbf894689d610e686ea56b2491ab6fa2af9 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Tue, 12 Nov 2024 14:30:56 +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

---
 .../jsowell/pile/service/impl/SettleOrderReportServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 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 d0e4f01da..cfb836bb4 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,7 @@ 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.getTotalAmount());
+            totalAmount = totalAmount.add(settleOrderReportVO.getSettleAmount()); // 2024年11月12日14点30分使用结算金额计算收入金额
             virtualAmount = virtualAmount.add(settleOrderReportVO.getVirtualAmount());
         }
         // 用电度数