获得交易订单数量, 参数非必须

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

@@ -204,20 +204,20 @@ public class TradeOrderController {
 
     @GetMapping("/get-count")
     @Operation(summary = "获得交易订单数量")
-    public CommonResult<Map<Integer, Long>> getOrderCount(@RequestParam("shopId") Long shopId,@RequestParam("merId") Long merId) {
+    public CommonResult<Map<Integer, Long>> getOrderCount(@RequestParam(value = "shopId", required = false) Long shopId,
+                                                          @RequestParam(value = "merId", required = false) Long merId) {
         Map<Integer, Long> orderCount = Maps.newLinkedHashMapWithExpectedSize(6);
-        orderCount.put(-1,tradeOrderQueryService.getOrderCount(null));
-        orderCount.put(-2,afterSaleService.getApplyingAfterSaleCount(null));
-        orderCount.put(TradeOrderStatusEnum.UNPAID.getStatus(),tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.UNPAID.getStatus(),shopId,merId));
-        orderCount.put(TradeOrderStatusEnum.UNDELIVERED.getStatus(),tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.UNDELIVERED.getStatus(),shopId,merId));
-        orderCount.put(TradeOrderStatusEnum.DELIVERED.getStatus(),tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.DELIVERED.getStatus(),shopId,merId));
-        orderCount.put(TradeOrderStatusEnum.COMPLETED.getStatus(),tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.COMPLETED.getStatus(),shopId,merId));
-        orderCount.put(TradeOrderStatusEnum.CANCELED.getStatus(),tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.CANCELED.getStatus(),shopId,merId));
+        orderCount.put(-1, tradeOrderQueryService.getOrderCount(null));
+        orderCount.put(-2, afterSaleService.getApplyingAfterSaleCount(null));
+        orderCount.put(TradeOrderStatusEnum.UNPAID.getStatus(), tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.UNPAID.getStatus(), shopId, merId));
+        orderCount.put(TradeOrderStatusEnum.UNDELIVERED.getStatus(), tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.UNDELIVERED.getStatus(), shopId, merId));
+        orderCount.put(TradeOrderStatusEnum.DELIVERED.getStatus(), tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.DELIVERED.getStatus(), shopId, merId));
+        orderCount.put(TradeOrderStatusEnum.COMPLETED.getStatus(), tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.COMPLETED.getStatus(), shopId, merId));
+        orderCount.put(TradeOrderStatusEnum.CANCELED.getStatus(), tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.CANCELED.getStatus(), shopId, merId));
         return success(orderCount);
     }
 
 
-
     @GetMapping("/pay/page")
     @Operation(summary = "获得支付订单分页")
     @PreAuthorize("@ss.hasPermission('pay:order:query')")