angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
cabbage 2025-08-11 14:03:11 +08:00
parent 19c9b45bd2
commit efc60578ec
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverUnhandledController.java
View File

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

5
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/param/DeliverUnhandledParam.java
View File

@ -168,4 +168,9 @@ public class DeliverUnhandledParam extends BaseAuthorityEntity {
*/
private Integer systemType;
/**
* 非售商品列表
*/
private List<Integer> pkWaresList;
}

18
bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml
View File

@ -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