金币余额地区传参mapper层

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/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);

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-prod.yml

@@ -4,8 +4,8 @@ spring:
       fail-on-unknown-properties: false
   datasource:
     mysql1:
-      jdbc-url: jdbc:mysql://localhost:3306/hwgoldc?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&allowMultiQueries=true&rewriteBatchedStatements=true
-      username: hwgoldc
+      jdbc-url: jdbc:mysql://localhost:3306/hwgold?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&allowMultiQueries=true&rewriteBatchedStatements=true
+      username: hwgold
       password: aDiw7MERSATdfGta
       driver-class-name: com.mysql.cj.jdbc.Driver
       hikari:
@@ -93,4 +93,4 @@ bean:
    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/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>
@@ -88,7 +88,7 @@
                 and jwcode = #{jwcode}
             </if>
             <if test="markets != null and markets.size > 0">
-                AND m.name IN
+                AND m.id 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}