From ececbd3553329307efa4cc20f98f5fa2dfeff702 Mon Sep 17 00:00:00 2001
From: yufenghao <3508605349@qq.com>
Date: Tue, 4 Nov 2025 15:32:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E6=9D=A1=E4=BB=B6=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/gb/bean/vo/LiveOrderVO.java       |  6 +++++-
 .../example/gb/controller/GoldbeanConsumeController.java    |  3 +++
 .../example/gb/service/impl/GoldbeanConsumeServiceImpl.java | 13 +++++++++++++
 src/main/resources/mapper/GoldbeanConsumeMapper.xml         | 13 +++++++++++++
 4 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/example/gb/bean/vo/LiveOrderVO.java b/src/main/java/com/example/gb/bean/vo/LiveOrderVO.java
index 82755c6..98c8853 100644
--- a/src/main/java/com/example/gb/bean/vo/LiveOrderVO.java
+++ b/src/main/java/com/example/gb/bean/vo/LiveOrderVO.java
@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data
@@ -14,6 +15,7 @@ public class LiveOrderVO {
     private String userRealName;
     private Integer jwcode;
     private String ipAddress;
+    private Integer gId;
     private String type;
     private Integer goldBeans;
     private Integer goldFree;
@@ -22,7 +24,9 @@ public class LiveOrderVO {
     private String liveName;
     private String channelId;
     private String channelName;
-
+    private Integer time;
     private Date beginTime;
+    private Integer beg;
     private Date endTime;
+    private Integer end;
 }
diff --git a/src/main/java/com/example/gb/controller/GoldbeanConsumeController.java b/src/main/java/com/example/gb/controller/GoldbeanConsumeController.java
index caef34a..1515520 100644
--- a/src/main/java/com/example/gb/controller/GoldbeanConsumeController.java
+++ b/src/main/java/com/example/gb/controller/GoldbeanConsumeController.java
@@ -12,6 +12,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalDateTime;
+import java.util.Date;
+
 @RestController
 @RequestMapping("/admin/consume")
 public class GoldbeanConsumeController {
diff --git a/src/main/java/com/example/gb/service/impl/GoldbeanConsumeServiceImpl.java b/src/main/java/com/example/gb/service/impl/GoldbeanConsumeServiceImpl.java
index 21b07b1..407d2fa 100644
--- a/src/main/java/com/example/gb/service/impl/GoldbeanConsumeServiceImpl.java
+++ b/src/main/java/com/example/gb/service/impl/GoldbeanConsumeServiceImpl.java
@@ -21,6 +21,19 @@ public class GoldbeanConsumeServiceImpl implements GoldbeanConsumeService {
     }
     @Override
     public Result getLiveConsumeList(Page<LiveOrderVO> page) {
+        // 处理时间参数转换
+        LiveOrderVO data = page.getData();
+        if (data != null) {
+            // 如果前端传入的是秒级时间戳字符串，需要转换为Date对象
+            if (data.getBeginTime() != null && data.getBeg() == null) {
+                data.setBeg((int) (data.getBeginTime().getTime()));
+                System.out.println(data.getBeg());
+            }
+            if (data.getEndTime() != null && data.getEnd() == null) {
+                data.setEnd((int) (data.getEndTime().getTime()));
+                System.out.println(data.getEnd());
+            }
+        }
         PageHelper.startPage(page.getCurrentPage(),page.getPageSize());
         List<LiveOrderVO> list = goldbeanConsumeMapper.getLiveConsumeList(page.getData());
         PageInfo<LiveOrderVO> pageInfo = new PageInfo<>(list);
diff --git a/src/main/resources/mapper/GoldbeanConsumeMapper.xml b/src/main/resources/mapper/GoldbeanConsumeMapper.xml
index 719cf2b..1c60ec5 100644
--- a/src/main/resources/mapper/GoldbeanConsumeMapper.xml
+++ b/src/main/resources/mapper/GoldbeanConsumeMapper.xml
@@ -7,6 +7,7 @@
             fx.true_name as userRealName,
             fx.jwcode as jwcode,
             fx.ip_address as ipAddress,
+            lgg.g_id as gId,
             lg.name as type,
             lgg.gold_beans as goldBeans,
             lgg.gold_free as goldFree,
@@ -28,6 +29,18 @@
             <if test="liveId != null">
                 and lgg.live_id = #{liveId}
             </if>
+            <if test="channelId != null">
+                and lp.pd_id = #{channelId}
+            </if>
+            <if test="gId != null">
+                and lgg.g_id = #{gId}
+            </if>
+            <if test="beg != null">
+                and lgg.time &gt;= #{beg}
+            </if>
+            <if test="end != null">
+                and lgg.time &lt;= #{end}
+            </if>
         </where>
     </select>
 </mapper>
\ No newline at end of file