diff --git a/src/main/resources/mapper/artificer/OrdersDao.xml b/src/main/resources/mapper/artificer/OrdersDao.xml index a6896fd..fef66c4 100644 --- a/src/main/resources/mapper/artificer/OrdersDao.xml +++ b/src/main/resources/mapper/artificer/OrdersDao.xml @@ -780,10 +780,10 @@ and o.old_orders_id is not null and o.status not in (4,11,15) - and date_format(o.end_times,'%Y-%m-%d') >= #{startTime} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startTime} - and date_format(o.end_times,'%Y-%m-%d') <= #{endTime} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') <= #{endTime} and ifnull(o.add_num,0) = 0 @@ -814,10 +814,10 @@ and status != 4 ) - and date_format(o.end_times,'%Y-%m-%d') >= #{startTime} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startTime} - and date_format(o.end_times,'%Y-%m-%d') <= #{endTime} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') <= #{endTime} and ifnull(o.add_num,0) = 0 @@ -1125,10 +1125,10 @@ and o.old_orders_id is not null and o.status not in (4,11,15) - and date_format(o.end_times,'%Y-%m-%d') >= #{startDate} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate} - and date_format(o.end_times,'%Y-%m-%d') <= #{endDate} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') <= #{endDate} and o.status in (3,5) union all @@ -1149,10 +1149,10 @@ and status != 4 ) - and date_format(o.end_times,'%Y-%m-%d') >= #{startDate} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate} - and date_format(o.end_times,'%Y-%m-%d') <= #{endDate} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') <= #{endDate} and o.status in (3,5) ) t @@ -1172,10 +1172,10 @@ and o.old_orders_id is not null and o.status not in (4,11,15) - and date_format(o.end_times,'%Y-%m-%d') >= #{startDate} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate} - and date_format(o.end_times,'%Y-%m-%d') <= #{endDate} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') <= #{endDate} and o.status in (3,5) union all @@ -1194,10 +1194,10 @@ and status != 4 ) - and date_format(o.end_times,'%Y-%m-%d') >= #{startDate} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate} - and date_format(o.end_times,'%Y-%m-%d') <= #{endDate} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') <= #{endDate} and o.status in (3,5) ) t @@ -1217,10 +1217,10 @@ and o.old_orders_id is not null and o.status not in (4,11,15) - and date_format(o.end_times,'%Y-%m-%d') >= #{startDate} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate} - and date_format(o.end_times,'%Y-%m-%d') <= #{endDate} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') <= #{endDate} and o.status in (3,5) union all @@ -1239,10 +1239,10 @@ and status != 4 ) - and date_format(o.end_times,'%Y-%m-%d') >= #{startDate} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate} - and date_format(o.end_times,'%Y-%m-%d') <= #{endDate} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') <= #{endDate} and o.status in (3,5) ) t @@ -1261,10 +1261,10 @@ and o.status not in (4,11,15) and o.add_num > 0 - and date_format(o.end_times,'%Y-%m-%d') >= #{startDate} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate} - and date_format(o.end_times,'%Y-%m-%d') <= #{endDate} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') <= #{endDate} and o.status in (3,5) union all @@ -1284,10 +1284,10 @@ ) and o.add_num > 0 - and date_format(o.end_times,'%Y-%m-%d') >= #{startDate} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate} - and date_format(o.end_times,'%Y-%m-%d') <= #{endDate} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') <= #{endDate} and o.status in (3,5) ) t @@ -1314,10 +1314,10 @@ and o.old_orders_id is not null and o.status not in (4,11,15) - and date_format(o.end_times,'%Y-%m-%d') >= #{startDate} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate} - and date_format(o.end_times,'%Y-%m-%d') <= #{endDate} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') <= #{endDate} and o.orders_id not in (select distinct orders_id from user_recharge where artificer_id = #{artificerId} and @@ -1365,10 +1365,10 @@ and status != 4 ) - and date_format(o.end_times,'%Y-%m-%d') >= #{startDate} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate} - and date_format(o.end_times,'%Y-%m-%d') <= #{endDate} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') <= #{endDate} and o.orders_id not in (select distinct orders_id from user_recharge where artificer_id = #{artificerId} and @@ -1500,10 +1500,10 @@ and o.old_orders_id is not null and o.status not in (4,11,15) - and date_format(o.end_times,'%Y-%m-%d') >= #{startTime} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startTime} - and date_format(o.end_times,'%Y-%m-%d') <= #{endTime} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') <= #{endTime} and o.orders_id not in (select distinct orders_id from user_recharge where artificer_id = #{artificerId} and type = '2' and orders_id is not null) @@ -1545,10 +1545,10 @@ and status != 4 ) - and date_format(o.end_times,'%Y-%m-%d') >= #{startTime} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startTime} - and date_format(o.end_times,'%Y-%m-%d') <= #{endTime} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') <= #{endTime} and o.orders_id not in (select distinct orders_id from user_recharge where artificer_id = #{artificerId} and type = '2' and orders_id is not null) @@ -1579,10 +1579,10 @@ and o.old_orders_id is not null and o.status not in (4,11,15) - and date_format(o.end_times,'%Y-%m-%d') >= #{startTime} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startTime} - and date_format(o.end_times,'%Y-%m-%d') <= #{endTime} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') <= #{endTime} and o.status in (3,5) union all @@ -1603,10 +1603,10 @@ and status != 4 ) - and date_format(o.end_times,'%Y-%m-%d') >= #{startTime} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startTime} - and date_format(o.end_times,'%Y-%m-%d') <= #{endTime} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') <= #{endTime} and o.status in (3,5) ) t