diff --git a/src/main/resources/mapper/artificer/OrdersDao.xml b/src/main/resources/mapper/artificer/OrdersDao.xml index ca6eaf3..3b2fff1 100644 --- a/src/main/resources/mapper/artificer/OrdersDao.xml +++ b/src/main/resources/mapper/artificer/OrdersDao.xml @@ -666,7 +666,7 @@ LEFT JOIN bl_user_package_detail bl ON bl.id = om.massage_id where o.artificer_id = #{artificerId} and o.old_orders_id is not null - and o1.status not in (4,11,15) + and o.status not in (4,11,15) and date_format(o.serve_time,'%Y-%m-%d %H:%i') >= date_format(DATE_ADD(now(), INTERVAL -12 HOUR),'%Y-%m-%d %H:%i') and date_format(o.serve_time,'%Y-%m-%d %H:%i') <= date_format(DATE_ADD(now(), INTERVAL 24 HOUR),'%Y-%m-%d %H:%i') @@ -714,12 +714,12 @@ LEFT JOIN bl_user_package_detail bl ON bl.id = om.massage_id where o.artificer_id = #{artificerId} and o.parent_id = 0 - and o1.orders_id not in ( + and o.orders_id not in ( select orders_id from orders where old_orders_id is not null and status != 4 ) - and o1.orders_id not in ( + and o.orders_id not in ( select old_orders_id from orders where old_orders_id is not null and status != 4