Merge branch 'milestone-20251104-现金管理二期' into sunjiabei/feature-20251021102635-银行接口

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

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 {

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());
         }
 
     }

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());
         }
     }
 }

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());
         }
 
     }

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());
         }
 
     }

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());
         }
 
     }

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