Merge remote-tracking branch 'refs/remotes/origin/lijianlin/feature-20250728171217-三期金豆消费相关' into milestone-20250727-金币重构三期

src/main/java/com/example/demo/domain/vo/bean/BeanConsumeFan.java

@@ -32,6 +32,10 @@ public class BeanConsumeFan {
     private String dept;    //地区/分部
     @ExcelProperty("金豆数量")
     private String beanNum; //金豆数量
+    @ExcelProperty("免费金豆")
+    private String freeBean; //免费金豆
+    @ExcelProperty("付费金豆")
+    private String buyBean; //付费金豆
     @ExcelProperty("频道名称")
     private String channel;  //频道名称（source_name）
     @ExcelProperty("消费方式")

src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java

@@ -39,6 +39,8 @@ public class BeanConsumeLive {
     private String type;    //类型
     @ExcelProperty("礼物名称")
     private String gift;    //礼物名称
+    @ExcelProperty("是否为背包礼物")
+    private String isBackpack;
     @ExcelProperty("金豆数量")
     private String beanNum; //金豆数量
     @ExcelProperty("频道名称")

src/main/resources/application-test.yml

@@ -35,16 +35,19 @@ spring:
   data:
     redis:
       database: 0
-      host: localhost
-      port: 6379
-#      password: 123456
+      host: 54.255.212.181
+      port: 10703
+      password: Ngc0FYUTA6h3wC5J
 
       lettuce:
         pool:
           max-active: 20
           max-wait: -1
           max-idle: 5
-
+http://192:
+  168:
+    1:
+      50:8081:
 file:
   upload:
     url: http://39.101.133.168:8828/hljw/api/aws/upload

src/main/resources/application.yml

@@ -68,11 +68,11 @@ spring:
       max-request-size: 10MB
 
   data:
-#    redis:
-#      database: 0
-#      host: 18.143.76.3
-#      port: 10703
-#      password: Ngc0FYUTA6h3wC5J
+    redis:
+      database: 0
+      host: 54.255.212.181
+      port: 10703
+      password: Ngc0FYUTA6h3wC5J
 
       lettuce:
         pool:

src/main/resources/jindouMapper/BeanConsumeMapper.xml

@@ -129,6 +129,8 @@
         fm.jwcode,
         fm.dept,
         fyr.money AS beanNum,
+        fyr.money_free AS freeBean,
+        fyr.money_buy AS buyBean,
         fyr.source_name AS channel,
         fyr.source_type AS type,
         FROM_UNIXTIME(fyr.time, '%Y-%m-%d %H:%i:%s') AS consumeTime,

src/main/resources/liveMapper/LiveMapper.xml

@@ -9,6 +9,7 @@
                lgg.jwcode as jwcode,
                mi.deptName as dept,
                lg.name as gift,
+               lgg.knapsack as isBackpack,
                lgg.gold_beans as beanNum,
                lgg.gold_free as freeBean,
                lgg.gold_buy as buyBean,