BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 33c3686bef7d97afef33e5263bbe5a2af135fff4

Authored by YunaiV
1 parent 1f3f3d78

✨ MALL：合并订单和售后订单的数量接口

Inline Side-by-side
Showing 3 changed files with 7 additions and 6 deletions
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/TradeOrderController.java
  View file @33c3686
... ... @@ -10,6 +10,7 @@ import cn.iocoder.yudao.module.trade.convert.order.TradeOrderConvert;
10 10 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
11 11 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
12 12 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderLogDO;
  13 +import cn.iocoder.yudao.module.trade.service.aftersale.AfterSaleService;
13 14 import cn.iocoder.yudao.module.trade.service.order.TradeOrderLogService;
14 15 import cn.iocoder.yudao.module.trade.service.order.TradeOrderQueryService;
15 16 import cn.iocoder.yudao.module.trade.service.order.TradeOrderUpdateService;
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/aftersale/AppAfterSaleController.java
  View file @33c3686
... ... @@ -47,12 +47,6 @@ public class AppAfterSaleController {
47 47 return success(AfterSaleConvert.INSTANCE.convert(afterSaleService.getAfterSale(getLoginUserId(), id)));
48 48 }
49 49  
50   - @GetMapping(value = "/get-applying-count")
51   - @Operation(summary = "获得进行中的售后订单数量")
52   - public CommonResult<Long> getApplyingAfterSaleCount() {
53   - return success(afterSaleService.getApplyingAfterSaleCount(getLoginUserId()));
54   - }
55   -
56 50 @PostMapping(value = "/create")
57 51 @Operation(summary = "申请售后")
58 52 public CommonResult<Long> createAfterSale(@RequestBody AppAfterSaleCreateReqVO createReqVO) {
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
  View file @33c3686
... ... @@ -13,6 +13,7 @@ import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
13 13 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
14 14 import cn.iocoder.yudao.module.trade.enums.order.TradeOrderStatusEnum;
15 15 import cn.iocoder.yudao.module.trade.framework.order.config.TradeOrderProperties;
  16 +import cn.iocoder.yudao.module.trade.service.aftersale.AfterSaleService;
16 17 import cn.iocoder.yudao.module.trade.service.delivery.DeliveryExpressService;
17 18 import cn.iocoder.yudao.module.trade.service.order.TradeOrderQueryService;
18 19 import cn.iocoder.yudao.module.trade.service.order.TradeOrderUpdateService;
... ... @@ -49,6 +50,9 @@ public class AppTradeOrderController {
49 50 private DeliveryExpressService deliveryExpressService;
50 51  
51 52 @Resource
  53 + private AfterSaleService afterSaleService;
  54 +
  55 + @Resource
52 56 private TradeOrderProperties tradeOrderProperties;
53 57  
54 58 @GetMapping("/settlement")
... ... @@ -131,6 +135,8 @@ public class AppTradeOrderController {
131 135 // 待评价
132 136 orderCount.put("uncommentedCount", tradeOrderQueryService.getOrderCount(getLoginUserId(),
133 137 TradeOrderStatusEnum.COMPLETED.getStatus(), false));
  138 + // 售后数量
  139 + orderCount.put("afterSaleCount", afterSaleService.getApplyingAfterSaleCount(getLoginUserId()));
134 140 return success(orderCount);
135 141 }
136 142  
... ...