From 5fddbd8e8c1c7d1532a7e19644b4e31e8de92835 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Tue, 5 Aug 2025 16:17:12 +0800
Subject: [PATCH] =?UTF-8?q?update=20=20=E9=A6=96=E9=A1=B5=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=87=91=E9=A2=9D=E6=95=B0=E6=8D=AE=E6=B1=87=E6=80=BB?=
 =?UTF-8?q?=E9=87=87=E7=94=A8=E6=80=BB=E7=BB=93=E7=AE=97=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=EF=BC=88=E5=B7=B2=E7=BB=8F=E4=B8=8E=E5=AE=9E=E6=94=B6=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E5=AF=B9=E6=AF=94=E8=BF=87=EF=BC=8C=E5=8F=96=E4=BA=8C?=
 =?UTF-8?q?=E8=80=85=E5=A4=A7=E4=BA=8E0=E7=9A=84=E6=9C=80=E5=B0=8F?=
 =?UTF-8?q?=E5=80=BC=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsowell/pile/service/impl/PileBasicInfoServiceImpl.java  | 3 ++-
 .../com/jsowell/pile/vo/web/IndexGeneralSituationVO.java     | 5 +++++
 .../src/main/resources/mapper/pile/PileBasicInfoMapper.xml   | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
index 941784c67..b89373ba6 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
@@ -991,7 +991,8 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService {
 		if (SecurityUtils.getUsername().equals("demo")) {
 			BigDecimal bigDecimal = new BigDecimal(Constants.THREE);
 			log.info("demo账号, begin:{}", JSON.toJSONString(generalInfo));
-			generalInfo.setTotalChargingAmount(new BigDecimal(generalInfo.getTotalChargingAmount()).multiply(bigDecimal).toString());
+			// generalInfo.setTotalChargingAmount(new BigDecimal(generalInfo.getTotalChargingAmount()).multiply(bigDecimal).toString());
+			generalInfo.setTotalChargingAmount(new BigDecimal(generalInfo.getTotalSettleAmount()).multiply(bigDecimal).toString());
 			generalInfo.setTotalPileQuantity(new BigDecimal(generalInfo.getTotalPileQuantity()).multiply(bigDecimal).toString());
 			generalInfo.setTotalChargingDegree(new BigDecimal(generalInfo.getTotalChargingDegree()).multiply(bigDecimal).toString());
 			generalInfo.setTotalChargingQuantity(new BigDecimal(generalInfo.getTotalChargingQuantity()).multiply(bigDecimal).toString());
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/IndexGeneralSituationVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/IndexGeneralSituationVO.java
index 0412a5b5e..f30c353d5 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/IndexGeneralSituationVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/IndexGeneralSituationVO.java
@@ -20,6 +20,11 @@ public class IndexGeneralSituationVO {
      */
     private String totalChargingAmount;
 
+    /**
+     * 总结算金额
+     */
+    private String totalSettleAmount;
+
     /**
      * 总充电笔数
      */
diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml
index 47c4d8298..a995cfaac 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml
@@ -401,6 +401,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getGeneralSituationInfo" resultType="com.jsowell.pile.vo.web.IndexGeneralSituationVO">
         select
             ifnull(sum(t1.total_amount), 0) as totalChargingAmount,
+            ifnull(sum(t1.settle_amount), 0) as totalSettleAmount,
             ifnull(sum(t1.use_electricity), 0) as totalChargingDegree,
             ifnull(sum(t1.charge_num), 0) as totalChargingQuantity
         from