From 6e4b9a3b2df93ea6df1d22c46405aaed31e1eefb Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Sat, 29 Nov 2025 15:04:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?11-29=20=E5=B0=8F=E9=BB=84=E8=BD=A6?=
 =?UTF-8?q?=E6=B6=88=E8=B4=B9=E6=95=B0=E6=8D=AE=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/Export/ExportServiceImpl.java         | 2 +-
 .../java/com/example/demo/controller/bean/BeanConsumeController.java | 5 +++++
 src/main/resources/mapper/BeanRechargeMapper1.xml                    | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/example/demo/Export/ExportServiceImpl.java b/src/main/java/com/example/demo/Export/ExportServiceImpl.java
index e86d041..66c7797 100644
--- a/src/main/java/com/example/demo/Export/ExportServiceImpl.java
+++ b/src/main/java/com/example/demo/Export/ExportServiceImpl.java
@@ -306,7 +306,7 @@ public class ExportServiceImpl implements ExportService {
 
     @Override
     public Result addExportLive(LiveDTO dto) {
-        return addExport(dto, "直播明细", "lives:queue:export_queue", "beanConsumeLive");
+        return addExport(dto, "打赏明细", "lives:queue:export_queue", "beanConsumeLive");
     }
 
     @Override
diff --git a/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java b/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java
index 3506db5..aa8d631 100644
--- a/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java
+++ b/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java
@@ -1,5 +1,6 @@
 package com.example.demo.controller.bean;
 
+import com.example.demo.config.interfac.Log;
 import com.example.demo.domain.vo.bean.BeanConsume;
 import com.example.demo.domain.vo.bean.BeanConsumeGold;
 import com.example.demo.domain.vo.bean.BeanRecharge;
@@ -58,6 +59,7 @@ public class BeanConsumeController {
         }
     }
     //筛选查询直播消费记录
+    @Log("查询直播消费记录")
     @PostMapping("/selectLiveBy")
     public Result selectLiveBy(@RequestBody Page page){
         try {
@@ -76,6 +78,7 @@ public class BeanConsumeController {
             return Result.error(e.toString());
         }}
       //筛选查询铁粉消费记录
+    @Log("查询铁粉消费记录")
     @PostMapping("/selectFanBy")
     public Result selectFanBy(@RequestBody Page page){
         try {
@@ -94,6 +97,7 @@ public class BeanConsumeController {
         }}
 
     //筛选查询文章消费记录
+    @Log("查询文章消费记录")
     @PostMapping("/selectArticleBy")
     public Result selectArticleBy(@RequestBody Page page){
         try {
@@ -112,6 +116,7 @@ public class BeanConsumeController {
         }}
 
     //筛选查询小黄车消费记录
+    @Log("查询小黄车消费记录")
     @PostMapping("/selectCartBy")
     public Result selectCartBy(@RequestBody Page page){
         try {
diff --git a/src/main/resources/mapper/BeanRechargeMapper1.xml b/src/main/resources/mapper/BeanRechargeMapper1.xml
index 569ea3f..587c7ea 100644
--- a/src/main/resources/mapper/BeanRechargeMapper1.xml
+++ b/src/main/resources/mapper/BeanRechargeMapper1.xml
@@ -30,7 +30,7 @@
     <select id="selectCartBy" resultType="com.example.demo.domain.vo.bean.BeanConsumeCartVo">
         select
             co.id, co.nickname,co.jwcode,m.name AS market,pd.name AS productName,co.total_money,co.source_name,co.live_name, FROM_UNIXTIME(co.created_at) AS createdAt
-        from cart_order co
+        from `order` co
                  left join user u on u.jwcode = co.jwcode
                  left join market m on m.id = u.market
                  left join product_dict pd on pd.id = co.product_id

From aef468730f2fea72c8648dfcc9999aec266d9cbf Mon Sep 17 00:00:00 2001
From: sunjiabei <sjb3125@163.com>
Date: Mon, 1 Dec 2025 11:21:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?12=E6=9C=881=E6=97=A5=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/demo/controller/coin/ConsumeController.java    | 10 +++++-----
 .../example/demo/controller/coin/HistoryRecordController.java  |  4 ++--
 .../com/example/demo/controller/coin/RechargeController.java   |  8 ++++----
 .../com/example/demo/controller/coin/RefundController.java     |  8 ++++----
 .../java/com/example/demo/controller/coin/RoleController.java  |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/example/demo/controller/coin/ConsumeController.java b/src/main/java/com/example/demo/controller/coin/ConsumeController.java
index 0ac6caa..458d8e3 100644
--- a/src/main/java/com/example/demo/controller/coin/ConsumeController.java
+++ b/src/main/java/com/example/demo/controller/coin/ConsumeController.java
@@ -68,7 +68,7 @@ public class ConsumeController {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            return Result.error("请检查筛选数据的格式");
+            return Result.error(e.getMessage());
 
         }
 
@@ -105,7 +105,7 @@ public class ConsumeController {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            return Result.error("请检查筛选数据的格式");
+            return Result.error(e.getMessage());
         }
 
     }
@@ -131,7 +131,7 @@ public class ConsumeController {
             return Result.success(gold);
         } catch (Exception e) {
             e.printStackTrace();
-            return Result.error("请检查数据的格式");
+            return Result.error(e.getMessage());
         }
     }
 
@@ -150,7 +150,7 @@ public class ConsumeController {
 //
         } catch (Exception e) {
             e.printStackTrace();
-            return Result.error("请查看后端报错信息");
+            return Result.error(e.getMessage());
         }
     }
 
@@ -188,7 +188,7 @@ public class ConsumeController {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            return Result.error("请检查筛选数据的格式");
+            return Result.error(e.getMessage());
         }
 
     }
diff --git a/src/main/java/com/example/demo/controller/coin/HistoryRecordController.java b/src/main/java/com/example/demo/controller/coin/HistoryRecordController.java
index 2ee5762..946316b 100644
--- a/src/main/java/com/example/demo/controller/coin/HistoryRecordController.java
+++ b/src/main/java/com/example/demo/controller/coin/HistoryRecordController.java
@@ -62,7 +62,7 @@ public class HistoryRecordController {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            return Result.error("请检查筛选数据的格式");
+            return Result.error(e.getMessage());
         }
     }
     //获取新的历史记录
@@ -87,7 +87,7 @@ public class HistoryRecordController {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            return Result.error("请检查筛选数据的格式");
+            return Result.error(e.getMessage());
         }
     }
 }
diff --git a/src/main/java/com/example/demo/controller/coin/RechargeController.java b/src/main/java/com/example/demo/controller/coin/RechargeController.java
index f3c773a..25587d9 100644
--- a/src/main/java/com/example/demo/controller/coin/RechargeController.java
+++ b/src/main/java/com/example/demo/controller/coin/RechargeController.java
@@ -95,7 +95,7 @@ public class RechargeController {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            return Result.error("请检查筛选数据的格式");
+            return Result.error(e.getMessage());
         }
 
     }
@@ -116,7 +116,7 @@ public class RechargeController {
             Gold gold = rechargeService.statsGold(rechargeUser);
             return Result.success(gold);
         } catch (Exception e) {
-            return Result.error("请检查数据的格式");
+            return Result.error(e.getMessage());
         }
     }
 
@@ -127,7 +127,7 @@ public class RechargeController {
         try {
             return rechargeService.add(rechargeUser);
         } catch (Exception e) {
-            return Result.error("请检查数据的格式");
+            return Result.error(e.getMessage());
         }
     }
 
@@ -144,7 +144,7 @@ public class RechargeController {
                 return Result.success(rechargeService.selectBy(page.getPageNum(), page.getPageSize(), page.getRechargeUser()));
             }
         } catch (Exception e) {
-            return Result.error("请检查筛选数据的格式");
+            return Result.error(e.getMessage());
         }
 
     }
diff --git a/src/main/java/com/example/demo/controller/coin/RefundController.java b/src/main/java/com/example/demo/controller/coin/RefundController.java
index 1a82402..8852184 100644
--- a/src/main/java/com/example/demo/controller/coin/RefundController.java
+++ b/src/main/java/com/example/demo/controller/coin/RefundController.java
@@ -60,7 +60,7 @@ public class RefundController {
                 return Result.success(refundService.selectAll(page.getPageNum(), page.getPageSize(), page.getRefundUser()));
             }
         } catch (Exception e) {
-            return Result.error("请检查筛选数据的格式");
+            return Result.error(e.getMessage());
         }
 
     }
@@ -87,7 +87,7 @@ public class RefundController {
                 return Result.success(refundService.selectBy(page.getPageNum(), page.getPageSize(), page.getRefundUser()));
             }
         } catch (Exception e) {
-            return Result.error("请检查筛选数据的格式");
+            return Result.error(e.getMessage());
         }
 
     }
@@ -108,7 +108,7 @@ public class RefundController {
             Gold gold = refundService.statsGold(refundUser);
             return Result.success(gold);
         } catch (Exception e) {
-            return Result.error("请检查数据的格式");
+            return Result.error(e.getMessage());
         }
     }
 
@@ -152,7 +152,7 @@ public class RefundController {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            return Result.error("请检查筛选数据的格式");
+            return Result.error(e.getMessage());
         }
 
     }
diff --git a/src/main/java/com/example/demo/controller/coin/RoleController.java b/src/main/java/com/example/demo/controller/coin/RoleController.java
index 89f220e..9d1f8b0 100644
--- a/src/main/java/com/example/demo/controller/coin/RoleController.java
+++ b/src/main/java/com/example/demo/controller/coin/RoleController.java
@@ -111,7 +111,7 @@ public class RoleController {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            return Result.error("请检查筛选数据的格式");
+            return Result.error(e.getMessage());
         }
 
     }