这是一次拉取Merge branch 'milestone-20250727-金币重构三期' of http://39.101.133.168:8807/huangqizhen/gold-java into milestone-20250727-金币重构三期

src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java

@@ -143,15 +143,16 @@ public class MysqlServiceImpl implements MysqlService {
                         if (operation_platform.equals("1")){
                             mysqlStmt.setString(8, "ERP");
                         }
-                        if (operation_platform.equals("2")){
+                        else if (operation_platform.equals("2")){
                             mysqlStmt.setString(8, "HomilyLink");
                         }
-                        if(operation_platform.equals("3")){
+                        else if(operation_platform.equals("3")){
                             mysqlStmt.setString(8, "HomilyChart");
                         }
-                        if(operation_platform.equals("4")){
+                        else if(operation_platform.equals("4")){
                             continue;
-                        }if(operation_platform.equals("0")){
+                        }
+                        else if(operation_platform.equals("0")){
                             mysqlStmt.setString(8, "初始化金币");
                         }
                         else {

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

@@ -34,7 +34,7 @@ public class BeanRechargeInfo {
     private String market; // 所属地区
     @ExcelProperty("免费金豆")
     private Integer freeBean; // 免费豆
-    @ExcelProperty("永久金豆")
+    @ExcelProperty("付费金豆")
     private Integer permanentBean; // 永久豆
     @ExcelProperty("金额")
     private Double money; // 金额

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

@@ -34,7 +34,7 @@ public class BeanSystemRechargeInfo {
     private String market; // 所属地区
     @ExcelProperty("免费金豆")
     private Integer freeBean; // 免费豆
-    @ExcelProperty("永久金豆")
+    @ExcelProperty("付费金豆")
     private Integer permanentBean; // 永久豆
     @ExcelProperty("金额")
     private Double money; // 金额

src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java

@@ -68,14 +68,7 @@ public class BeanConsumeServiceImpl implements BeanConsumeService {
     @Override
     public Result reduce(BeanConsume consume) {
 
-            //获取用户当前余额
-            BeanUserCard user= beanUserMapper.userCard(consume.getJwcode());
-            if (user.getFreeBean() < consume.getFreeBean()) {
-                return Result.error("用户免费金豆余额不足");
-            }
-            if (user.getPermanentBean() < consume.getPermanentBean()) {
-                return Result.error("用户永久金豆余额不足");
-            }
+
             // 验证精网号是否有效
             if (consume.getJwcode() == null || consume.getJwcode().isEmpty()) {
                 return Result.error("精网号不能为空");
@@ -93,6 +86,14 @@ public class BeanConsumeServiceImpl implements BeanConsumeService {
             if (consume.getFreeBean() == 0 && consume.getPermanentBean() == 0) {
                 return Result.error("免费豆和永久豆不能同时为0");
             }
+            //获取用户当前余额
+            BeanUserCard user= beanUserMapper.userCard(consume.getJwcode());
+            if (user.getFreeBean() < consume.getFreeBean()) {
+                return Result.error("用户免费金豆余额不足");
+            }
+            if (user.getPermanentBean() < consume.getPermanentBean()) {
+                return Result.error("用户永久金豆余额不足");
+            }
             // 验证备注是否为空
             if (consume.getRemark() == null || consume.getRemark().isEmpty()) {
                 return Result.error("备注不能为空");

src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java

@@ -142,6 +142,9 @@ public class AuditServiceImpl implements AuditService {
     public PageInfo<RechargeAudit> selectRechargeBy(Integer pageNum, Integer pageSize, RechargeAudit rechargeAudit) {
 
         List<String> markets = marketMapper.getMarketIds(rechargeAudit.getMarkets());
+        if (markets.contains("9") || markets.contains("9999")){
+            markets=null;
+        }
         rechargeAudit.setMarkets(markets);
         PageHelper.startPage(pageNum, pageSize);
         List<RechargeAudit> rechargeAudits = auditMapper.selectRechargeBy(pageNum, pageSize, rechargeAudit);
@@ -156,6 +159,9 @@ public class AuditServiceImpl implements AuditService {
 
 
         List<String> markets = marketMapper.getMarketIds(refundAudit.getMarkets());
+        if (markets.contains("9") || markets.contains("9999")){
+            markets=null;
+        }
         refundAudit.setMarkets(markets);
         PageHelper.startPage(pageNum, pageSize);
 
@@ -173,6 +179,9 @@ public class AuditServiceImpl implements AuditService {
         //获取充值审核订单列表
 
         List<String> markets = marketMapper.getMarketIds(rechargeAudit.getMarkets());
+        if (markets.contains("9") || markets.contains("9999")){
+            markets=null;
+        }
         rechargeAudit.setMarkets(markets);
         List<RechargeAudit> rechargeAudits = auditMapper.selectRechargeBy(1, 500000, rechargeAudit);
         // 初始化累加器
@@ -209,6 +218,9 @@ public class AuditServiceImpl implements AuditService {
         //获取充值审核订单列表
 
         List<String> markets = marketMapper.getMarketIds(refundAudit.getMarkets());
+        if (markets.contains("9") || markets.contains("9999")){
+            markets=null;
+        }
         refundAudit.setMarkets(markets);
         List<RefundAudit> refundAudits = auditMapper.selectRefundBy(1, 500000, refundAudit);
         // 初始化累加器

src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java

@@ -62,6 +62,9 @@ public class ConsumeServiceImpl implements ConsumeService {
     public Gold statsGold(ConsumeUser consumeUser) {
         //获取市场id
         List<String> markets = marketMapper.getMarketIds(consumeUser.getMarkets());
+        if (markets.contains("9") || markets.contains("9999")){
+            markets=null;
+        }
         consumeUser.setMarkets(markets);
         Gold gold = new Gold();
         List<ConsumeUser> consumeUsers = consumeMapper.selectBy(consumeUser);
@@ -100,6 +103,9 @@ public class ConsumeServiceImpl implements ConsumeService {
     public PageInfo<ConsumeUser> selectBy(Integer pageNum, Integer pageSize, ConsumeUser consumeUser) {
         //获取市场id
         List<String> markets = marketMapper.getMarketIds(consumeUser.getMarkets());
+        if (markets.contains("9") || markets.contains("9999")){
+            markets=null;
+        }
         consumeUser.setMarkets(markets);
         PageHelper.startPage(pageNum, pageSize);
         List<ConsumeUser> consumeUsers = consumeMapper.selectBy(consumeUser);

src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java

@@ -61,6 +61,9 @@ public class RechargeServiceImpl implements RechargeService {
     @Override
     public PageInfo<RechargeUser> selectBy(Integer pageNum, Integer pageSize, RechargeUser rechargeUser) throws  Exception{
         List<String> markets = marketMapper.getMarketIds(rechargeUser.getMarkets());
+        if (markets.contains("9") || markets.contains("9999")){
+            markets=null;
+        }
         rechargeUser.setMarkets(markets);
         PageHelper.startPage(pageNum, pageSize);
         List<RechargeUser> rechargeUsers = rechargeMapper.selectBy(rechargeUser);
@@ -71,6 +74,10 @@ public class RechargeServiceImpl implements RechargeService {
     @Override
     public Gold statsGold(RechargeUser rechargeUser) {
         List<String> markets = marketMapper.getMarketIds(rechargeUser.getMarkets());
+        if (markets.contains("9") || markets.contains("9999")){
+            markets=null;
+
+        }
         rechargeUser.setMarkets(markets);
         Gold gold = new Gold();
         List<RechargeUser> rechargeUsers = rechargeMapper.selectBy(rechargeUser);
@@ -112,7 +119,10 @@ public class RechargeServiceImpl implements RechargeService {
         {
             return Result.error("精网号位数小于8位或大于8位");
         }
-
+        // 验证免费金币和永久金币是否均为0
+        if (rechargeUser.getFreeGold() == 0 && rechargeUser.getPermanentGold() == 0) {
+            return Result.error("免费金币和永久金币不能同时为0");
+        }
         BeanUserCard user = beanUserMapper.userCard(String.valueOf(rechargeUser.getJwcode()));
         if(user==null){
             return Result.error("用户查找不到");

src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java

@@ -59,6 +59,9 @@ public class RefundServiceImpl implements RefundService {
     @Override
     public Gold statsGold(RefundUser refundUser) {
         List<String> markets = marketMapper.getMarketIds(refundUser.getMarkets());
+        if (markets.contains("9") || markets.contains("9999")){
+            markets=null;
+        }
         refundUser.setMarkets(markets);
         Gold gold = new Gold();
         List<RefundUser> refundUsers = refundMapper.selectBy(refundUser);
@@ -96,6 +99,9 @@ public class RefundServiceImpl implements RefundService {
     @Override
     public PageInfo<RefundUser> selectBy(Integer pageNum, Integer pageSize, RefundUser refundUser)throws  Exception {
         List<String> markets = marketMapper.getMarketIds(refundUser.getMarkets());
+        if (markets.contains("9") || markets.contains("9999")){
+            markets=null;
+        }
         refundUser.setMarkets(markets);
         PageHelper.startPage(pageNum, pageSize);
         List<RefundUser> refundUsers = refundMapper.selectBy(refundUser);

src/main/resources/application-dev.yml

@@ -12,17 +12,17 @@ spring:
         pool-name: mysql1HikariCP
         maximum-pool-size: 10
     mysql2:
-      jdbc-url: jdbc:mysql://52.220.141.241:3306/hljw?serverTimezone=Asia/Shanghai
-      username: gold_coin
-      password: NaVILnQottaWpMTw0o
+      jdbc-url: jdbc:mysql://39.101.133.168:3306/hljw?serverTimezone=Asia/Shanghai
+      username: hljw
+      password: 5dmWCCKfEk3TTeyn
       driver-class-name: com.mysql.cj.jdbc.Driver
       hikari:
         pool-name: mysql2HikariCP
         maximum-pool-size: 10
     mysql3:
-      jdbc-url: jdbc:mysql://52.220.141.241:3306/pay?serverTimezone=Asia/Shanghai
-      username: gold_coin
-      password: NaVILnQottaWpMTw0o
+      jdbc-url: jdbc:mysql://121.89.234.155:3306/pay_xxcg_com?serverTimezone=Asia/Shanghai
+      username: pay_xxcg_com
+      password: 4hHmzxZH4rF4c5xr
       driver-class-name: com.mysql.cj.jdbc.Driver
       hikari:
         pool-name: mysql3HikariCP
@@ -36,9 +36,9 @@ spring:
         pool-name: mysql3HikariCP
         maximum-pool-size: 10
     mysql5:
-      jdbc-url: jdbc:mysql://52.220.141.241:3306/live?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&allowMultiQueries=true&rewriteBatchedStatements=true
-      username: gold_coin
-      password: NaVILnQottaWpMTw0o
+      jdbc-url: jdbc:mysql://39.101.133.168:3306/live?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&allowMultiQueries=true&rewriteBatchedStatements=true
+      username: live
+      password: p4jMAMShNM8HTrbX
       driver-class-name: com.mysql.cj.jdbc.Driver
       hikari:
         pool-name: mysql5HikariCP

src/main/resources/application-prod.yml

@@ -12,17 +12,17 @@ spring:
         pool-name: mysql1HikariCP
         maximum-pool-size: 10
     mysql2:
-      jdbc-url: jdbc:mysql://39.101.133.168:3306/hljw?serverTimezone=Asia/Shanghai
-      username: hljw
-      password: 5dmWCCKfEk3TTeyn
+      jdbc-url: jdbc:mysql://52.220.141.241:3306/hljw?serverTimezone=Asia/Shanghai
+      username: gold_coin
+      password: NaVILnQottaWpMTw0o
       driver-class-name: com.mysql.cj.jdbc.Driver
       hikari:
         pool-name: mysql2HikariCP
         maximum-pool-size: 10
     mysql3:
-      jdbc-url: jdbc:mysql://121.89.234.155:3306/pay_xxcg_com?serverTimezone=Asia/Shanghai
-      username: pay_xxcg_com
-      password: 4hHmzxZH4rF4c5xr
+      jdbc-url: jdbc:mysql://52.220.141.241:3306/pay?serverTimezone=Asia/Shanghai
+      username: gold_coin
+      password: NaVILnQottaWpMTw0o
       driver-class-name: com.mysql.cj.jdbc.Driver
       hikari:
         pool-name: mysql3HikariCP
@@ -36,9 +36,9 @@ spring:
         pool-name: mysql3HikariCP
         maximum-pool-size: 10
     mysql5:
-      jdbc-url: jdbc:mysql://39.101.133.168:3306/live?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&allowMultiQueries=true&rewriteBatchedStatements=true
-      username: live
-      password: p4jMAMShNM8HTrbX
+      jdbc-url: jdbc:mysql://52.220.141.241:3306/live?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&allowMultiQueries=true&rewriteBatchedStatements=true
+      username: gold_coin
+      password: NaVILnQottaWpMTw0o
       driver-class-name: com.mysql.cj.jdbc.Driver
       hikari:
         pool-name: mysql5HikariCP
@@ -49,6 +49,7 @@ spring:
       password: hwhc_gold_query4564jkj
       driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
 
+
   application:
     name: demo
   cache:
@@ -87,10 +88,9 @@ feishu:
 
 bean:
   recharge:
-  # url: http://api.homilychart.com/hljwgo/api/wallet/recharge
-    url: http://39.101.133.168:8828/hljwgo/api/wallet/recharge
+   url: http://api.homilychart.com/hljwgo/api/wallet/recharge
   consume:
-    url: http://39.101.133.168:8828/hljwgo/api/wallet/pay
+   url: http://api.homilychart.com/hljwgo/api/wallet/pay
 
 server:
-  port: 10704
+  port: 10705

src/main/resources/application-test.yml

@@ -67,9 +67,9 @@ spring:
   data:
     redis:
       database: 0
-      host: 54.255.212.181
-      port: 10703
-      password: Ngc0FYUTA6h3wC5J
+      host: localhost
+      port: 6379
+      password: 123456
 
       lettuce:
         pool:

src/main/resources/application.yml

@@ -52,7 +52,7 @@ mybatis:
   configuration:
     mysql1:
       map-underscore-to-camel-case: true
-#      log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+      log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     sqlserver1:
       map-underscore-to-camel-case: true
 #      log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

src/main/resources/jindouMapper/BeanConsumeMapper.xml

@@ -287,13 +287,13 @@
                 AND fm.dept = #{beanConsumeArticle.dept}
             </if>
             <if test="beanConsumeArticle.ArticleName != null and beanConsumeArticle.ArticleName != ''">
-                AND fyr.source_name =#{beanConsumeArticle.articleName}
+                AND fyr.source_name LIKE CONCAT('%',#{beanConsumeArticle.articleName}, '%')
             </if>
             <if test="beanConsumeArticle.author != null and beanConsumeArticle.author != ''">
                 AND (SELECT fm2.nickname
                 FROM fx_member fm2
                 WHERE fm2.jwcode = fyr.source_jwcode
-                LIMIT 1)=#{beanConsumeArticle.author}
+                LIMIT 1)LIKE CONCAT('%',#{beanConsumeArticle.author}, '%')
             </if>
             <if test="beanConsumeArticle.articleId != null and beanConsumeArticle.articleId != ''">
                 AND fyr.source_id =#{beanConsumeArticle.articleId}

src/main/resources/mapper/AuditMapper.xml

@@ -63,7 +63,7 @@
                 AND ugr.activity = #{rechargeAudit.activity}
             </if>
             <!-- 判断 market 是否不为总部且 markets 不为空 -->
-            <if test="rechargeAudit.markets != null and rechargeAudit.markets.size() > 0 and '9999' not in rechargeAudit.markets and '9' not in rechargeAudit.markets">
+            <if test="rechargeAudit.markets != null and rechargeAudit.markets.size() > 0">
                 AND (
                 <foreach collection="rechargeAudit.markets" item="market" open="" close="" separator=" OR ">
                     u.market = #{market}
@@ -124,7 +124,7 @@
             </if>
 
             <!-- 判断 market 是否不为总部且 markets 不为空 -->
-            <if test="refundAudit.markets != null and refundAudit.markets.size() > 0 and '9999' not in refundAudit.markets and '9' not in refundAudit.markets">
+            <if test="refundAudit.markets != null and refundAudit.markets.size() > 0">
                 AND (
                 <foreach collection="refundAudit.markets" item="market" open="" close="" separator=" OR ">
                     u.market = #{market}

src/main/resources/mapper/ConsumeMapper.xml

@@ -95,12 +95,11 @@
 
         <where>
             ugr.type = 1 AND ugr.flag = 1
-            <if test="markets != null and markets.size() > 0 and '9999' not in markets and '9' not in markets">
-                AND (
-                <foreach collection="markets" item="market" open="" close="" separator=" OR ">
-                    u.market = #{market}
+            <if test="markets != null and markets.size() > 0">
+                AND u.market IN
+                <foreach collection="markets" item="market" open="(" separator="," close=")">
+                    #{market}
                 </foreach>
-                )
             </if>
             <if test="jwcode != null and jwcode != ''">
                 AND ugr.jwcode = #{jwcode}

src/main/resources/mapper/GoldDetailMapper.xml

@@ -62,7 +62,7 @@
             </if>
             <if test="markets!= null and markets.size > 0">
                 AND user.market IN
-                <foreach collection="markets" item="markets" open="(" separator="," close=")">
+                <foreach collection="markets" item="market" open="(" separator="," close=")">
                     #{market}
                 </foreach>
             </if>
@@ -73,13 +73,22 @@
 
     </select>
     <select id="getGold" resultType="com.example.demo.domain.entity.User">
-        select * from user
+        select u.id,u.jwcode,u.name,m.name as market,u.sum_permanent_gold,
+               u.sum_free_june,u.sum_free_december,u.sum_task_gold,
+               u.current_permanent_gold,u.current_free_june,
+               u.current_free_december,u.current_task_gold,
+               u.recharge_num,u.consume_num,
+               u.sum_consume_permanent,u.sum_consume_task,
+               u.sum_consume_free,u.first_recharge,u.create_time,
+               u.update_time
+        from user u
+        left join market m on u.market = m.id
         <where>
             <if test="jwcode != null">
                 and jwcode = #{jwcode}
             </if>
             <if test="markets != null and markets.size > 0">
-                AND user.market IN
+                AND m.name IN
                 <foreach collection="markets" item="market" open="(" separator="," close=")">
                     #{market}
                 </foreach>

src/main/resources/mapper/RechargeMapper.xml

@@ -99,12 +99,11 @@
             ugr.type = 0 AND ugr.audit_status IN (1,3)
             AND ugr.flag = 1
             <!-- 判断 market 是否不为总部且 markets 不为空 -->
-            <if test="markets != null and markets.size() > 0 and '9999' not in markets and '9' not in markets">
-                AND (
-                <foreach collection="markets" item="market" open="" close="" separator=" OR ">
-                    u.market = #{market}
+            <if test="markets != null and markets.size() > 0">
+                AND u.market IN
+                <foreach collection="markets" item="market" open="(" separator="," close=")">
+                    #{market}
                 </foreach>
-                )
             </if>
             <if test="jwcode != null and jwcode != ''">
                 AND ugr.jwcode = #{jwcode}

src/main/resources/mapper/RefundMapper.xml

@@ -97,12 +97,11 @@
         left join market m ON u.market = m.id
         <where>
             ugr.type = 2 AND ugr.audit_status IN (1,3) AND ugr.flag = 1
-            <if test="markets != null and markets.size() > 0 and '9999' not in markets and '9' not in markets">
-                AND (
-                <foreach collection="markets" item="market" open="" close="" separator=" OR ">
-                    u.market = #{market}
+            <if test="markets != null and markets.size() > 0">
+                AND u.market IN
+                <foreach collection="markets" item="market" open="(" separator="," close=")">
+                    #{market}
                 </foreach>
-                )
             </if>
             <if test="jwcode != null and jwcode != ''">
                 AND ugr.jwcode = #{jwcode}

src/main/resources/mapper/UserMapper.xml

@@ -39,21 +39,22 @@
     <!-- 根据精网号查询用户信息 -->
     <select id="selectUserCard" resultType="com.example.demo.domain.vo.coin.GoldUser">
     SELECT
-    name AS "name",
-    jwcode AS "jwcode",
-    market AS "market",
-    (COALESCE(current_permanent_gold, 0) + COALESCE(current_free_june, 0) + COALESCE(current_free_december, 0) + COALESCE(current_task_gold, 0)) AS "nowSumGold",
-    current_permanent_gold AS "nowPermanentGold",
-    (COALESCE(current_free_june, 0) + COALESCE(current_free_december, 0)) AS "nowFreeGold",
-    current_task_gold AS "nowTaskGold",
-    (COALESCE(sum_permanent_gold, 0) + COALESCE(sum_free_june, 0) + COALESCE(sum_free_december, 0) + COALESCE(sum_task_gold, 0)) AS "historySumGold",
-    sum_permanent_gold AS "historyPermanentGold",
-    (COALESCE(sum_free_june, 0) + COALESCE(sum_free_december, 0)) AS "historyFreeGold",
-    sum_task_gold AS "historyTaskGold",
-    recharge_num AS "rechargeNum",
-    consume_num AS "consumeNum",
-    first_recharge AS "firstRecharge"
-    FROM user
+    u.name AS "name",
+    u.jwcode AS "jwcode",
+    m.name AS "market",
+    (COALESCE(u.current_permanent_gold, 0) + COALESCE(u.current_free_june, 0) + COALESCE(u.current_free_december, 0) + COALESCE(u.current_task_gold, 0)) AS "nowSumGold",
+    u.current_permanent_gold AS "nowPermanentGold",
+    (COALESCE(u.current_free_june, 0) + COALESCE(u.current_free_december, 0)) AS "nowFreeGold",
+    u.current_task_gold AS "nowTaskGold",
+    (COALESCE(u.sum_permanent_gold, 0) + COALESCE(u.sum_free_june, 0) + COALESCE(u.sum_free_december, 0) + COALESCE(u.sum_task_gold, 0)) AS "historySumGold",
+    u.sum_permanent_gold AS "historyPermanentGold",
+    (COALESCE(u.sum_free_june, 0) + COALESCE(u.sum_free_december, 0)) AS "historyFreeGold",
+    u.sum_task_gold AS "historyTaskGold",
+    u.recharge_num AS "rechargeNum",
+    u.consume_num AS "consumeNum",
+    u.first_recharge AS "firstRecharge"
+    FROM user u
+    LEFT JOIN market m on u.market = m.id
     <where>
         jwcode = #{jwcode}
         <!-- 判断 market 是否不为总部且 markets 不为空 -->