From 1c675efdedd6978357ac75b229cfad23bc7b58b6 Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Thu, 16 Oct 2025 13:39:18 +0800
Subject: [PATCH] =?UTF-8?q?10-16=20select=20*=20sql=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/demo/domain/entity/CashRecord.java |  2 ++
 .../com/example/demo/domain/vo/cash/CashCollection.java |  2 ++
 src/main/resources/mapper/StatisticsMapper.xml          | 17 +++++++++++++++--
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/example/demo/domain/entity/CashRecord.java b/src/main/java/com/example/demo/domain/entity/CashRecord.java
index 36de1fe..7d9ced0 100644
--- a/src/main/java/com/example/demo/domain/entity/CashRecord.java
+++ b/src/main/java/com/example/demo/domain/entity/CashRecord.java
@@ -35,6 +35,8 @@ public class CashRecord implements Serializable {
     private String bankCode;               // 银行流水订单号
     private String goodsName;              // 商品名称
     private Integer goodNum;               // 产品数量
+    private Integer permanentGold;      // 永久金币数量
+    private Integer freeGold;           // 免费金币数量
 
     // 金额信息
     private String paymentCurrency;        // 付款币种
diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java
index a5fc4ee..0883df3 100644
--- a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java
+++ b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java
@@ -35,6 +35,8 @@ public class CashCollection implements Serializable {
     private String bankCode;            // 银行流水订单号
     private String goodsName;           // 商品名称
     private Integer goodNum;            // 商品数量
+    private Integer permanentGold;      // 永久金币数量
+    private Integer freeGold;           // 免费金币数量
     //金额信息
     private String paymentCurrency;     // 付款币种
     private BigDecimal paymentAmount;   // 付款金额
diff --git a/src/main/resources/mapper/StatisticsMapper.xml b/src/main/resources/mapper/StatisticsMapper.xml
index 3c77bc2..f087ac7 100644
--- a/src/main/resources/mapper/StatisticsMapper.xml
+++ b/src/main/resources/mapper/StatisticsMapper.xml
@@ -99,20 +99,33 @@
 
     <!--获取某地区某时间所在日期的数据（仅一条）-->
     <select id="selectByMarketAndDate" resultType="com.example.demo.domain.entity.Statistics">
-        SELECT *
+        SELECT recharge_num
         FROM statistics
         WHERE market = #{market}
         AND  current_datetime BETWEEN #{startDate} AND #{endDate}
 
     </select>
     <select id="selectByMarketsAndDate" resultType="com.example.demo.domain.entity.Statistics">
-        SELECT * FROM statistics
+        SELECT market, current_gold,daily_change,
+               current_permanent, current_free_june,
+               current_free_december, current_task,
+               recharge, money,
+               consume_permanent, consume_free_june,
+               consume_free_december, consume_task,
+               refund_permanent, refund_free_june,
+               refund_free_december, refund_task,
+               recharge_num, first_recharge,
+               yearly_recharge, yearly_money,
+               yearly_consume, yearly_refund,
+               yearly_recharge_num,update_time
+            FROM statistics
         WHERE market IN
         <foreach item="market" collection="markets" open="(" separator="," close=")">
             #{market}
         </foreach>
         AND current_datetime BETWEEN #{startDate} AND #{endDate}
     </select>
+    <!--批量查询-->
     <select id="listPart1All" resultType="com.example.demo.domain.entity.Statistics">
         SELECT
             m.name as market,