From cd45ac2fa0097de2fd9bf637fc5a23593be1aef0 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 10 十月 2023 16:20:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml b/cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml
index 6317187..7792f19 100644
--- a/cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml
+++ b/cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml
@@ -5,9 +5,13 @@
<select id="rechargeList" resultType="com.dsh.account.model.vo.RechargeRecordsVO">
select t1.* from t_recharge_records t1
+ left join t_app_user t2 on t1.appUserId = t2.id
<where>
<if test="query.amount!=null and query.amount!= ''">
and t1.amount <= #{query.amount}
+ </if>
+ <if test="query.insertType!=null and query.insertType!= ''">
+ and t2.insertType = #{query.insertType}
</if>
<if test="query.name!=null and query.name!= ''">
AND t1.name LIKE concat('%',#{query.name},'%')
@@ -28,10 +32,14 @@
</select>
<select id="listAll" resultType="com.dsh.account.entity.VipPayment">
select t1.* from t_vip_payment t1
+ left join t_app_user t2 on t1.appUserId = t2.id
<where>
<if test="amount!=null and amount!= ''">
and t1.amount <= #{amount}
</if>
+ <if test="query.insertType!=null and query.insertType!= ''">
+ and t2.insertType = #{query.insertType}
+ </if>
<if test="query.userIds != null and query.userIds.size()>0">
AND t1.appUserId IN
<foreach collection="query.userIds" separator="," item="id" open="(" close=")">
@@ -41,6 +49,7 @@
<if test="sTime !=null and sTime!= '' and eTime !=null and eTime!= ''">
and t1.insertTime between #{sTime} and #{eTime}
</if>
+ and t1.payStatus = 2
</where>
</select>
</mapper>
--
Gitblit v1.7.1