Merge branch 'feature/mall_product'
commit
1813516c54
|
@ -77,7 +77,7 @@
|
|||
`cy_recharge_order_info` info
|
||||
LEFT JOIN cy_recharge_order ord ON info.recharge_order_id = ord.id
|
||||
WHERE
|
||||
ord.paid = 1
|
||||
ord.paid != 0
|
||||
<if test="null != startTime">
|
||||
and info.create_time >= #{startTime}
|
||||
</if>
|
||||
|
|
|
@ -252,7 +252,7 @@
|
|||
and b.nickname like CONCAT('%',#{data.nickname},'%')
|
||||
</if>
|
||||
<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 test="data.userPhone !=null and data.userPhone!=''">
|
||||
and a.user_phone like CONCAT('%',#{data.userPhone},'%')
|
||||
|
|
Loading…
Reference in New Issue