From 72f433d7b5eedf3470f06bfe09f3d1875696ed41 Mon Sep 17 00:00:00 2001
From: Qiuyi LI <qiuyi.li@gmail.com>
Date: Mon, 31 Jul 2023 16:43:14 +0200
Subject: [PATCH] Hotfix: Add missing shipping invoice number checks anywhere
 necessary

---
 .../jeecg/modules/business/mapper/xml/PlatformOrderMapper.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMapper.xml
index 15f9e20f3..4ff2d8963 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMapper.xml
@@ -258,7 +258,6 @@
         JOIN shop as s
             ON po.shop_id = s.id
         WHERE po.shipping_invoice_number IS NULL
-            AND po.order_time IS NOT NULL
             AND po.erp_status IN
             <foreach
                     collection="erpStatuses"
@@ -291,7 +290,6 @@
         JOIN shop as s
             ON po.shop_id = s.id
         WHERE po.shipping_invoice_number IS NULL
-            AND po.order_time IS NOT NULL
             AND po.erp_status IN
             <foreach
                     collection="erpStatuses"
@@ -487,6 +485,7 @@
             #{warehouse}
         </foreach>
         AND po.shipping_time between #{startDate} AND #{endDate}
+        AND po.shipping_invoice_number IS NULL
         AND po.erp_status = 3;
     </select>
     <select id="fetchUninvoicedShippedOrderIDInShopsAndOrderTime" resultType="org.jeecg.modules.business.entity.PlatformOrder">
@@ -516,6 +515,7 @@
             #{warehouse}
         </foreach>
         AND po.order_time between #{startDate} AND #{endDate}
+        AND po.shipping_invoice_number IS NULL
         AND po.erp_status IN
         <foreach
                 collection="erpStatuses"