From f6debc5fc79d2780887b3f3aaa96cd5dcc3aab97 Mon Sep 17 00:00:00 2001
From: yufenghao <3508605349@qq.com>
Date: Sat, 8 Nov 2025 13:17:22 +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=A3=20=E4=BF=AE=E6=94=B9=E5=90=84=E4=B8=AA?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=89=B9=E9=87=8F=E6=8F=92=E5=85=A5=E9=97=B4?=
 =?UTF-8?q?=E9=9A=94=E7=AC=A6=E9=94=99=E8=AF=AF=20=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BB=85=E4=B8=83=E5=A4=A9=E6=9F=A5=E8=AF=A2=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/StatisticsMapper.xml | 73 +++++++++++++-------------
 1 file changed, 37 insertions(+), 36 deletions(-)

diff --git a/src/main/resources/mapper/StatisticsMapper.xml b/src/main/resources/mapper/StatisticsMapper.xml
index b51f738..49a55ee 100644
--- a/src/main/resources/mapper/StatisticsMapper.xml
+++ b/src/main/resources/mapper/StatisticsMapper.xml
@@ -9,7 +9,7 @@
         current_permanent, current_free_june,
         current_free_december, current_task
         ) VALUES
-        <foreach collection="list" item="s" separator=";">
+        <foreach collection="list" item="s" separator=",">
             (
             #{s.market}, #{s.currentDatetime},
             #{s.currentGold}, #{s.dailyChange},
@@ -35,7 +35,7 @@
         refund_free_december, refund_task,
         recharge_num, first_recharge
         ) VALUES
-        <foreach collection="list" item="s" separator=";">
+        <foreach collection="list" item="s" separator=",">
             (
             #{s.market}, #{s.currentDatetime},
             #{s.recharge}, #{s.money},
@@ -69,7 +69,7 @@
         yearly_refund,
         yearly_recharge_num
         ) VALUES
-        <foreach collection="list" item="s" separator=";">
+        <foreach collection="list" item="s" separator=",">
             (
             #{s.market}, #{s.currentDatetime},
             #{s.yearlyRecharge},
@@ -137,7 +137,7 @@
     <select id="listPart2All" resultType="com.example.demo.domain.entity.Statistics">
         SELECT
             m.name as market,
-            '2025-08-04'        AS current_datetime,
+            #{today}        AS current_datetime,
             COALESCE(SUM(CASE WHEN ugr.type=0 THEN ugr.permanent_gold+ugr.free_june+ugr.free_december+ugr.task_gold END),0) AS recharge,
             COALESCE(SUM(CASE WHEN ugr.type=0 THEN ugr.permanent_gold END),0)   AS money,
             COALESCE(SUM(CASE WHEN ugr.type=1 THEN -ugr.permanent_gold END),0)  AS consume_permanent,
@@ -176,40 +176,41 @@
     </select>
     <select id="listPart2RangeAll" resultType="com.example.demo.domain.entity.Statistics">
         SELECT
-            m.name as market,
-            DATE(ugr.create_time)                 AS current_datetime,  -- 只保留日期
-            COALESCE(SUM(CASE WHEN ugr.type=0 THEN ugr.permanent_gold+ugr.free_june+ugr.free_december+ugr.task_gold END),0) AS recharge,
-            COALESCE(SUM(CASE WHEN ugr.type=0 THEN ugr.permanent_gold END),0)   AS money,
-            COALESCE(SUM(CASE WHEN ugr.type=1 THEN -ugr.permanent_gold END),0)  AS consume_permanent,
-            COALESCE(SUM(CASE WHEN ugr.type=1 THEN -ugr.free_june END),0)       AS consume_free_june,
-            COALESCE(SUM(CASE WHEN ugr.type=1 THEN -ugr.free_december END),0)   AS consume_free_december,
-            COALESCE(SUM(CASE WHEN ugr.type=1 THEN -ugr.task_gold END),0)       AS consume_task,
-            COALESCE(SUM(CASE WHEN ugr.type=2 THEN ugr.permanent_gold END),0)  AS refund_permanent,
-            COALESCE(SUM(CASE WHEN ugr.type=2 THEN ugr.free_june END),0)       AS refund_free_june,
-            COALESCE(SUM(CASE WHEN ugr.type=2 THEN ugr.free_december END),0)   AS refund_free_december,
-            COALESCE(SUM(CASE WHEN ugr.type=2 THEN ugr.task_gold END),0)       AS refund_task,
-            COUNT(DISTINCT CASE WHEN ugr.type=0 THEN ugr.jwcode END)            AS recharge_num,
-            COUNT(DISTINCT CASE WHEN ugr.type=0
-            AND u.first_recharge BETWEEN d.date_start AND d.date_end THEN ugr.jwcode END) AS first_recharge
+        m.name as market,
+        DATE(ugr.create_time) AS current_datetime, -- 只保留日期
+        COALESCE(SUM(CASE WHEN ugr.type=0 THEN ugr.permanent_gold+ugr.free_june+ugr.free_december+ugr.task_gold END),0)
+        AS recharge,
+        COALESCE(SUM(CASE WHEN ugr.type=0 THEN ugr.permanent_gold END),0) AS money,
+        COALESCE(SUM(CASE WHEN ugr.type=1 THEN -ugr.permanent_gold END),0) AS consume_permanent,
+        COALESCE(SUM(CASE WHEN ugr.type=1 THEN -ugr.free_june END),0) AS consume_free_june,
+        COALESCE(SUM(CASE WHEN ugr.type=1 THEN -ugr.free_december END),0) AS consume_free_december,
+        COALESCE(SUM(CASE WHEN ugr.type=1 THEN -ugr.task_gold END),0) AS consume_task,
+        COALESCE(SUM(CASE WHEN ugr.type=2 THEN ugr.permanent_gold END),0) AS refund_permanent,
+        COALESCE(SUM(CASE WHEN ugr.type=2 THEN ugr.free_june END),0) AS refund_free_june,
+        COALESCE(SUM(CASE WHEN ugr.type=2 THEN ugr.free_december END),0) AS refund_free_december,
+        COALESCE(SUM(CASE WHEN ugr.type=2 THEN ugr.task_gold END),0) AS refund_task,
+        COUNT(DISTINCT CASE WHEN ugr.type=0 THEN ugr.jwcode END) AS recharge_num,
+        COUNT(DISTINCT CASE WHEN ugr.type=0
+        AND u.first_recharge BETWEEN d.date_start AND d.date_end THEN ugr.jwcode END) AS first_recharge
         FROM
-            -- 生成 7 天日期序列
-            (
-            SELECT DATE_SUB(CURDATE(), INTERVAL seq DAY) AS create_date,
-            DATE_SUB(CURDATE(), INTERVAL seq DAY) AS date_start,
-            TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL seq DAY), '23:59:59') AS date_end
-            FROM (
-            SELECT 0 AS seq UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL
-            SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6
-            ) AS days
-            ) d
-            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
-            inner join market m on u.market=m.id
+        -- 生成 7 天日期序列
+        (
+        SELECT DATE_SUB(CURDATE(), INTERVAL seq DAY) AS create_date,
+        DATE_SUB(CURDATE(), INTERVAL seq DAY) AS date_start,
+        TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL seq DAY), '23:59:59') AS date_end
+        FROM (
+        SELECT 0 AS seq UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL
+        SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6
+        ) AS days
+        ) d
+        JOIN user_gold_record ugr ON ugr.create_time &gt;= DATE_SUB(CURDATE(), INTERVAL 6 DAY)
+        AND ugr.create_time &lt;= TIMESTAMP(CURDATE(), '23:59:59')
+        JOIN user u ON ugr.jwcode = u.jwcode
+        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
-        GROUP BY  m.name, d.create_date
+        AND ugr.flag = 1
+        AND m.name IS NOT NULL
+        GROUP BY m.name, d.create_date
     </select>