From 6d8aae7dc7266f0eb46957cbe16d0969e9dbff89 Mon Sep 17 00:00:00 2001
From: sunjiabei <sjb3125@163.com>
Date: Tue, 12 Aug 2025 12:06:31 +0800
Subject: [PATCH] =?UTF-8?q?8=E6=9C=8812=E6=97=A5=E5=91=98=E5=B7=A5?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8E=BB=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/serviceImpl/coin/UserServiceImpl.java | 3 +++
 src/main/resources/mapper/ConsumeMapper.xml                          | 4 ++--
 src/main/resources/mapper/RechargeMapper.xml                         | 3 ++-
 src/main/resources/mapper/RefundMapper.xml                           | 5 +++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/example/demo/serviceImpl/coin/UserServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/UserServiceImpl.java
index fba3c4f..c8ddc6e 100644
--- a/src/main/java/com/example/demo/serviceImpl/coin/UserServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/coin/UserServiceImpl.java
@@ -49,6 +49,9 @@ public class UserServiceImpl implements UserService {
             if (admin != null) {
                 List<String> list = Arrays.asList(admin.getMarkets().split(","));
                 List<String> markets = marketMapper.getMarketIds(list);
+                if (markets.contains("9") || markets.contains("9999")){
+                    markets=null;
+                }
                 GoldUser user = userMapper.selectUserCard(jwcode,markets);
                 return Result.success(user);
             }
diff --git a/src/main/resources/mapper/ConsumeMapper.xml b/src/main/resources/mapper/ConsumeMapper.xml
index 99dc5e6..e9f1449 100644
--- a/src/main/resources/mapper/ConsumeMapper.xml
+++ b/src/main/resources/mapper/ConsumeMapper.xml
@@ -23,7 +23,7 @@
         admin a ON ugr.admin_id = a.id
         left join market m ON u.market = m.id
         <where>
-            ugr.type = 1 AND ugr.flag = 1
+            ugr.type = 1 AND ugr.flag = 1 AND u.flag = 1
             <!-- 判断 market 是否不为总部且 markets 不为空 -->
             <if test="markets != null and markets.size() > 0 and '9999' not in markets and '9' not in markets">
                 AND (
@@ -94,7 +94,7 @@
         left join market m ON u.market = m.id
 
         <where>
-            ugr.type = 1 AND ugr.flag = 1
+            ugr.type = 1 AND ugr.flag = 1 AND u.flag = 1
             <if test="markets != null and markets.size() > 0">
                 AND u.market IN
                 <foreach collection="markets" item="market" open="(" separator="," close=")">
diff --git a/src/main/resources/mapper/RechargeMapper.xml b/src/main/resources/mapper/RechargeMapper.xml
index 547bcf8..52e072c 100644
--- a/src/main/resources/mapper/RechargeMapper.xml
+++ b/src/main/resources/mapper/RechargeMapper.xml
@@ -28,7 +28,7 @@
         <where>
             ugr.type = 0 AND ugr.audit_status IN (1,3)
             AND ugr.flag = 1
-
+            AND u.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 ">
@@ -98,6 +98,7 @@
         <where>
             ugr.type = 0 AND ugr.audit_status IN (1,3)
             AND ugr.flag = 1
+            AND u.flag = 1
             <!-- 判断 market 是否不为总部且 markets 不为空 -->
             <if test="markets != null and markets.size() > 0">
                 AND u.market IN
diff --git a/src/main/resources/mapper/RefundMapper.xml b/src/main/resources/mapper/RefundMapper.xml
index 8514028..e40f68a 100644
--- a/src/main/resources/mapper/RefundMapper.xml
+++ b/src/main/resources/mapper/RefundMapper.xml
@@ -25,7 +25,7 @@
         admin a ON ugr.admin_id = a.id
         left join market m ON u.market = m.id
         <where>
-            ugr.type = 2 AND ugr.audit_status IN (1,3) AND ugr.flag = 1
+            ugr.type = 2 AND ugr.audit_status IN (1,3) AND ugr.flag = 1 AND u.flag = 1
             <!-- 判断 market 是否不为总部且 markets 不为空 -->
             <if test="markets != null and markets.size() > 0 and '9999' not in markets and '9' not in markets">
                 AND (
@@ -96,7 +96,8 @@
         admin a ON ugr.admin_id = a.id
         left join market m ON u.market = m.id
         <where>
-            ugr.type = 2 AND ugr.audit_status IN (1,3) AND ugr.flag = 1
+            ugr.type = 2 AND ugr.audit_status IN (1,3) AND ugr.flag = 1 AND u.flag = 1
+            <!-- 判断 market 是否不为总部且 markets 不为空 -->
             <if test="markets != null and markets.size() > 0">
                 AND u.market IN
                 <foreach collection="markets" item="market" open="(" separator="," close=")">