diff --git a/hai-order/src/main/java/com/web/controller/business/OrderIntegralRechargeController.java b/hai-order/src/main/java/com/web/controller/business/OrderIntegralRechargeController.java index 4a95adf5..c18f03c7 100644 --- a/hai-order/src/main/java/com/web/controller/business/OrderIntegralRechargeController.java +++ b/hai-order/src/main/java/com/web/controller/business/OrderIntegralRechargeController.java @@ -57,7 +57,7 @@ public class OrderIntegralRechargeController { @ApiOperation(value = "查询订单列表") public ResponseData getOrderList(@RequestParam(name = "memPhone", required = false) String memPhone, @RequestParam(name = "orderNo", required = false) String orderNo, - @RequestParam(name = "status", required = false) Long status, + @RequestParam(name = "orderStatus", required = false) Long orderStatus, @RequestParam(name = "payType", required = false) Long payType, @RequestParam(name = "createTimeS", required = false) Long createTimeS, @RequestParam(name = "createTimeE", required = false) Long createTimeE, @@ -70,7 +70,7 @@ public class OrderIntegralRechargeController { Map param = new HashMap<>(); param.put("orderNo", orderNo); param.put("memPhone", memPhone); - param.put("orderStatus", status); + param.put("orderStatus", orderStatus); param.put("payType", payType); param.put("createTimeS", createTimeS); param.put("createTimeE", createTimeE); diff --git a/hai-order/src/main/java/com/web/controller/business/OrderThirdPartyController.java b/hai-order/src/main/java/com/web/controller/business/OrderThirdPartyController.java index 48e9207f..4f1c0b71 100644 --- a/hai-order/src/main/java/com/web/controller/business/OrderThirdPartyController.java +++ b/hai-order/src/main/java/com/web/controller/business/OrderThirdPartyController.java @@ -61,7 +61,7 @@ public class OrderThirdPartyController { @RequestParam(name = "memPhone", required = false) String memPhone, @RequestParam(name = "memCardNo", required = false) String memCardNo, @RequestParam(name = "payType", required = false) Integer payType, - @RequestParam(name = "status", required = false) Integer status, + @RequestParam(name = "orderStatus", required = false) Integer orderStatus, @RequestParam(name = "companyId", required = false) Long companyId, @RequestParam(name = "createTimeS", required = false) Long createTimeS, @RequestParam(name = "createTimeE", required = false) Long createTimeE, @@ -97,7 +97,7 @@ public class OrderThirdPartyController { map.put("memPhone", memPhone); map.put("memCardNo", memCardNo); map.put("productType", productType); - map.put("orderStatus", status); + map.put("orderStatus", orderStatus); map.put("payType", payType); PageHelper.startPage(pageNum,pageSize);