售后订单和交易订单增加没有数据过滤的列表

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

@@ -24,6 +24,7 @@ import org.dromara.mall.domain.trade.TradeOrderItemDO;
 import org.dromara.mall.service.trade.aftersale.AfterSaleLogService;
 import org.dromara.mall.service.trade.aftersale.AfterSaleService;
 import org.dromara.mall.service.trade.order.TradeOrderQueryService;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -53,8 +54,20 @@ public class AfterSaleController {
     @Operation(summary = "获得售后订单分页")
     @SaCheckPermission("trade:after-sale:query")
     public R<PageResult<AfterSaleRespPageItemVO>> getAfterSalePage(@Valid AfterSalePageReqVO pageVO) {
+        return getAfterSalePage(pageVO, true);
+    }
+
+    @GetMapping("/all/page")
+    @Operation(summary = "获得售后订单分页")
+    @SaCheckPermission("trade:after-sale:query")
+    public R<PageResult<AfterSaleRespPageItemVO>> getAfterSalePageAll(@Valid AfterSalePageReqVO pageVO) {
+        return getAfterSalePage(pageVO, false);
+    }
+
+    @NotNull
+    private R<PageResult<AfterSaleRespPageItemVO>> getAfterSalePage(AfterSalePageReqVO pageVO, Boolean dataPermission) {
         // 查询售后
-        PageResult<AfterSaleDO> pageResult = afterSaleService.getAfterSalePage(pageVO);
+        PageResult<AfterSaleDO> pageResult = afterSaleService.getAfterSalePage(pageVO, dataPermission);
         if (CollUtil.isEmpty(pageResult.getList())) {
             return R.ok(PageResult.empty());
         }

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/trade/admin/order/TradeOrderController.java

@@ -52,23 +52,34 @@ public class TradeOrderController {
     @Operation(summary = "获得交易订单分页")
     @SaCheckPermission("trade:order:query")
     public R<PageResult<TradeOrderPageItemRespVO>> getOrderPage(TradeOrderPageReqVO reqVO) {
+        return getOrderPage(reqVO, true);
+    }
+
+    private R<PageResult<TradeOrderPageItemRespVO>> getOrderPage(TradeOrderPageReqVO reqVO, Boolean dataPermission) {
         // 查询订单
-        PageResult<TradeOrderDO> pageResult = tradeOrderQueryService.getOrderPage(reqVO);
+        PageResult<TradeOrderDO> pageResult = tradeOrderQueryService.getOrderPage(reqVO, dataPermission);
         if (CollUtil.isEmpty(pageResult.getList())) {
             return R.ok(PageResult.empty());
         }
 
         // 查询用户信息
         Set<Long> userIds = CollUtil.unionDistinct(convertList(pageResult.getList(), TradeOrderDO::getUserId),
-                convertList(pageResult.getList(), TradeOrderDO::getBrokerageUserId, Objects::nonNull));
+            convertList(pageResult.getList(), TradeOrderDO::getBrokerageUserId, Objects::nonNull));
         Map<Long, MemberUserRespDTO> userMap = memberUserApi.getUserMap(userIds);
         // 查询订单项
         List<TradeOrderItemDO> orderItems = tradeOrderQueryService.getOrderItemListByOrderId(
-                convertSet(pageResult.getList(), TradeOrderDO::getId));
+            convertSet(pageResult.getList(), TradeOrderDO::getId));
         // 最终组合
         return R.ok(TradeOrderConvert.INSTANCE.convertPage(pageResult, orderItems, userMap));
     }
 
+    @GetMapping("/all/page")
+    @Operation(summary = "获得交易订单分页")
+    @SaCheckPermission("trade:order:query")
+    public R<PageResult<TradeOrderPageItemRespVO>> getOrderPageAll(TradeOrderPageReqVO reqVO) {
+        return getOrderPage(reqVO, false);
+    }
+
     @GetMapping("/summary")
     @Operation(summary = "获得交易订单统计")
     @SaCheckPermission("trade:order:query")

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

@@ -20,10 +20,11 @@ public interface AfterSaleService {
     /**
      * 【管理员】获得售后订单分页
      *
-     * @param pageReqVO 分页查询
+     * @param pageReqVO      分页查询
+     * @param dataPermission 是否权限过滤
      * @return 售后订单分页
      */
-    PageResult<AfterSaleDO> getAfterSalePage(AfterSalePageReqVO pageReqVO);
+    PageResult<AfterSaleDO> getAfterSalePage(AfterSalePageReqVO pageReqVO, Boolean dataPermission);
 
     /**
      * 【会员】获得售后订单分页

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

@@ -87,10 +87,12 @@ public class AfterSaleServiceImpl implements AfterSaleService {
     private TradeOrderProperties tradeOrderProperties;
 
     @Override
-    public PageResult<AfterSaleDO> getAfterSalePage(AfterSalePageReqVO pageReqVO) {
+    public PageResult<AfterSaleDO> getAfterSalePage(AfterSalePageReqVO pageReqVO, Boolean dataPermission) {
         // 获取有权限的商品
-        List<Long> spuIds = productSpuMapper.selectSpuIdsByDataPermission();
-        pageReqVO.setSpuIds(spuIds);
+        if (dataPermission) {
+            List<Long> spuIds = productSpuMapper.selectSpuIdsByDataPermission();
+            pageReqVO.setSpuIds(spuIds);
+        }
         return tradeAfterSaleMapper.selectPagePlus(pageReqVO);
     }
 

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/trade/order/TradeOrderQueryService.java

@@ -60,10 +60,11 @@ public interface TradeOrderQueryService {
     /**
      * 【管理员】获得交易订单分页
      *
-     * @param reqVO 分页请求
+     * @param reqVO          分页请求
+     * @param dataPermission 是否需要过滤权限
      * @return 交易订单
      */
-    PageResult<TradeOrderDO> getOrderPage(TradeOrderPageReqVO reqVO);
+    PageResult<TradeOrderDO> getOrderPage(TradeOrderPageReqVO reqVO, Boolean dataPermission);
 
     /**
      * 获得订单统计

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/trade/order/TradeOrderQueryServiceImpl.java

@@ -93,24 +93,27 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
     }
 
     @Override
-    public PageResult<TradeOrderDO> getOrderPage(TradeOrderPageReqVO reqVO) {
+    public PageResult<TradeOrderDO> getOrderPage(TradeOrderPageReqVO reqVO, Boolean dataPermission) {
         // 根据用户查询条件构建用户编号列表
         Set<Long> userIds = buildQueryConditionUserIds(reqVO);
         if (userIds == null) { // 没查询到用户，说明肯定也没他的订单
             return PageResult.empty();
         }
-        // 获取有权限的商品
-        List<Long> spuIds = productSpuMapper.selectSpuIdsByDataPermission();
-        if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(spuIds)) {
-            List<TradeOrderItemDO> itemList = tradeOrderItemMapper.selectList(
-                new LambdaQueryWrapper<TradeOrderItemDO>()
-                    .in(TradeOrderItemDO::getSpuId, spuIds)
-                    .select(TradeOrderItemDO::getOrderId)
-            );
-            if (CollectionUtils.isEmpty(itemList)) {
-                return PageResult.empty();
+
+        // 权限处理
+        if (dataPermission) {
+            List<Long> spuIds = productSpuMapper.selectSpuIdsByDataPermission();
+            if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(spuIds)) {
+                List<TradeOrderItemDO> itemList = tradeOrderItemMapper.selectList(
+                    new LambdaQueryWrapper<TradeOrderItemDO>()
+                        .in(TradeOrderItemDO::getSpuId, spuIds)
+                        .select(TradeOrderItemDO::getOrderId)
+                );
+                if (CollectionUtils.isEmpty(itemList)) {
+                    return PageResult.empty();
+                }
+                reqVO.setOrderIds(StreamUtils.toList(itemList, TradeOrderItemDO::getOrderId));
             }
-            reqVO.setOrderIds(StreamUtils.toList(itemList, TradeOrderItemDO::getOrderId));
         }
 
         // 分页查询