|
@@ -176,21 +176,11 @@ public class OmsOrderController {
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
- /**
|
|
|
|
- * 查询订单详情
|
|
|
|
- * @param id 查询参数
|
|
|
|
- * @return
|
|
|
|
- */
|
|
|
|
- @GetMapping("/order/{id}")
|
|
|
|
- public OmsOrderDetailDTO getOrderDetailBySn(@PathVariable("id") @Min(value = 1, message = "主键不能小于1") Long id) {
|
|
|
|
- return this.omsOrderClient.detail(id);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* 根据订单核销码获取订单详情
|
|
* 根据订单核销码获取订单详情
|
|
*/
|
|
*/
|
|
@GetMapping("/omsOrder/{orderSn}/{merchantId}")
|
|
@GetMapping("/omsOrder/{orderSn}/{merchantId}")
|
|
- public OmsOrderDetailDTO getOrderDetail(@PathVariable("orderSn") @Min(value = 1, message = "核销码不能小于1") Long orderSn,
|
|
|
|
|
|
+ public OmsOrderDetailDTO getOrderDetailBySn(@PathVariable("orderSn") @Min(value = 1, message = "核销码不能小于1") Long orderSn,
|
|
@PathVariable("merchantId") @Min(value = 1, message = "商家ID不能小于1") Long merchantId) {
|
|
@PathVariable("merchantId") @Min(value = 1, message = "商家ID不能小于1") Long merchantId) {
|
|
return this.omsOrderClient.getOrderDetail(orderSn,merchantId);
|
|
return this.omsOrderClient.getOrderDetail(orderSn,merchantId);
|
|
}
|
|
}
|