From cbf7711f53824adb9bf95d21025d130591513caa Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Mon, 14 Jul 2025 18:10:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E7=AE=97bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/WorkBenchMapper.xml | 31 +++++++++++++--------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/main/resources/mapper/WorkBenchMapper.xml b/src/main/resources/mapper/WorkBenchMapper.xml
index b40242f..3230f2a 100644
--- a/src/main/resources/mapper/WorkBenchMapper.xml
+++ b/src/main/resources/mapper/WorkBenchMapper.xml
@@ -90,23 +90,22 @@
     <!-- 获取指定地区在时间段内的全部统计数据 -->
     <select id="getFullStatisticsByMarketAndDate" resultType="com.example.demo.domain.vo.WorkbenchFullStatistics">
         SELECT
-            SUM(recharge) AS totalRecharge,
-            SUM(money) AS totalMoney,
-            SUM(consume_permanent) AS totalConsumePermanent,
-            SUM(consume_free_june + consume_free_december) AS totalConsumeFree,
-            SUM(consume_task) AS totalConsumeTask,
-            SUM(refund_permanent + refund_free_june + refund_free_december + refund_task) AS totalRefund,
-            COUNT(DISTINCT ugr.jwcode) AS totalRechargeNum
+            SUM(s.recharge) AS totalRecharge,
+            SUM(s.money) AS totalMoney,
+            SUM(s.consume_permanent) AS totalConsumePermanent,
+            SUM(s.consume_free_june + s.consume_free_december) AS totalConsumeFree,
+            SUM(s.consume_task) AS totalConsumeTask,
+            SUM(s.refund_permanent + s.refund_free_june + s.refund_free_december + s.refund_task) AS totalRefund,
+            (
+                SELECT COUNT(DISTINCT ugr.jwcode)
+                FROM user_gold_record ugr
+                         INNER JOIN user u ON ugr.jwcode = u.jwcode
+                WHERE u.market = #{market}
+                  AND ugr.pay_time BETWEEN #{startDate} AND #{endDate}
+                  AND ugr.audit_status IN (1, 3)
+            ) AS totalRechargeNum
         FROM statistics s
-                 LEFT JOIN (
-            SELECT DISTINCT ugr.jwcode
-            FROM user_gold_record ugr
-                     INNER JOIN user u ON ugr.jwcode = u.jwcode
-            WHERE u.market = #{market}
-              AND ugr.pay_time BETWEEN #{startDate} AND #{endDate}
-              AND ugr.audit_status IN (1,3)
-        ) ugr ON 1=1
         WHERE s.market = #{market}
-          AND s.current_datetime BETWEEN #{startDate} AND #{endDate}
+          AND s.current_datetime BETWEEN #{startDate} AND #{endDate};
     </select>
 </mapper>