From a714762985df6122df1062d8ae4149e6c538518b Mon Sep 17 00:00:00 2001
From: yufenghao <3508605349@qq.com>
Date: Fri, 7 Nov 2025 19:05:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3listPart1All=E5=AD=90=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E4=BB=A5=E5=8F=8AlistPart2All?=
 =?UTF-8?q?=E3=80=81listYearAll=E3=80=81listPart2RangeAll=E7=9A=84?=
 =?UTF-8?q?=E5=B7=A6=E8=BF=9E=E6=8E=A5=E6=94=B9=E4=B8=BA=E5=86=85=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/StatisticsMapper.xml | 47 ++++++++++----------------
 1 file changed, 17 insertions(+), 30 deletions(-)

diff --git a/src/main/resources/mapper/StatisticsMapper.xml b/src/main/resources/mapper/StatisticsMapper.xml
index c04f9ea..b51f738 100644
--- a/src/main/resources/mapper/StatisticsMapper.xml
+++ b/src/main/resources/mapper/StatisticsMapper.xml
@@ -114,38 +114,25 @@
         </foreach>
         AND current_datetime BETWEEN #{startDate} AND #{endDate}
     </select>
+
     <select id="listPart1All" resultType="com.example.demo.domain.entity.Statistics">
         SELECT
             m.name as market,
             #{today} AS current_datetime,
-            COALESCE(SUM(current_permanent_gold),0) +
-            COALESCE(SUM(current_free_june),0) +
-            COALESCE(SUM(current_free_december),0) +
-            COALESCE(SUM(current_task_gold),0)        AS current_gold,
-
-            COALESCE(SUM(current_permanent_gold),0)   AS current_permanent,
-            COALESCE(SUM(current_free_june),0)        AS current_free_june,
-            COALESCE(SUM(current_free_december),0)    AS current_free_december,
-            COALESCE(SUM(current_task_gold),0)        AS current_task,
-            -- 与昨天差值（从 statistics 表取）
-            (
-                COALESCE(SUM(u.current_permanent_gold),0) +
-                COALESCE(SUM(u.current_free_june),0) +
-                COALESCE(SUM(u.current_free_december),0) +
-                COALESCE(SUM(u.current_task_gold),0)
-                ) - COALESCE(
-                    (
-                        SELECT s.current_gold
-                        FROM statistics s
-                        WHERE s.market = m.name
-                          AND s.current_datetime = DATE_SUB(#{today}, INTERVAL 1 DAY)
-                    LIMIT 1
-                ), 0
-        ) AS daily_change
+            COALESCE(SUM(u.current_permanent_gold + u.current_free_june + u.current_free_december + u.current_task_gold), 0)
+                AS current_gold,
+            COALESCE(SUM(u.current_permanent_gold), 0)  AS current_permanent,
+            COALESCE(SUM(u.current_free_june), 0)       AS current_free_june,
+            COALESCE(SUM(u.current_free_december), 0)   AS current_free_december,
+            COALESCE(SUM(u.current_task_gold), 0)       AS current_task,
+            COALESCE(SUM(u.current_permanent_gold + u.current_free_june + u.current_free_december + u.current_task_gold), 0)
+                - COALESCE(s.current_gold, 0)           AS daily_change
         FROM user u
-        left join market m on u.market=m.id
-        where m.name IS NOT NULL
-        GROUP BY market
+                 INNER JOIN market m ON u.market = m.id
+                 INNER JOIN statistics s ON s.market = m.name
+            AND s.current_datetime = DATE_SUB(#{today}, INTERVAL 1 DAY)
+        WHERE m.name IS NOT NULL
+        GROUP BY m.name
     </select>
     <select id="listPart2All" resultType="com.example.demo.domain.entity.Statistics">
         SELECT
@@ -166,7 +153,7 @@
                 AND u.first_recharge BETWEEN  #{start} AND #{end} THEN ugr.jwcode END)   AS first_recharge
         FROM user_gold_record ugr
                  JOIN user u ON ugr.jwcode = u.jwcode
-                 left join market m on u.market=m.id
+                 inner join market m on u.market=m.id
         WHERE ugr.audit_status IN (1,3)
           AND ugr.flag = 1
           AND ugr.create_time BETWEEN #{start} AND #{end}
@@ -183,7 +170,7 @@
                COALESCE(SUM(s.refund_permanent+s.refund_free_june+s.refund_free_december+s.refund_task),0)     AS yearly_refund,
                COALESCE(SUM(s.recharge_num),0)  AS yearly_recharge_num
         FROM statistics s
-                 left join market m on s.market=m.id
+                 inner join market m on s.market=m.id
         WHERE current_datetime BETWEEN #{yearStart} AND #{end}  AND m.name IS NOT NULL
         GROUP BY market
     </select>
@@ -218,7 +205,7 @@
             JOIN user_gold_record ugr
         ON ugr.create_time between d.date_start AND   d.date_end
             JOIN user u ON ugr.jwcode = u.jwcode
-            left join market m on u.market=m.id
+            inner join market m on u.market=m.id
         WHERE ugr.audit_status IN (1,3)
           AND ugr.flag = 1
           AND m.name IS NOT NULL