From b62fc99d2b3f3108ef60dd31f66a626bd4fd84da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Tue, 9 Jul 2024 20:49:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=87=91=E9=A2=9D=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=EF=BC=8C=E5=AE=8C=E6=88=90=E7=8A=B6=E6=80=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/artificer/OrdersDao.xml  | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

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)
         <if test="userPackageId!=null">
             and (o2.user_package_id = #{userPackageId} or o3.user_package_id = #{userPackageId})
         </if>
@@ -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
         )
         <if test="userPackageId!=null">
             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)
         <if test="type==1">
             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') &lt;= 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
         )
         <if test="type==1">
             and date_format(o.serve_time,'%Y-%m-%d %H:%i') >= date_format(DATE_ADD(now(), INTERVAL -12 HOUR),'%Y-%m-%d %H:%i')