From d41358fce9a436d81b9341d06fc1d8f3ddff92ff Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 25 九月 2023 16:17:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml b/cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml
index f166233..0b729b0 100644
--- a/cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml
+++ b/cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml
@@ -6,14 +6,14 @@
<select id="rechargeList" resultType="com.dsh.account.model.vo.RechargeRecordsVO">
select t1.id as id,t1.appUserId,t1.payTime as `time`,t1.amount as amount,
t1.playPaiCoins as playPaiCoins,CONCAT(t2.province,t2.city) as provinceAndCity,
- t2.`name` as `name`,t2.phone as phone,t2.isVip as `type` from t_recharge_records t1
+ t2.`name` as `name`,t2.phone as phone,t2.isVip as `type` from t_recharge_records3 t1
left join t_app_user t2 on t2.id = t1.appUserId
<where>
<if test="query.city!=null and query.city!= ''">
- and t1.city = #{query.city}
+ and t2.city = #{query.city}
</if>
<if test="query.province!=null and query.province!= ''">
- and t1.province = #{query.province}
+ and t2.province = #{query.province}
</if>
<if test="query.name!=null and query.name!= ''">
AND t1.name LIKE concat('%',#{query.name},'%')
@@ -25,7 +25,7 @@
and t2.isVip = #{query.type}
</if>
<if test="sTime !=null and sTime!= '' and eTime !=null and eTime!= ''">
- and t1.payTime between #{sTime} and #{eTime}
+ and t1.insertTime between #{sTime} and #{eTime}
</if>
and t1.state != 3
</where>
--
Gitblit v1.7.1