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 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} - - and soi.pk_product in - + + and (bwe.pre_sale_status = 0 + + or soi.pk_wares in + #{item} + ) and so.rec_province in @@ -196,12 +199,15 @@ #{item} - - and soi.pk_product in - + + and (bwe.pre_sale_status = 0 + + or soi.pk_wares in + #{item} + ) and so.rec_province in