售后订单增加权限

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/trade/admin/aftersale/vo/AfterSalePageReqVO.java

@@ -13,6 +13,7 @@ import org.dromara.mall.enums.trade.aftersale.AfterSaleWayEnum;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 import static org.dromara.common.mall.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -51,4 +52,7 @@ public class AfterSalePageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "商品id集合")
+    private List<Long> spuIds;
+
 }

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/trade/AfterSaleMapper.java

@@ -27,6 +27,7 @@ public interface AfterSaleMapper extends BaseMapperPlusPlus<AfterSaleDO, AfterSa
             .eqIfPresent(AfterSaleDO::getWay, reqVO.getWay())
             .likeIfPresent(AfterSaleDO::getOrderNo, reqVO.getOrderNo())
             .likeIfPresent(AfterSaleDO::getSpuName, reqVO.getSpuName())
+            .inIfPresent(AfterSaleDO::getSpuId, reqVO.getSpuIds())
             .betweenIfPresent(AfterSaleDO::getCreateTime, reqVO.getCreateTime())
             .orderByDesc(AfterSaleDO::getId));
     }

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/trade/aftersale/AfterSaleServiceImpl.java

@@ -34,6 +34,7 @@ import org.dromara.mall.enums.trade.order.TradeOrderTypeEnum;
 import org.dromara.mall.framework.trade.aftersale.core.annotations.AfterSaleLog;
 import org.dromara.mall.framework.trade.aftersale.core.utils.AfterSaleLogUtils;
 import org.dromara.mall.framework.trade.order.config.TradeOrderProperties;
+import org.dromara.mall.mapper.product.ProductSpuMapper;
 import org.dromara.mall.mapper.trade.AfterSaleMapper;
 import org.dromara.mall.service.trade.delivery.DeliveryExpressService;
 import org.dromara.mall.service.trade.order.TradeOrderQueryService;
@@ -46,6 +47,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
 import org.springframework.validation.annotation.Validated;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 import static org.dromara.common.mall.exception.util.ServiceExceptionUtil.exception;
 import static org.dromara.mall.enums.trade.ErrorCodeConstants.*;
@@ -72,6 +74,8 @@ public class AfterSaleServiceImpl implements AfterSaleService {
     @Resource
     private AfterSaleMapper tradeAfterSaleMapper;
     @Resource
+    private ProductSpuMapper productSpuMapper;
+    @Resource
     private TradeNoRedisDAO tradeNoRedisDAO;
 
     @Resource
@@ -84,6 +88,9 @@ public class AfterSaleServiceImpl implements AfterSaleService {
 
     @Override
     public PageResult<AfterSaleDO> getAfterSalePage(AfterSalePageReqVO pageReqVO) {
+        // 获取有权限的商品
+        List<Long> spuIds = productSpuMapper.selectSpuIdsByDataPermission();
+        pageReqVO.setSpuIds(spuIds);
         return tradeAfterSaleMapper.selectPagePlus(pageReqVO);
     }