From efc60578ece244ded64fbf2bd6dc13d016641d77 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Mon, 11 Aug 2025 14:03:11 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E6=9C=AA=E5=90=88=E5=8D=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=9D=9E=E5=9C=A8=E5=94=AE=E5=95=86=E5=93=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/SaDeliverUnhandledController.java   |  4 ++++
 .../deliver/param/DeliverUnhandledParam.java   |  5 +++++
 .../mapper/sale/order/SaOrderItemsMapper.xml   | 18 ++++++++++++------
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverUnhandledController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverUnhandledController.java
index 55276e3c..2ddcd369 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverUnhandledController.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverUnhandledController.java
@@ -98,6 +98,8 @@ public class SaDeliverUnhandledController extends BaseController {
 
         // 未合单目前查询状态（已付款）
         param.setOrderStatusList(Collections.singletonList(EOrderStatus.PAY.getValue()));
+        // 查询语句已经写死查询【在售】，此处可以直接赋空
+        param.setPreSaleStatus(null);
 
         // 获取管理员权限（角色地区范围、体系列表、团队列表）
         UserAuthorityDTO userAuthorityDTO = iUserServiceApi.getUserAuthority(SecurityUtils.getUserId()).getData();
@@ -139,6 +141,8 @@ public class SaDeliverUnhandledController extends BaseController {
 
         // 未合单目前查询状态（已付款）
         param.setOrderStatusList(Collections.singletonList(EOrderStatus.PAY.getValue()));
+        // 查询语句已经写死查询【在售】，此处可以直接赋空
+        param.setPreSaleStatus(null);
 
         // 获取管理员权限（角色地区范围、体系列表、团队列表）
         UserAuthorityDTO userAuthorityDTO = iUserServiceApi.getUserAuthority(SecurityUtils.getUserId()).getData();
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/param/DeliverUnhandledParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/param/DeliverUnhandledParam.java
index 4312c694..c147f5a0 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/param/DeliverUnhandledParam.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/param/DeliverUnhandledParam.java
@@ -168,4 +168,9 @@ public class DeliverUnhandledParam extends BaseAuthorityEntity {
      */
     private Integer systemType;
 
+    /**
+     * 非售商品列表
+     */
+    private List<Integer> pkWaresList;
+
 }
diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml
index 450e4653..f0222ecc 100644
--- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml
+++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml
@@ -103,12 +103,15 @@
                             #{subItem}
                         </if>
                     </foreach>
-                    <if test="param.productIdList != null and param.productIdList.size > 0">
-                        and soi.pk_product in
-                        <foreach collection="param.productIdList" item="item" separator="," open="(" close=")">
+                    <!-- 在售 -->
+                    and (bwe.pre_sale_status = 0
+                    <if test="param.pkWaresList != null and param.pkWaresList.size > 0">
+                        or soi.pk_wares in
+                        <foreach collection="param.pkWaresList" item="item" separator="," open="(" close=")">
                             #{item}
                         </foreach>
                     </if>
+                    )
                     <!-- 地区权限处理 -->
                     <if test="param.areaScopeList != null and param.areaScopeList.size > 0">
                         and so.rec_province in
@@ -196,12 +199,15 @@
                     #{item}
                 </foreach>
             </if>
-            <if test="param.productIdList != null and param.productIdList.size > 0">
-                and soi.pk_product in
-                <foreach collection="param.productIdList" item="item" separator="," open="(" close=")">
+            <!-- 在售 -->
+            and (bwe.pre_sale_status = 0
+            <if test="param.pkWaresList != null and param.pkWaresList.size > 0">
+                or soi.pk_wares in
+                <foreach collection="param.pkWaresList" item="item" separator="," open="(" close=")">
                     #{item}
                 </foreach>
             </if>
+            )
             <!-- 地区权限处理 -->
             <if test="param.areaScopeList != null and param.areaScopeList.size > 0">
                 and so.rec_province in