From 91c3d7ec70ebb9556c8444dc0b8f332a863910d5 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Tue, 26 May 2026 16:32:17 +0800
Subject: [PATCH] =?UTF-8?q?update=20=20=E9=A6=96=E9=A1=B5=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/pile/PileBasicInfoMapper.xml   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml
index 8d9c6c348..578f321e8 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml
@@ -532,10 +532,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!-- 按merchantId分组汇总settle_order_report（每个商户一行，Java再汇总） -->
     <select id="getSettleReportGroupByMerchant" resultType="com.jsowell.pile.vo.web.IndexGeneralSituationVO">
         select
-            t1.total_amount as totalChargingAmount,
-            t1.settle_amount as totalSettleAmount,
-            t1.use_electricity as totalChargingDegree,
-            t1.charge_num as totalChargingQuantity
+            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 settle_order_report t1
         where t1.del_flag = '0'
         <if test="merchantIdList != null and merchantIdList.size() > 0">
@@ -544,6 +544,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
+        group by t1.merchant_id
     </select>
 
     <!-- 按stationId查settle_order_report原始行，Java汇总返回 -->