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

Merge branch 'feature/mall_product'

pull/17/head
tangqian 2023-06-16 14:35:09 +08:00
parent 77ffc74c3d 6be709216e
commit 1813516c54
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/order/StoreOrderMapper.xml
View File

@ -77,7 +77,7 @@
`cy_recharge_order_info` info `cy_recharge_order_info` info
LEFT JOIN cy_recharge_order ord ON info.recharge_order_id = ord.id LEFT JOIN cy_recharge_order ord ON info.recharge_order_id = ord.id
WHERE WHERE
ord.paid = 1 ord.paid != 0
<if test="null != startTime"> <if test="null != startTime">
and info.create_time >= #{startTime} and info.create_time >= #{startTime}
</if> </if>

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

@ -252,7 +252,7 @@
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 x.real_name like CONCAT('%',#{data.realName},'%') and x.nickname 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},'%')