From 14e6888eed31894cf4a89898ad8279afa7c82005 Mon Sep 17 00:00:00 2001 From: huangqizhen Date: Thu, 19 Dec 2024 11:02:57 +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 --- src/main/java/com/example/demo/domain/vo/Meium.java | 2 +- src/main/java/com/example/demo/domain/vo/SumCoin.java | 1 - .../com/example/demo/mapper/StatisticsMapper.java | 19 +++++++++++-------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/example/demo/domain/vo/Meium.java b/src/main/java/com/example/demo/domain/vo/Meium.java index c561ba2..69acea1 100644 --- a/src/main/java/com/example/demo/domain/vo/Meium.java +++ b/src/main/java/com/example/demo/domain/vo/Meium.java @@ -17,7 +17,7 @@ import java.util.Map; @Data @NoArgsConstructor -@JsonInclude(JsonInclude.Include.NON_NULL) + public class Meium implements Serializable { //中间-11个月 每月充值金币 diff --git a/src/main/java/com/example/demo/domain/vo/SumCoin.java b/src/main/java/com/example/demo/domain/vo/SumCoin.java index 86137eb..5e900e4 100644 --- a/src/main/java/com/example/demo/domain/vo/SumCoin.java +++ b/src/main/java/com/example/demo/domain/vo/SumCoin.java @@ -13,7 +13,6 @@ import java.util.Date; @Data @NoArgsConstructor -@JsonInclude(JsonInclude.Include.NON_NULL) public class SumCoin { diff --git a/src/main/java/com/example/demo/mapper/StatisticsMapper.java b/src/main/java/com/example/demo/mapper/StatisticsMapper.java index d94b3c8..bfd0ec5 100644 --- a/src/main/java/com/example/demo/mapper/StatisticsMapper.java +++ b/src/main/java/com/example/demo/mapper/StatisticsMapper.java @@ -28,14 +28,17 @@ public interface StatisticsMapper { Statistics getTotalYearCoin(); //昨日新增 - @Select("SELECT SUM(recharge_coin) AS rechargeYesterdaySumCoin, " + - " SUM(free_coin) AS freeYesterdaySumCoin, " + - " SUM(task_coin) AS taskYesterdaySumCoin, " + - " (SUM(recharge_coin) + SUM(free_coin) + SUM(task_coin)) AS totalYesterdaySumCoin " + - "FROM `detail` " + - "WHERE update_type = '充值' " + - " AND create_time >= CURDATE() - INTERVAL 1 DAY " + - " AND create_time < CURDATE()") + @Select("SELECT \n" + + " SUM(COALESCE(recharge_coin, 0)) AS rechargeYesterdaySumCoin, \n" + + " SUM(COALESCE(free_coin, 0)) AS freeYesterdaySumCoin,\n" + + " SUM(COALESCE(task_coin, 0)) AS taskYesterdaySumCoin, \n" + + " (SUM(COALESCE(recharge_coin, 0)) + \n" + + " SUM(COALESCE(free_coin, 0)) + \n" + + " SUM(COALESCE(task_coin, 0))) AS totalYesterdaySumCoin \n" + + "FROM `detail` \n" + + "WHERE update_type = '充值' \n" + + " AND create_time >= CURDATE() - INTERVAL 1 DAY \n" + + " AND create_time < CURDATE();") Statistics getYesterdayNewCoin(); //全年累计充值人数