|
@@ -161,8 +161,8 @@ public interface FsStoreOrderMapper
|
|
" AND date_format(o.delivery_send_time,'%y%m%d') >= date_format(#{maps.deliverySendTimeList[0]},'%y%m%d') " +
|
|
" AND date_format(o.delivery_send_time,'%y%m%d') >= date_format(#{maps.deliverySendTimeList[0]},'%y%m%d') " +
|
|
" AND date_format(o.delivery_send_time,'%y%m%d') <= date_format(#{maps.deliverySendTimeList[1]},'%y%m%d') " +
|
|
" AND date_format(o.delivery_send_time,'%y%m%d') <= date_format(#{maps.deliverySendTimeList[1]},'%y%m%d') " +
|
|
"</if>" +
|
|
"</if>" +
|
|
- "<if test = 'maps.paid != null '> " +
|
|
|
|
- "and o.paid =#{maps.paid} " +
|
|
|
|
|
|
+ "<if test = 'maps.paidStatus != null '> " +
|
|
|
|
+ "and o.paid =#{maps.paidStatus} " +
|
|
"</if>" +
|
|
"</if>" +
|
|
"<if test = 'maps.payTimeList != null '> " +
|
|
"<if test = 'maps.payTimeList != null '> " +
|
|
" AND date_format(o.pay_time,'%y%m%d') >= date_format(#{maps.payTimeList[0]},'%y%m%d') " +
|
|
" AND date_format(o.pay_time,'%y%m%d') >= date_format(#{maps.payTimeList[0]},'%y%m%d') " +
|