diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java b/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java index b42fdba3..2b01c359 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java @@ -424,6 +424,8 @@ public class HighOrderController { @RequestParam(name = "identificationCode", required = true) String identificationCode, @RequestParam(name = "orderNo", required = false) String orderNo, @RequestParam(name = "paySerialNo", required = false) String paySerialNo, + @RequestParam(name = "memPhone", required = false) String memPhone, + @RequestParam(name = "memDiscountName", required = false) String memDiscountName, @RequestParam(name = "payModel", required = false) Integer payModel, @RequestParam(name = "payType", required = false) Integer payType, @RequestParam(name = "orderStatus", required = false) Integer orderStatus, @@ -443,6 +445,8 @@ public class HighOrderController { map.put("identificationCode", identificationCode); map.put("orderNo", orderNo); map.put("paySerialNo", paySerialNo); + map.put("memPhone", memPhone); + map.put("memDiscountName", memDiscountName); map.put("payModel", payModel); map.put("payType", payType); map.put("orderStatus", orderStatus); @@ -467,6 +471,8 @@ public class HighOrderController { @RequestParam(name = "merchantId", required = false) Long merchantId, @RequestParam(name = "identificationCode", required = true) String identificationCode, @RequestParam(name = "orderNo", required = false) String orderNo, + @RequestParam(name = "memPhone", required = false) String memPhone, + @RequestParam(name = "memDiscountName", required = false) String memDiscountName, @RequestParam(name = "paySerialNo", required = false) String paySerialNo, @RequestParam(name = "payModel", required = false) Integer payModel, @RequestParam(name = "payType", required = false) Integer payType, @@ -482,6 +488,8 @@ public class HighOrderController { Map map = new HashMap<>(); map.put("orderNo", orderNo); map.put("paySerialNo", paySerialNo); + map.put("memPhone", memPhone); + map.put("memDiscountName", memDiscountName); map.put("payModel", payModel); map.put("payType", payType); map.put("orderStatus", orderStatus); diff --git a/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java b/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java index 0a174062..c2bc992b 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java +++ b/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java @@ -389,6 +389,8 @@ public interface HighOrderMapperExt { " and b.order_no = #{map.orderNo} " + " and b.pay_serial_no = #{map.paySerialNo} " + " and b.pay_model = #{map.payModel} " + + " and a.goods_name = #{map.memDiscountName} " + + " and b.mem_phone = #{map.memPhone} " + " and b.pay_type = #{map.payType} " + " and b.mem_phone = #{map.memPhone} " + " and b.order_status in (#{map.orderStatus}) " +