From dd143d234c5b3b681b554983a3519ebee15b33c6 Mon Sep 17 00:00:00 2001
From: sunjiabei <sjb3125@163.com>
Date: Fri, 18 Jul 2025 10:06:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E5=B1=9E=E6=80=A7=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/demo/service/ConsumeService.java   |  2 +-
 .../demo/serviceImpl/ConsumeServiceImpl.java       |  2 +-
 src/main/resources/mapper/RechargeMapper.xml       | 29 ++++++++++++++++------
 src/main/resources/mapper/RefundMapper.xml         | 21 +++++++++++++---
 4 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/example/demo/service/ConsumeService.java b/src/main/java/com/example/demo/service/ConsumeService.java
index 2bf880c..802564e 100644
--- a/src/main/java/com/example/demo/service/ConsumeService.java
+++ b/src/main/java/com/example/demo/service/ConsumeService.java
@@ -19,7 +19,7 @@ import com.github.pagehelper.PageInfo;
 public interface ConsumeService {
 
     //查询全部消费
-    PageInfo<ConsumeUser> selectAll(Integer pageNum, Integer pageSize, ConsumeUser consumeUser)throws  Exception;
+    PageInfo<ConsumeUser> selectAll(Integer pageNum, Integer pageSize, ConsumeUser consumeUser);
 
     //统计消费金币
     Gold statsGold(ConsumeUser consumeUser);
diff --git a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java
index 4d1ea66..cc37768 100644
--- a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java
@@ -51,7 +51,7 @@ public class ConsumeServiceImpl implements ConsumeService {
 
     //消耗明细
     @Override
-    public PageInfo<ConsumeUser> selectAll(Integer pageNum, Integer pageSize, ConsumeUser consumeUser)throws  Exception {
+    public PageInfo<ConsumeUser> selectAll(Integer pageNum, Integer pageSize, ConsumeUser consumeUser){
         String account = adminService.getCurrentAdminAccount();
         List<String> markets = generalService.getRoleMarket(account);
         consumeUser.setMarkets(markets);
diff --git a/src/main/resources/mapper/RechargeMapper.xml b/src/main/resources/mapper/RechargeMapper.xml
index bbd234b..400dc42 100644
--- a/src/main/resources/mapper/RechargeMapper.xml
+++ b/src/main/resources/mapper/RechargeMapper.xml
@@ -20,13 +20,21 @@
         ugr.admin_id AS adminId,
         a.admin_name AS adminName,
         ugr.pay_time AS payTime
-        FROM user u
-        JOIN user_gold_record ugr ON u.jwcode = ugr.jwcode
-        JOIN admin a ON ugr.admin_id = a.id
-        JOIN rate r ON ugr.rate_id = r.id
-        WHERE ugr.type = 0 AND ugr.audit_status IN (1,3)
-        AND ugr.flag = 1
-
+        FROM user_gold_record ugr
+        left JOIN user u ON u.jwcode = ugr.jwcode
+        left JOIN admin a ON ugr.admin_id = a.id
+        left JOIN rate r ON ugr.rate_id = r.id
+        <where>
+            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 '总部' not in markets">
+                AND u.market IN
+                <foreach collection="markets" item="market" open="(" close=")" separator=",">
+                    #{market}
+                </foreach>
+            </if>
+        </where>
         <trim prefix="ORDER BY" suffixOverrides=",">
             <choose>
                 <!-- 当指定排序字段时使用指定字段排序 -->
@@ -87,6 +95,13 @@
         <where>
             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 '总部' not in markets">
+                AND u.market IN
+                <foreach collection="markets" item="market" open="(" close=")" separator=",">
+                    #{market}
+                </foreach>
+            </if>
             <if test="jwcode != null and jwcode != ''">
                 AND ugr.jwcode = #{jwcode}
             </if>
diff --git a/src/main/resources/mapper/RefundMapper.xml b/src/main/resources/mapper/RefundMapper.xml
index a6405de..dc8b5bd 100644
--- a/src/main/resources/mapper/RefundMapper.xml
+++ b/src/main/resources/mapper/RefundMapper.xml
@@ -18,12 +18,21 @@
         ugr.remark AS remark,
         a.admin_name AS adminName,
         ugr.create_time AS createTime
-        FROM user u
+        FROM user_gold_record ugr
         left JOIN
-        user_gold_record ugr ON u.jwcode = ugr.jwcode
+        user u ON u.jwcode = ugr.jwcode
         left JOIN
         admin a ON ugr.admin_id = a.id
-        WHERE ugr.type = 2 AND ugr.audit_status IN (1,3) AND ugr.flag = 1
+        <where>
+            ugr.type = 2 AND ugr.audit_status IN (1,3) AND ugr.flag = 1
+            <!-- 判断 market 是否不为总部且 markets 不为空 -->
+            <if test="markets != null and markets.size() > 0 and '总部' not in markets">
+                AND u.market IN
+                <foreach collection="markets" item="market" open="(" close=")" separator=",">
+                    #{market}
+                </foreach>
+            </if>
+        </where>
         <trim prefix="ORDER BY" suffixOverrides=",">
             <choose>
                 <!-- 当指定排序字段时使用指定字段排序 -->
@@ -85,6 +94,12 @@
         admin a ON ugr.admin_id = a.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 '总部' not in markets">
+                AND u.market IN
+                <foreach collection="markets" item="market" open="(" close=")" separator=",">
+                    #{market}
+                </foreach>
+            </if>
             <if test="jwcode != null and jwcode != ''">
                 AND ugr.jwcode = #{jwcode}
             </if>