From 5a7a44a27e7fd89f8dab774a315e06d142fb6e11 Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Sat, 15 Nov 2025 10:56:00 +0800
Subject: [PATCH] 新分支
---
src/main/resources/mapper/UserRechargeMapper.xml | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/UserRechargeMapper.xml b/src/main/resources/mapper/UserRechargeMapper.xml
index 2f36d6c..fa0443b 100644
--- a/src/main/resources/mapper/UserRechargeMapper.xml
+++ b/src/main/resources/mapper/UserRechargeMapper.xml
@@ -215,12 +215,10 @@
<select id="listByAdmin" parameterType="map" resultType="com.nq.pojo.UserRecharge">
SELECT
s.id, s.user_id, s.nick_name, s.agent_id, s.order_sn, s.pay_sn, s.pay_channel,
- s.pay_amt, s.order_status,s.order_desc,s.add_time,s.pay_time,s.pay_id,s.img ,p.channel_name,p.assets_type
+ s.pay_amt, s.order_status,s.order_desc,s.add_time,s.pay_time,s.pay_id,s.img
FROM user_recharge s
- join site_pay p
- on s.pay_id = p.id
- where agent_id != 1
- <if test="agentId != null">
+ where 1=1
+ <if test="agentId != null and agentId != ''">
and ( agent_id = #{agentId}
or agent_id in (
select agent_user.id
@@ -229,20 +227,20 @@
)
)
</if>
- <if test="userId != null">
+ <if test="userId != null and agentId != ''">
and user_id = #{userId}
</if>
<if test="realName != null and realName != '' ">
and nick_name like CONCAT('%','${realName}','%')
</if>
- <if test="state != null">
+ <if test="state != null and agentId != ''">
and order_status = #{state}
</if>
- <if test="begin_time != null ">
+ <if test="begin_time != null and agentId != ''">
and pay_time <![CDATA[>=]]> #{begin_time}
</if>
- <if test="end_time != null ">
+ <if test="end_time != null and agentId != ''">
and pay_time <![CDATA[<=]]> #{end_time}
</if>
ORDER BY s.id DESC
--
Gitblit v1.9.3