## 未合单添加非在售商品查询；

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();

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;
+
 }

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
+                    and (bwe.pre_sale_status = 0
-                        <foreach collection="param.productIdList" item="item" separator="," open="(" close=")">
+                    <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
+            and (bwe.pre_sale_status = 0
-                <foreach collection="param.productIdList" item="item" separator="," open="(" close=")">
+            <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