Merge branch 'dev/2024/0806/update-business-Y' of Harper/feifan-backend-zx-business into master

修改首页权限

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/TradeOrderController.java

@@ -113,11 +113,18 @@ public class TradeOrderController {
         return success(data);
     }
 
-    @GetMapping("/get-backlog")
-    @Operation(summary = "获取待发货及待售后")
-    @PreAuthorize("@ss.hasAnyPermissions('trade:order:query')")
-    public CommonResult<Map<String,Long>> getBacklog() {
-        return success(tradeOrderQueryService.getBacklog());
+    @GetMapping("/get-backlog-order")
+    @Operation(summary = "获取待发货")
+    @PreAuthorize("@ss.hasAnyPermissions('trade:order:backlog:query')")
+    public CommonResult<Map<String,Long>> getBacklogOrder() {
+        return success(tradeOrderQueryService.getBacklogOrder());
+    }
+
+    @GetMapping("/get-backlog-after-sale")
+    @Operation(summary = "获取待售后")
+    @PreAuthorize("@ss.hasAnyPermissions('after:sale:backlog:query')")
+    public CommonResult<Map<String,Long>> getBackAfterSale() {
+        return success(tradeOrderQueryService.getBacklogAfterSale());
     }
 
     @GetMapping("/summary")

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderQueryService.java

@@ -205,10 +205,16 @@ public interface TradeOrderQueryService {
     TradeOrderDO getOrderById(Long orderId);
 
     /**
-     * 获取待发货订单及待办的售后订单
+     * 获取待发货订单
      * @return 集合
      */
-    Map<String, Long> getBacklog();
+    Map<String, Long> getBacklogOrder();
+
+    /**
+     * 获取待售后订单
+     * @return 售后订单
+     */
+    Map<String, Long> getBacklogAfterSale();
 
     /**
      * 用来判断当前的这个订单中的商品是不是虚拟商品

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderQueryServiceImpl.java

@@ -246,13 +246,21 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
     }
 
     @Override
-    public Map<String, Long> getBacklog() {
+    public Map<String, Long> getBacklogOrder() {
         UserShopDetailsVO userShopDetails = userService.getUserShopDetails();
         Long backlogShipmentsCount = tradeOrderMapper.selectCountByStatus(TradeOrderStatusEnum.UNDELIVERED.getStatus(), userShopDetails.getShopId(), userShopDetails.getMerId());
-        Long backlogAfterSaleCount = afterSaleService.selectCountByStatus(userShopDetails.getShopId(), userShopDetails.getMerId());
 
         Map<String, Long> backMap = new HashMap<>();
         backMap.put(BacklogConstants.BACKLOG_SHIPMENTS, backlogShipmentsCount);
+        return backMap;
+    }
+
+    @Override
+    public Map<String, Long> getBacklogAfterSale() {
+        UserShopDetailsVO userShopDetails = userService.getUserShopDetails();
+        Long backlogAfterSaleCount = afterSaleService.selectCountByStatus(userShopDetails.getShopId(), userShopDetails.getMerId());
+
+        Map<String, Long> backMap = new HashMap<>();
         backMap.put(BacklogConstants.BACKLOG_AFTER_SALE, backlogAfterSaleCount);
         return backMap;
     }