diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderController.java index 0441908f2..fcb6ad43d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderController.java @@ -180,6 +180,10 @@ public class StoreOrderController extends XktBaseController { queryDTO.setOrderUserId(SecurityUtils.getUserId()); } else { Long storeId = SecurityUtils.getStoreId(); + if (storeId != null) { + //不显示已取消、未支付的订单 + queryDTO.setOrderStatusList(EOrderStatus.storeDisplayOrderStatusValues()); + } if (storeId == null && !SecurityUtils.isAdmin()) { //没有权限 return success(); @@ -204,6 +208,8 @@ public class StoreOrderController extends XktBaseController { Long storeId = SecurityUtils.getStoreId(); if (storeId != null) { queryDTO.setStoreId(storeId); + //不显示已取消、未支付的订单 + queryDTO.setOrderStatusList(EOrderStatus.storeDisplayOrderStatusValues()); String storeName = storeService.getStoreNameByIds(Collections.singletonList(storeId)).get(storeId); title = StrUtil.emptyIfNull(storeName).concat("代发订单"); } else { @@ -248,6 +254,10 @@ public class StoreOrderController extends XktBaseController { queryDTO.setOrderUserId(SecurityUtils.getUserId()); } else { Long storeId = SecurityUtils.getStoreId(); + if (storeId != null) { + //不显示已取消、未支付的订单 + queryDTO.setOrderStatusList(EOrderStatus.storeDisplayOrderStatusValues()); + } if (storeId == null && !SecurityUtils.isAdmin()) { //没有权限 return R.fail(); diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderCountQueryDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderCountQueryDTO.java index c9335c69d..5bcdd2685 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderCountQueryDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderCountQueryDTO.java @@ -3,6 +3,7 @@ package com.ruoyi.xkt.dto.order; import lombok.Data; import java.util.Date; +import java.util.List; /** * @author liangyq @@ -26,4 +27,8 @@ public class StoreOrderCountQueryDTO { * 结束时间 */ private Date createTimeEnd; + /** + * 订单状态(1开头为销售订单状态,2开头为退货订单状态)[10:已取消 11:待付款 12:待发货 13:已发货 14:已完成 21:售后中 22:售后拒绝 23:平台介入 24:售后完成] + */ + private List orderStatusList; } diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderQueryDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderQueryDTO.java index 788f97c87..f1e18358f 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderQueryDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderQueryDTO.java @@ -44,6 +44,10 @@ public class StoreOrderQueryDTO extends BasePageDTO { * 订单状态(1开头为销售订单状态,2开头为退货订单状态)[10:已取消 11:待付款 12:待发货 13:已发货 14:已完成 21:售后中 22:售后拒绝 23:平台介入 24:售后完成] */ private Integer orderStatus; + /** + * 订单状态(1开头为销售订单状态,2开头为退货订单状态)[10:已取消 11:待付款 12:待发货 13:已发货 14:已完成 21:售后中 22:售后拒绝 23:平台介入 24:售后完成] + */ + private List orderStatusList; /** * 收货人-名称(模糊) */ diff --git a/xkt/src/main/java/com/ruoyi/xkt/enums/EOrderStatus.java b/xkt/src/main/java/com/ruoyi/xkt/enums/EOrderStatus.java index 9e71b9e3c..fb8b3fd84 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/enums/EOrderStatus.java +++ b/xkt/src/main/java/com/ruoyi/xkt/enums/EOrderStatus.java @@ -1,9 +1,11 @@ package com.ruoyi.xkt.enums; -import com.ruoyi.common.exception.ServiceException; import lombok.AllArgsConstructor; import lombok.Getter; +import java.util.Arrays; +import java.util.List; + /** * @author liangyq * @date 2025-04-02 23:42 @@ -36,4 +38,14 @@ public enum EOrderStatus { } return null; } + + public static List storeDisplayOrderStatusValues() { + return Arrays.asList(PENDING_SHIPMENT.getValue(), + SHIPPED.getValue(), + COMPLETED.getValue(), + AFTER_SALE_IN_PROGRESS.getValue(), + AFTER_SALE_REJECTED.getValue(), + PLATFORM_INTERVENED.getValue(), + AFTER_SALE_COMPLETED.getValue()); + } } diff --git a/xkt/src/main/resources/mapper/StoreOrderMapper.xml b/xkt/src/main/resources/mapper/StoreOrderMapper.xml index 2aeb662ae..da49b30c8 100644 --- a/xkt/src/main/resources/mapper/StoreOrderMapper.xml +++ b/xkt/src/main/resources/mapper/StoreOrderMapper.xml @@ -38,6 +38,12 @@ AND so.order_status = #{orderStatus} + + AND so.order_status IN + + #{obj} + + AND so.destination_contact_name LIKE CONCAT('%', #{destinationContactName}, '%') @@ -105,6 +111,12 @@ AND create_time BETWEEN #{createTimeBegin} AND #{createTimeEnd} + + AND order_status IN + + #{obj} + +