diff --git a/src/main/resources/mapper/artificer/OrdersDao.xml b/src/main/resources/mapper/artificer/OrdersDao.xml index ed5fffa..ca6eaf3 100644 --- a/src/main/resources/mapper/artificer/OrdersDao.xml +++ b/src/main/resources/mapper/artificer/OrdersDao.xml @@ -393,7 +393,7 @@ left join tb_user u on u.user_id=o1.user_id left join consortia c on c.consortia_id=o1.consortia_id where o1.old_orders_id is not null - and o1.status != 11 + and o1.status not in (4,11,15) and (o2.user_package_id = #{userPackageId} or o3.user_package_id = #{userPackageId}) @@ -418,10 +418,15 @@ left join tb_user u on u.user_id=o1.user_id left join consortia c on c.consortia_id=o1.consortia_id where o1.parent_id = 0 - and o1.status != 11 and o1.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 ( + select old_orders_id from orders + where old_orders_id is not null + and status != 4 ) and o1.user_package_id = #{userPackageId} @@ -661,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 o.status != 11 + and o1.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') @@ -709,10 +714,15 @@ LEFT JOIN bl_user_package_detail bl ON bl.id = om.massage_id where o.artificer_id = #{artificerId} and o.parent_id = 0 - and o.status != 11 - and o.orders_id not in ( + and o1.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 ( + select old_orders_id from orders + where old_orders_id is not null + and status != 4 ) and date_format(o.serve_time,'%Y-%m-%d %H:%i') >= date_format(DATE_ADD(now(), INTERVAL -12 HOUR),'%Y-%m-%d %H:%i')