BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 716f11e80ba544c83e7018b77aab9cae4d907c68

Authored by puhui999
1 parent 8123354f

fix: 合并差异

Inline Side-by-side
Showing 3 changed files with 3 additions and 7 deletions
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/TradeOrderController.java
  View file @716f11e
... ... @@ -5,10 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
5 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 6 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
7 7 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
8   -import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDeliveryReqVO;
9   -import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDetailRespVO;
10   -import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderPageItemRespVO;
11   -import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderPageReqVO;
  8 +import cn.iocoder.yudao.module.trade.controller.admin.order.vo.*;
12 9 import cn.iocoder.yudao.module.trade.convert.order.TradeOrderConvert;
13 10 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
14 11 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/delivery/AppDeliverExpressController.java
  View file @716f11e
... ... @@ -31,7 +31,7 @@ public class AppDeliverExpressController {
31 31 @GetMapping("/list")
32 32 @Operation(summary = "获得快递公司列表")
33 33 public CommonResult<List<AppDeliveryExpressRespVO>> getDeliveryExpressList() {
34   - List<DeliveryExpressDO> list = deliveryExpressService.getDeliveryExpressList(CommonStatusEnum.ENABLE.getStatus());
  34 + List<DeliveryExpressDO> list = deliveryExpressService.getDeliveryExpressListByStatus(CommonStatusEnum.ENABLE.getStatus());
35 35 list.sort(Comparator.comparing(DeliveryExpressDO::getSort));
36 36 return success(DeliveryExpressConvert.INSTANCE.convertList03(list));
37 37 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceTest.java
  View file @716f11e
... ... @@ -56,8 +56,7 @@ public class TradeAfterSaleServiceTest extends BaseDbUnitTest {
56 56 private TradeOrderUpdateService tradeOrderUpdateService;
57 57 @Resource
58 58 private TradeOrderQueryService tradeOrderQueryService;
59   - @MockBean
60   - private TradeOrderQueryService tradeOrderQueryService;
  59 +
61 60 @MockBean
62 61 private PayRefundApi payRefundApi;
63 62  
... ...