From 20ba6b42e27824fbb8f3c2ebca1f1a327f70d6bf Mon Sep 17 00:00:00 2001
From: huangqizhen <huangqizhen@legu168.com>
Date: Tue, 24 Dec 2024 17:23:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=95=B4=E5=90=88=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/demo/mapper/RefundMapper.java | 12 ++++---
 .../com/example/demo/mapper/StatisticsMapper.java  | 40 +++++++++++-----------
 .../demo/serviceImpl/StatisticsServiceImpl.java    |  1 +
 3 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/example/demo/mapper/RefundMapper.java b/src/main/java/com/example/demo/mapper/RefundMapper.java
index 7c94706..7ea31cd 100644
--- a/src/main/java/com/example/demo/mapper/RefundMapper.java
+++ b/src/main/java/com/example/demo/mapper/RefundMapper.java
@@ -66,14 +66,16 @@ public interface RefundMapper {
 
     @Select({
             "<script>",
-            "SELECT d.jwcode,d.refund_type,d.refund_goods,d.recharge_coin,d.free_coin,d.task_coin,d.remark,d.create_time,d.create_admin,",
-            "       u.area,",
+            "SELECT d.jwcode,d.refund_type,d.refund_goods,d.recharge_coin,d.free_coin,d.task_coin,d.remark,d.create_time ,",
+            "       u.area, a.name AS adminName,",
             "       u.name AS userName,",
-            "       au.status AS auditStatus, au.reson AS auditReson",
-            "FROM detail_y d",
-            "LEFT JOIN user u ON d.jwcode = u.jwcode",
+            "       au.status , au.reson AS auditReson",
+            "FROM detail d",
+            "LEFT JOIN `admin` a ON d.admin_id = a.admin_id",
+            "LEFT JOIN `user` u ON d.jwcode = u.jwcode",
             "LEFT JOIN audit au ON d.detail_id = au.refund_id",
             "WHERE d.detail_flag = 1 and update_type = 2 ",
+            "<if test='status!=null'>and au.status=#{status}</if>",
             "<if test='jwcode != null'>AND d.jwcode = #{jwcode}</if>",
             "<if test='refundType != null'>AND d.refund_type LIKE CONCAT('%', #{refundType}, '%')</if>",
             "<if test='refundGoods != null'>AND d.refund_goods LIKE CONCAT('%', #{refundGoods}, '%')</if>",
diff --git a/src/main/java/com/example/demo/mapper/StatisticsMapper.java b/src/main/java/com/example/demo/mapper/StatisticsMapper.java
index d488681..a708181 100644
--- a/src/main/java/com/example/demo/mapper/StatisticsMapper.java
+++ b/src/main/java/com/example/demo/mapper/StatisticsMapper.java
@@ -22,7 +22,7 @@ public interface StatisticsMapper {
             "       SUM(free_coin) AS freeSumCoin, " +
             "       SUM(task_coin) AS taskSumCoin, " +
             "       (SUM(recharge_coin) + SUM(free_coin) + SUM(task_coin)) AS totalSumCoin " +
-            "FROM `detail` " +
+            "FROM `detail_y` " +
             "WHERE update_type = '0' " +
             "  AND create_time >= '2024-01-01' " +
             "  AND create_time < NOW()")
@@ -33,7 +33,7 @@ public interface StatisticsMapper {
             "       SUM(free_coin) AS freeYesterdaySumCoin, " +
             "       SUM(task_coin) AS taskYesterdaySumCoin, " +
             "       (SUM(recharge_coin) + SUM(free_coin) + SUM(task_coin)) AS totalYesterdaySumCoin " +
-            "FROM `detail` " +
+            "FROM `detail_y` " +
             "WHERE update_type = '0' " +
             "  AND create_time >= CURDATE() - INTERVAL 1 DAY " +
             "  AND create_time < CURDATE()")
@@ -41,7 +41,7 @@ public interface StatisticsMapper {
 
     //全年累计0人数
     @Select("SELECT COUNT(jwcode) AS rechargeCount " +
-            "FROM `detail` " +
+            "FROM `detail_y` " +
             "WHERE update_type = '0' " +
             "  AND create_time >= '2024-01-01' " +
             "  AND create_time < NOW()")
@@ -49,27 +49,27 @@ public interface StatisticsMapper {
 
     //这周0数量
     @Select("SELECT COUNT(jwcode) AS rechargeCountThisWeek " +
-            "FROM `detail` WHERE update_type = '0' AND YEARWEEK(create_time, 1) = YEARWEEK(CURDATE(), 1)")
+            "FROM `detail_y` WHERE update_type = '0' AND YEARWEEK(create_time, 1) = YEARWEEK(CURDATE(), 1)")
     int getRechargeCountThisWeek();
 
     //上周0数量
     @Select("SELECT COUNT(jwcode) AS rechargeCountLastWeek " +
-            "FROM `detail` WHERE update_type = '0' AND YEARWEEK(create_time, 1) = YEARWEEK(CURDATE() - INTERVAL 1 WEEK, 1)")
+            "FROM `detail_y` WHERE update_type = '0' AND YEARWEEK(create_time, 1) = YEARWEEK(CURDATE() - INTERVAL 1 WEEK, 1)")
     int getRechargeCountLastWeek();
 
     //今天的0数量
     @Select("SELECT COUNT(jwcode) AS rechargeCountToday " +
-            "FROM `detail` WHERE update_type = '0' AND create_time >= CURDATE()")
+            "FROM `detail_y` WHERE update_type = '0' AND create_time >= CURDATE()")
     int getRechargeCountToday();
 
     //昨天的0数量
     @Select("SELECT COUNT(jwcode) AS rechargeCountYesterday " +
-            "FROM `detail` WHERE update_type = '0' AND create_time >=CURDATE() - INTERVAL 1 DAY AND create_time < CURDATE();")
+            "FROM `detail_y` WHERE update_type = '0' AND create_time >=CURDATE() - INTERVAL 1 DAY AND create_time < CURDATE();")
     int getRechargeCountYesterday();
 
     //昨日新增首充
     @Select("SELECT COUNT(jwcode) AS firstRechargeCountYesterday "+
-            "FROM `detail` WHERE update_type = '0' AND create_time >=CURDATE() - INTERVAL 1 DAY AND create_time < CURDATE() AND first_recharge = 1")
+            "FROM `detail_y` WHERE update_type = '0' AND create_time >=CURDATE() - INTERVAL 1 DAY AND create_time < CURDATE() AND first_recharge = 1")
     int getFirstRechargeCountYesterday();
 
     //金币系统1
@@ -79,7 +79,7 @@ public interface StatisticsMapper {
             "       SUM(d.free_coin) AS freeCoinSystemSum, " +
             "       SUM(d.task_coin) AS taskCoinSystemSum, " +
             "       (SUM(d.recharge_coin) + SUM(d.free_coin) + SUM(d.task_coin)) AS totalCoinSystemSum " +
-            "FROM detail d " +
+            "FROM detail_y d " +
             "JOIN product p ON d.product_id = p.product_id " +
             "WHERE d.update_type = '1' AND " +
             "      d.consume_platform = '金币系统' " +
@@ -93,7 +93,7 @@ public interface StatisticsMapper {
             "       SUM(d.free_coin) AS freeERPSum, " +
             "       SUM(d.task_coin) AS taskERPSum, " +
             "       (SUM(d.recharge_coin) + SUM(d.free_coin) + SUM(d.task_coin)) AS totalERPSum " +
-            "FROM detail d " +
+            "FROM detail_y d " +
             "JOIN product p ON d.product_id = p.product_id " +
             "WHERE d.update_type = '1' AND " +
             "      d.consume_platform = 'ERP系统' " +
@@ -106,7 +106,7 @@ public interface StatisticsMapper {
             "       SUM(d.free_coin) AS freeHomilyChartSum, " +
             "       SUM(d.task_coin) AS taskHomilyChartSum, " +
             "       (SUM(d.recharge_coin) + SUM(d.free_coin) + SUM(d.task_coin)) AS totalHomilyChartSum " +
-            "FROM detail d " +
+            "FROM detail_y d " +
             "JOIN product p ON d.product_id = p.product_id " +
             "WHERE d.update_type = '1' AND " +
             "      d.consume_platform = 'HomilyChart' " +
@@ -120,7 +120,7 @@ public interface StatisticsMapper {
             "       SUM(d.free_coin) AS freeHomilyLinkSum, " +
             "       SUM(d.task_coin) AS taskHomilyLinkSum, " +
             "       (SUM(d.recharge_coin) + SUM(d.free_coin) + SUM(d.task_coin)) AS totalHomilyLinkSum " +
-            "FROM detail d " +
+            "FROM detail_y d " +
             "JOIN product p ON d.product_id = p.product_id " +
             "WHERE d.update_type = '1' AND " +
             "      d.consume_platform = 'HomilyChart' " +
@@ -137,8 +137,8 @@ public interface StatisticsMapper {
             "(today.rechargeSumCoin + today.freeSumCoin + today.taskSumCoin) AS todayTotalCoin," ,
             "(yesterday.rechargeSumCoin + yesterday.freeSumCoin + yesterday.taskSumCoin) AS yesterdayTotalCoin," ,
             "((today.rechargeSumCoin + today.freeSumCoin + today.taskSumCoin) -(yesterday.rechargeSumCoin + yesterday.freeSumCoin + yesterday.taskSumCoin)) AS coinDifference" ,
-            "FROM (SELECT  SUM(recharge_coin) AS rechargeSumCoin, SUM(free_coin) AS freeSumCoin, SUM(task_coin) AS taskSumCoin FROM detail WHERE create_time <= CURRENT_TIMESTAMP) AS today" ,
-            "JOIN ( SELECT SUM(recharge_coin) AS rechargeSumCoin,SUM(free_coin) AS freeSumCoin, SUM(task_coin) AS taskSumCoin FROM detail WHERE DATE(create_time) <= CURDATE() - INTERVAL 1 DAY) AS yesterday"})
+            "FROM (SELECT  SUM(recharge_coin) AS rechargeSumCoin, SUM(free_coin) AS freeSumCoin, SUM(task_coin) AS taskSumCoin FROM detail_y WHERE create_time <= CURRENT_TIMESTAMP) AS today" ,
+            "JOIN ( SELECT SUM(recharge_coin) AS rechargeSumCoin,SUM(free_coin) AS freeSumCoin, SUM(task_coin) AS taskSumCoin FROM detail_y WHERE DATE(create_time) <= CURDATE() - INTERVAL 1 DAY) AS yesterday"})
     SumCoin getSumCoin();
 
 
@@ -157,7 +157,7 @@ public interface StatisticsMapper {
             "    SUM(CASE WHEN update_type IN ('1', '2') THEN recharge_coin ELSE 0 END) AS yearSumRechargeCoin,",
             "    SUM(CASE WHEN update_type IN ('1', '2') THEN free_coin ELSE 0 END) AS yearSumFreeCoin,",
             "    SUM(CASE WHEN update_type IN ('1', '2') THEN task_coin ELSE 0 END) AS yearSumTaskCoin",
-            "FROM detail WHERE YEAR(create_time) = YEAR(CURRENT_DATE)" ,
+            "FROM detail_y WHERE YEAR(create_time) = YEAR(CURRENT_DATE)" ,
             "  AND create_time <= NOW()"})
     SumCoin getYearConsumeCoin();
 
@@ -172,7 +172,7 @@ public interface StatisticsMapper {
             "       IFNULL(SUM(CASE WHEN update_type = '2' THEN recharge_coin + free_coin + task_coin ELSE 0 END), 0) AS dayRefundCoin,",
             "       IFNULL(SUM(CASE WHEN update_type = '1' THEN recharge_coin + free_coin + task_coin ELSE 0 END), 0) +",
             "       IFNULL(SUM(CASE WHEN update_type = '2' THEN recharge_coin + free_coin + task_coin ELSE 0 END), 0) AS daysumCoin",
-            "FROM `detail` WHERE DATE(create_time) = CURDATE() - INTERVAL 1 DAY"
+            "FROM `detail_y` WHERE DATE(create_time) = CURDATE() - INTERVAL 1 DAY"
     })
     SumCoin getDayConsumeCoin();
 
@@ -181,7 +181,7 @@ public interface StatisticsMapper {
 //            "        SUM(recharge_coin) AS rechargeSumCoin," ,
 //            "        SUM(free_coin) AS freeSumCoin,",
 //            "        SUM(task_coin) AS taskSumCoin" ,
-//            "FROM `detail`" ,
+//            "FROM `detail_y`" ,
 //            "WHERE create_time BETWEEN DATE_SUB(CURDATE(), INTERVAL 10 MONTH) AND CURDATE() AND update_type='0'" ,
 //            "GROUP BY DATE_FORMAT(create_time, '%Y-%m')" ,
 //            "ORDER BY DATE_FORMAT(create_time, '%Y-%m') DESC "})
@@ -191,7 +191,7 @@ public interface StatisticsMapper {
     //  本年 ---0
 //    @Select({
 //            "select DATE_FORMAT(create_time,'%Y-%m') as month,sum(recharge_coin) AS rechargeSumCoin,sum(free_coin) as freeSumCoin ,sum(task_coin) as  taskSumCoin " +
-//                    "from  detail where  datediff(create_time,#{searchStartTime})>=0 " +
+//                    "from  detail_y where  datediff(create_time,#{searchStartTime})>=0 " +
 //                    "and datediff(create_time,#{searchEndTime})<=0 and update_type = '0'" +
 //                    "GROUP BY month ORDER BY month asc"
 //    })
@@ -218,7 +218,7 @@ public interface StatisticsMapper {
     //本年--1
 //    @Select({
 //           "select DATE_FORMAT(create_time,'%Y-%m') as month,sum(recharge_coin) AS rechargeSumCoin,sum(free_coin) as freeSumCoin ,sum(task_coin) as  taskSumCoin " +
-//                   "from  detail where  datediff(create_time,#{searchStartTime})>=0 " +
+//                   "from  detail_y where  datediff(create_time,#{searchStartTime})>=0 " +
 //                   "and datediff(create_time,#{searchEndTime})<=0 and update_type = '1'" +
 //                   "GROUP BY month ORDER BY month asc"
 //    })
@@ -302,7 +302,7 @@ public interface StatisticsMapper {
             "    ) numbers",
             "    WHERE DATE_ADD(#{searchStartTime}, INTERVAL n DAY) <= #{searchEndTime}",
             ") m",
-            "LEFT JOIN detail d ON DATE(d.create_time) = m.day AND d.update_type = '1'",
+            "LEFT JOIN detail_y d ON DATE(d.create_time) = m.day AND d.update_type = '1'",
             "GROUP BY m.day",
             "ORDER BY m.day"
     })
diff --git a/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java
index 87b2790..3513d6b 100644
--- a/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java
@@ -174,6 +174,7 @@ public class StatisticsServiceImpl implements StatisticsService {
 //
 //
 //    }
+    @Cacheable(key = "#root.method.name + T(java.util.Objects).hashCode(#meium)")
     @Override
     public List<Meium> getMee(Meium meium) {
         List<Meium> result = new ArrayList<>();