zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/mall_product' into test

pull/17/head
tangqian 2023-06-16 09:47:02 +08:00
parent 94bf7664ab b7dcf93fb3
commit 6f7d2767e4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
View File

@ -107,7 +107,7 @@
a.out_trade_no, a.out_trade_no,
a.pay_time, a.pay_time,
b.nickname, b.nickname,
a.real_name, x.nickname as realName,
a.uid, a.uid,
a.user_phone, a.user_phone,
a.confirm_phone, a.confirm_phone,
@ -124,6 +124,7 @@
left join member_user b on a.promoter_id = b.id left join member_user b on a.promoter_id = b.id
left join system_dept d on d.id = a.dept_id left join system_dept d on d.id = a.dept_id
left join system_tenant e on e.id = a.tenant_id left join system_tenant e on e.id = a.tenant_id
left join member_user x on a.uid = x.id
<include refid="baseWhere"> <include refid="baseWhere">
</include> </include>
order by a.pay_time desc order by a.pay_time desc
@ -249,9 +250,9 @@
<if test="data.nickname !=null and data.nickname!=''"> <if test="data.nickname !=null and data.nickname!=''">
and b.nickname like CONCAT('%',#{data.nickname},'%') and b.nickname like CONCAT('%',#{data.nickname},'%')
</if> </if>
<!--<if test="data.realName !=null and data.realName!=''"> <if test="data.realName !=null and data.realName!=''">
and a.real_name like CONCAT('%',#{data.realName},'%') and x.real_name like CONCAT('%',#{data.realName},'%')
</if>--> </if>
<if test="data.userPhone !=null and data.userPhone!=''"> <if test="data.userPhone !=null and data.userPhone!=''">
and a.user_phone like CONCAT('%',#{data.userPhone},'%') and a.user_phone like CONCAT('%',#{data.userPhone},'%')
</if> </if>