BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 95d8be045571053546846dc930d92982b8c85a28

Authored by puhui999
1 parent 557b09a1

订单管理：完善订单聚合搜索

Inline Side-by-side
Showing 4 changed files with 12 additions and 19 deletions
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/aftersale/TradeAfterSaleController.java
  View file @95d8be0
... ... @@ -76,10 +76,9 @@ public class TradeAfterSaleController {
76 76 public CommonResult<TradeAfterSaleDetailRespVO> getOrderDetail(@RequestParam("id") Long id) {
77 77 // 查询订单
78 78 TradeAfterSaleDO afterSale = afterSaleService.getAfterSale(id);
79   - // TODO @puhui999：这里建议改成，如果为 null，直接返回 success null；主要查询操作，尽量不要有非空的提示哈；交给前端处理；
80   -// if (afterSale == null) {
81   -// return success(null, AFTER_SALE_NOT_FOUND.getMsg());
82   -// }
  79 + if (afterSale == null) {
  80 + return success(null);
  81 + }
83 82  
84 83 // 查询订单
85 84 TradeOrderDO order = tradeOrderQueryService.getOrder(afterSale.getOrderId());
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/TradeOrderController.java
  View file @95d8be0
... ... @@ -67,10 +67,9 @@ public class TradeOrderController {
67 67 public CommonResult<TradeOrderDetailRespVO> getOrderDetail(@RequestParam("id") Long id) {
68 68 // 查询订单
69 69 TradeOrderDO order = tradeOrderQueryService.getOrder(id);
70   - // TODO @puhui999：这里建议改成，如果为 null，直接返回 success null；主要查询操作，尽量不要有非空的提示哈；交给前端处理；
71   -// if (order == null) {
72   -// return success(null, ORDER_NOT_FOUND.getMsg());
73   -// }
  70 + if (order == null) {
  71 + return success(null);
  72 + }
74 73  
75 74 // 查询订单项
76 75 List<TradeOrderItemDO> orderItems = tradeOrderQueryService.getOrderItemListByOrderId(id);
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderPageReqVO.java
  View file @95d8be0
... ... @@ -31,19 +31,15 @@ public class TradeOrderPageReqVO extends PageParam {
31 31 @Mobile
32 32 private String userMobile;
33 33  
  34 + @Schema(description = "配送方式", example = "1")
  35 + private Integer deliveryType;
  36 +
34 37 @Schema(description = "发货物流公司编号", example = "1")
35 38 private Long logisticsId;
36 39  
37 40 @Schema(description = "自提门店编号", example = "[1,2]")
38 41 private List<Long> pickUpStoreIds;
39 42  
40   - @Schema(description = "收件人名称", example = "小红")
41   - private String receiverName;
42   -
43   - @Schema(description = "收件人手机", example = "1560")
44   - @Mobile
45   - private String receiverMobile;
46   -
47 43 @Schema(description = "订单类型", example = "1")
48 44 private Integer type;
49 45  
... ... @@ -61,5 +57,5 @@ public class TradeOrderPageReqVO extends PageParam {
61 57 @Schema(description = "订单来源", example = "10")
62 58 @InEnum(value = TerminalEnum.class, message = "订单来源 {value}")
63 59 private Integer terminal;
64   -// TODO 添加配送方式筛选
  60 +
65 61 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java
  View file @95d8be0
... ... @@ -27,13 +27,12 @@ public interface TradeOrderMapper extends BaseMapperX&lt;TradeOrderDO&gt; {
27 27 return selectPage(reqVO, new LambdaQueryWrapperX<TradeOrderDO>()
28 28 .likeIfPresent(TradeOrderDO::getNo, reqVO.getNo())
29 29 .eqIfPresent(TradeOrderDO::getUserId, reqVO.getUserId())
  30 + .eqIfPresent(TradeOrderDO::getDeliveryType, reqVO.getDeliveryType())
30 31 .inIfPresent(TradeOrderDO::getUserId, userIds)
31   - .likeIfPresent(TradeOrderDO::getReceiverName, reqVO.getReceiverName())
32   - .likeIfPresent(TradeOrderDO::getReceiverMobile, reqVO.getReceiverMobile())
33 32 .eqIfPresent(TradeOrderDO::getType, reqVO.getType())
34 33 .eqIfPresent(TradeOrderDO::getStatus, reqVO.getStatus())
35 34 .eqIfPresent(TradeOrderDO::getPayChannelCode, reqVO.getPayChannelCode())
36   - .eqIfPresent(TradeOrderDO::getTerminal,reqVO.getTerminal())
  35 + .eqIfPresent(TradeOrderDO::getTerminal, reqVO.getTerminal())
37 36 .eqIfPresent(TradeOrderDO::getLogisticsId, reqVO.getLogisticsId())
38 37 .inIfPresent(TradeOrderDO::getPickUpStoreId, reqVO.getPickUpStoreIds())
39 38 .betweenIfPresent(TradeOrderDO::getCreateTime, reqVO.getCreateTime()));
... ...