From 6ca6c7f1343e56caaeb5ec907581b8809a335e81 Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Mon, 1 Dec 2025 17:55:28 +0800
Subject: [PATCH] =?UTF-8?q?12-01=20=E9=87=91=E5=B8=81=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=B8=82=E5=9C=BA=E7=AD=9B=E9=80=89=E6=94=B9=E4=B8=BAid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/AuditMapper.xml | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/AuditMapper.xml b/src/main/resources/mapper/AuditMapper.xml
index f2609da..33519b6 100644
--- a/src/main/resources/mapper/AuditMapper.xml
+++ b/src/main/resources/mapper/AuditMapper.xml
@@ -35,7 +35,12 @@
         where order_code = #{orderCode} and type in (0,1)
     </update>
     <select id="selectRechargeBy" resultType="com.example.demo.domain.vo.coin.RechargeAudit">
-        SELECT ugr.*,
+        SELECT ugr.id,ugr.order_code,ugr.jwcode,ugr.activity,
+        ugr.rate_id,ugr.money,ugr.sum_gold,ugr.permanent_gold,ugr.free_june,ugr.free_december,
+        ugr.task_gold,ugr.remark,ugr.pay_model,ugr.pay_platform,ugr.voucher,
+        ugr.goods_name,ugr.type,ugr.is_refund,ugr.admin_id,ugr.audit_id,
+        ugr.audit_status,ugr.reject_reason,ugr.pay_time,
+        ugr.create_time,ugr.audit_time,ugr.update_time,
         (COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0)) AS freeGold,
         u.name as name,
         m.name as market,
@@ -63,12 +68,18 @@
                 AND ugr.activity = #{rechargeAudit.activity}
             </if>
             <!-- 判断 market 是否不为总部且 markets 不为空 -->
-            <if test="rechargeAudit.markets != null and rechargeAudit.markets.size() > 0">
+           <!-- <if test="rechargeAudit.markets != null and rechargeAudit.markets.size() > 0">
                 AND (
                 <foreach collection="rechargeAudit.markets" item="market" open="" close="" separator=" OR ">
                     u.market = #{market}
                 </foreach>
                 )
+            </if>-->
+            <if test="rechargeAudit.markets != null and rechargeAudit.markets.size() > 0">
+                AND u.market IN
+                <foreach collection="rechargeAudit.markets" item="market" open="(" separator="," close=")">
+                    #{market}
+                </foreach>
             </if>
             <if test="rechargeAudit.payModel != null and rechargeAudit.payModel != ''">
                 AND ugr.pay_model = #{rechargeAudit.payModel}
@@ -77,7 +88,7 @@
                 AND ugr.rate_id = #{rechargeAudit.rateId}
             </if>-->
             <if test="rechargeAudit.market != null and rechargeAudit.market != ''">
-                AND  m.name = #{rechargeAudit.market}
+                AND  m.id = #{rechargeAudit.market}
             </if>
             <if test="rechargeAudit.startTime != null and rechargeAudit.endTime != null ">
                 AND ugr.audit_time between #{rechargeAudit.startTime} and #{rechargeAudit.endTime}
@@ -145,7 +156,7 @@
                 AND ugr.audit_time between #{refundAudit.startTime} and #{refundAudit.endTime}
             </if>
             <if test="refundAudit.market != null and refundAudit.market != ''">
-                AND  m.name = #{refundAudit.market}
+                AND  m.id = #{refundAudit.market}
             </if>
 
             <if test="refundAudit.auditStatus != null and refundAudit.auditStatus != ''">