|
@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.GetMapping;
|
|
|
import org.springframework.web.bind.annotation.PathVariable;
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
|
+import org.springframework.web.bind.annotation.RequestParam;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
/**
|
|
@@ -173,4 +174,24 @@ public class OmsOrderController {
|
|
|
public OmsOrderDetailDTO getOrderDetail(@PathVariable("id") @Min(value = 1, message = "主键不能小于1") Long id) {
|
|
|
return this.omsOrderClient.detail(id);
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 查询订单详情
|
|
|
+ * @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}")
|
|
|
+ public OmsOrderDetailDTO getOrderDetail(@PathVariable("orderSn") @Min(value = 1, message = "核销码不能小于1") Long orderSn,
|
|
|
+ @PathVariable("merchantId") @Min(value = 1, message = "商家ID不能小于1") Long merchantId) {
|
|
|
+ return this.omsOrderClient.getOrderDetail(orderSn,merchantId);
|
|
|
+ }
|
|
|
}
|