From 3e9332a13bac713a4f2166c407464eefcf973c4c Mon Sep 17 00:00:00 2001
From: huangqizhen <15552608129@163.com>
Date: Sun, 6 Apr 2025 18:06:28 +0800
Subject: [PATCH] =?UTF-8?q?4.6=20=E9=87=91=E5=B8=81=E4=BD=99=E9=A2=9D?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/demo/mapper/StatisticsMapper.java    |  4 ++--
 src/main/resources/mapper/DetailYMapper.xml               | 15 +++++----------
 src/main/resources/mapper/OneMapper.xml                   |  4 ++--
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/example/demo/mapper/StatisticsMapper.java b/src/main/java/com/example/demo/mapper/StatisticsMapper.java
index f9f65d7..8c546fc 100644
--- a/src/main/java/com/example/demo/mapper/StatisticsMapper.java
+++ b/src/main/java/com/example/demo/mapper/StatisticsMapper.java
@@ -445,7 +445,7 @@ public interface StatisticsMapper {
     List<Meium> getBuyAndTask(@Param("searchStartTime") Date searchStartTime, @Param("searchEndTime") Date searchEndTime);
     @Select({
             "<script>",
-            "SELECT u.area,",
+            "SELECT d.area,",
             "       SUM(d.recharge_coin) / 100 AS rechargeSumCoin,",
             "       SUM(d.free_coin) / 100 AS freeSumCoin,",
             "       SUM(d.task_coin) / 100 AS taskSumCoin,",
@@ -456,7 +456,7 @@ public interface StatisticsMapper {
             "<if test='searchStartTime != null and searchEndTime != null'>",
             "AND DATE(d.create_time) BETWEEN DATE(#{searchStartTime}) AND DATE(#{searchEndTime})",
             "</if>",
-            "GROUP BY u.area",
+            "GROUP BY d.area",
             "order by totalRechargeSum desc",
             "</script>"
     })
diff --git a/src/main/resources/mapper/DetailYMapper.xml b/src/main/resources/mapper/DetailYMapper.xml
index 351d399..d44c4f2 100644
--- a/src/main/resources/mapper/DetailYMapper.xml
+++ b/src/main/resources/mapper/DetailYMapper.xml
@@ -226,21 +226,16 @@
 
     <select id="getCount" resultType="com.example.demo.domain.entity.DetailY">
         SELECT
-        SUM(`recharge_coin`) AS sumR,
-        SUM(`task_coin`) AS sumT,
-        SUM(`free_coin`) AS sumF
+        SUM(`buy_jb`) AS sumR,
+        SUM(`core_jb`) AS sumT,
+        SUM(`free_6`)+SUM(`free_12`) AS sumF
         FROM
-        `detail_y`
+        `user_gold`
+        left join `user` on `user`.jwcode=`user_gold`.jwcode
         <where>
             <if test='jwcode != null and jwcode.length > 0'>
                 AND jwcode = #{jwcode}
             </if>
-            <if test='updateType != null'>
-                AND update_type = #{updateType}
-            </if>
-            <if test='startDate != null and endDate != null'>
-                AND create_time BETWEEN #{startDate} AND #{endDate}
-            </if>
             <if test='area != null and area.length > 0'>
                 AND area = #{area}
             </if>
diff --git a/src/main/resources/mapper/OneMapper.xml b/src/main/resources/mapper/OneMapper.xml
index 51eae19..7453b07 100644
--- a/src/main/resources/mapper/OneMapper.xml
+++ b/src/main/resources/mapper/OneMapper.xml
@@ -55,11 +55,11 @@
             COALESCE((SELECT SUM(recharge_coin)
                       FROM detail_y
                       WHERE YEAR(create_time) = YEAR(CURDATE())
-                        AND update_type = 0), 0) AS freegold,
+                        AND update_type = 0), 0) AS rechargegold,
             COALESCE((SELECT SUM(free_coin)
                       FROM detail_y
                       WHERE YEAR(create_time) = YEAR(CURDATE())
-                        AND update_type = 0), 0) AS rechargegold,
+                        AND update_type = 0), 0) AS freegold,
             COALESCE((SELECT SUM(task_coin)
                       FROM detail_y
                       WHERE YEAR(create_time) = YEAR(CURDATE())