From 9ad7f3af694953d345ca7dbcaf3d67ef82e18d3c Mon Sep 17 00:00:00 2001
From: sunjiabei <sjb3125@163.com>
Date: Tue, 24 Jun 2025 13:27:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E6=A8=A1=E5=9D=97=EF=BC=8C?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9F=A5=E8=AF=A2=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/demo/controller/ConsumeController.java | 27 +++++---
 .../java/com/example/demo/domain/vo/Consume.java   | 18 ++++--
 .../com/example/demo/mapper/ConsumeMapper.java     |  2 +
 .../com/example/demo/service/ConsumeService.java   |  2 +
 .../demo/serviceImpl/ConsumeServiceImpl.java       |  8 +++
 src/main/resources/mapper/ConsumeMapper.xml        | 73 ++++++++++++++++------
 6 files changed, 96 insertions(+), 34 deletions(-)

diff --git a/src/main/java/com/example/demo/controller/ConsumeController.java b/src/main/java/com/example/demo/controller/ConsumeController.java
index 8091107..6a45db4 100644
--- a/src/main/java/com/example/demo/controller/ConsumeController.java
+++ b/src/main/java/com/example/demo/controller/ConsumeController.java
@@ -34,24 +34,35 @@ public class ConsumeController {
 
     //消耗明细
     @PostMapping("/selectAll")
-    public Result selcetAll(@RequestBody Page page)
-    {
-        if(ObjectUtils.isEmpty(page.getPageNum())){
+    public Result selcetAll(@RequestBody Page page) {
+        if (ObjectUtils.isEmpty(page.getPageNum())) {
             return Result.error("页码数为空！");
         }
-        if(ObjectUtils.isEmpty(page.getPageSize())){
+        if (ObjectUtils.isEmpty(page.getPageSize())) {
             return Result.error("页大小为空！");
-        }
-        else{
+        } else {
             return Result.success(consumeService.selectAll(page.getPageNum(), page.getPageSize()));
         }
 
     }
 
+    //消耗明细筛选
+    @PostMapping("/selectBy")
+    public Result selcetBy(@RequestBody Page page) {
+        if (ObjectUtils.isEmpty(page.getPageNum())) {
+            return Result.error("页码数为空！");
+        }
+        if (ObjectUtils.isEmpty(page.getPageSize())) {
+            return Result.error("页大小为空！");
+        } else {
+            return Result.success(consumeService.selectBy(page.getPageNum(), page.getPageSize(), page.getConsume()));
+        }
+
+    }
+
     //消耗金币统计
     @PostMapping("/statsGold")
-    public Result statsGold()
-    {
+    public Result statsGold() {
         Gold gold = consumeService.statsGold();
         return Result.success(gold);
     }
diff --git a/src/main/java/com/example/demo/domain/vo/Consume.java b/src/main/java/com/example/demo/domain/vo/Consume.java
index c3482e2..90c3a00 100644
--- a/src/main/java/com/example/demo/domain/vo/Consume.java
+++ b/src/main/java/com/example/demo/domain/vo/Consume.java
@@ -1,18 +1,20 @@
 package com.example.demo.domain.vo;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+
 import java.io.Serializable;
 import java.util.Date;
 
 /**
-@program: gold-java
-@ClassName Consume
-@description: 消费明细
-@author: Double
-@create: 2025−06-23 11:53
-@Version 1.0
+ * @program: gold-java
+ * @ClassName Consume
+ * @description: 消费明细
+ * @author: Double
+ * @create: 2025−06-23 11:53
+ * @Version 1.0
  **/
 
 @Data
@@ -36,4 +38,8 @@ public class Consume implements Serializable {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date payTime; // 消费时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date startTime; // 开始时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date endTime; // 结束时间
 }
diff --git a/src/main/java/com/example/demo/mapper/ConsumeMapper.java b/src/main/java/com/example/demo/mapper/ConsumeMapper.java
index 505111e..98402a0 100644
--- a/src/main/java/com/example/demo/mapper/ConsumeMapper.java
+++ b/src/main/java/com/example/demo/mapper/ConsumeMapper.java
@@ -18,4 +18,6 @@ import java.util.List;
 public interface ConsumeMapper {
 
      List<Consume> selectAll();
+
+     List<Consume> selectBy(Consume consume);
 }
diff --git a/src/main/java/com/example/demo/service/ConsumeService.java b/src/main/java/com/example/demo/service/ConsumeService.java
index 3219d50..2b144b6 100644
--- a/src/main/java/com/example/demo/service/ConsumeService.java
+++ b/src/main/java/com/example/demo/service/ConsumeService.java
@@ -21,4 +21,6 @@ public interface ConsumeService {
     PageInfo<Consume> selectAll(Integer pageNum, Integer pageSize);
 
     Gold statsGold();
+
+    PageInfo<Consume> selectBy(Integer pageNum, Integer pageSize, Consume consume);
 }
diff --git a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java
index 36decaf..8dc06fc 100644
--- a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java
@@ -68,4 +68,12 @@ public class ConsumeServiceImpl implements ConsumeService {
 
         return gold;
     }
+
+    //消耗明细筛选
+    @Override
+    public PageInfo<Consume> selectBy(Integer pageNum, Integer pageSize, Consume consume) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<Consume> consumes = consumeMapper.selectBy(consume);
+        return new PageInfo<>(consumes);
+    }
 }
diff --git a/src/main/resources/mapper/ConsumeMapper.xml b/src/main/resources/mapper/ConsumeMapper.xml
index af128e0..3f286cc 100644
--- a/src/main/resources/mapper/ConsumeMapper.xml
+++ b/src/main/resources/mapper/ConsumeMapper.xml
@@ -4,26 +4,59 @@
 
     <!-- 查询所有消费记录 -->
     <select id="selectAll" resultType="com.example.demo.domain.vo.Consume">
-        SELECT
-            u.name AS name,
-            u.jwcode AS jwcode,
-            u.market AS market,
-            ugr.goods_name AS goodsName,
-            ugr.pay_platform AS payPlatform,
-            ugr.sum_gold AS sumGold,
-            ugr.permanent_gold AS permanentGold,
-            (COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0)) AS freeGold,
-            ugr.task_gold AS taskGold,
-            ugr.remark AS remark,
-            a.admin_name AS adminName,
-            ugr.pay_time AS payTime
-        FROM
-            user u
-                JOIN
-            user_gold_record ugr ON u.jwcode = ugr.jwcode
-                JOIN
-            admin a ON ugr.admin_id = a.id
-        WHERE
+        SELECT u.name                                                        AS name,
+               u.jwcode                                                      AS jwcode,
+               u.market                                                      AS market,
+               ugr.goods_name                                                AS goodsName,
+               ugr.pay_platform                                              AS payPlatform,
+               ugr.sum_gold                                                  AS sumGold,
+               ugr.permanent_gold                                            AS permanentGold,
+               (COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0)) AS freeGold,
+               ugr.task_gold                                                 AS taskGold,
+               ugr.remark                                                    AS remark,
+               a.admin_name                                                  AS adminName,
+               ugr.pay_time                                                  AS payTime
+        FROM user u
+                 JOIN
+             user_gold_record ugr ON u.jwcode = ugr.jwcode
+                 JOIN
+             admin a ON ugr.admin_id = a.id
+        WHERE ugr.type = 1
+    </select>
+
+    <!-- 查询筛选后消费记录 -->
+    <select id="selectBy" resultType="com.example.demo.domain.vo.Consume">
+        SELECT u.name AS name,
+        u.jwcode AS jwcode,
+        u.market AS market,
+        ugr.goods_name AS goodsName,
+        ugr.pay_platform AS payPlatform,
+        ugr.sum_gold AS sumGold,
+        ugr.permanent_gold AS permanentGold,
+        (COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0)) AS freeGold,
+        ugr.task_gold AS taskGold,
+        ugr.remark AS remark,
+        a.admin_name AS adminName,
+        ugr.pay_time AS payTime
+        FROM user u
+        JOIN
+        user_gold_record ugr ON u.jwcode = ugr.jwcode
+        JOIN
+        admin a ON ugr.admin_id = a.id
+        <where>
             ugr.type = 1
+            <if test="goodsName != null and goodsName != ''">
+                AND ugr.goods_name = #{goodsName}
+            </if>
+            <if test="market != null and market != ''">
+                AND u.market = #{market}
+            </if>
+            <if test="payPlatform != null and payPlatform != ''">
+                AND ugr.pay_platform = #{payPlatform}
+            </if>
+            <if test="startTime != null and endTime != null">
+                AND ugr.pay_time BETWEEN #{startTime} AND #{endTime}
+            </if>
+        </where>
     </select>
 </mapper>
\ No newline at end of file