|
|
|
@ -421,7 +421,7 @@ public class HighOrderController { |
|
|
|
|
@ResponseBody |
|
|
|
|
@ApiOperation(value = "根据表示查询订单") |
|
|
|
|
public ResponseData getOrderListByIdCode(@RequestParam(name = "merchantId", required = false) Long merchantId, |
|
|
|
|
@RequestParam(name = "identificationCode", required = false) String identificationCode, |
|
|
|
|
@RequestParam(name = "identificationCode", required = true) String identificationCode, |
|
|
|
|
@RequestParam(name = "orderNo", required = false) String orderNo, |
|
|
|
|
@RequestParam(name = "paySerialNo", required = false) String paySerialNo, |
|
|
|
|
@RequestParam(name = "payModel", required = false) Integer payModel, |
|
|
|
@ -465,7 +465,7 @@ public class HighOrderController { |
|
|
|
|
@ApiOperation(value = "导出商品订单列表") |
|
|
|
|
public ResponseData exportOrderListByIdCode(@RequestParam(name = "companyId", required = false) Long companyId, |
|
|
|
|
@RequestParam(name = "merchantId", required = false) Long merchantId, |
|
|
|
|
@RequestParam(name = "identificationCode", required = false) String identificationCode, |
|
|
|
|
@RequestParam(name = "identificationCode", required = true) String identificationCode, |
|
|
|
|
@RequestParam(name = "orderNo", required = false) String orderNo, |
|
|
|
|
@RequestParam(name = "paySerialNo", required = false) String paySerialNo, |
|
|
|
|
@RequestParam(name = "payModel", required = false) Integer payModel, |
|
|
|
|