change: 修改接口, 修改返回的数据结构

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

@@ -189,8 +189,16 @@ public class TradeOrderController {
 
     @GetMapping("/get-count")
     @Operation(summary = "获得交易订单数量")
-    public CommonResult<ArrayList<TradeOrderCountRespVO>> getOrderCount() {
-        ArrayList<TradeOrderCountRespVO> tradeOrderCountRespVos = Lists.newArrayListWithCapacity(6);
+    public CommonResult<Map<Integer, Long>> getOrderCount() {
+        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()));
+        orderCount.put(TradeOrderStatusEnum.UNDELIVERED.getStatus(),tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.UNDELIVERED.getStatus()));
+        orderCount.put(TradeOrderStatusEnum.DELIVERED.getStatus(),tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.DELIVERED.getStatus()));
+        orderCount.put(TradeOrderStatusEnum.COMPLETED.getStatus(),tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.COMPLETED.getStatus()));
+        orderCount.put(TradeOrderStatusEnum.CANCELED.getStatus(),tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.CANCELED.getStatus()));
+        /*ArrayList<TradeOrderCountRespVO> tradeOrderCountRespVos = Lists.newArrayListWithCapacity(6);
         tradeOrderCountRespVos.add(TradeOrderCountRespVO.builder().status(-1)
                 .orderCount(tradeOrderQueryService.getOrderCount(null)).build());
         tradeOrderCountRespVos.add(TradeOrderCountRespVO.builder().status(TradeOrderStatusEnum.UNPAID.getStatus())
@@ -202,8 +210,8 @@ public class TradeOrderController {
         tradeOrderCountRespVos.add(TradeOrderCountRespVO.builder().status(TradeOrderStatusEnum.COMPLETED.getStatus())
                 .orderCount(tradeOrderQueryService.getOrderCount( TradeOrderStatusEnum.COMPLETED.getStatus())).build());
         tradeOrderCountRespVos.add(TradeOrderCountRespVO.builder().status(-2)
-                .orderCount(afterSaleService.getApplyingAfterSaleCount(null)).build());
-        return success(tradeOrderCountRespVos);
+                .orderCount(afterSaleService.getApplyingAfterSaleCount(null)).build());*/
+        return success(orderCount);
     }