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 cc4f8ae6..dba616f3 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java @@ -150,6 +150,8 @@ public class HighOrderController { @RequestParam(name = "merchantId", required = false) Long merchantId, @RequestParam(name = "orderNo", required = false) String orderNo, @RequestParam(name = "paySerialNo", required = false) String paySerialNo, + @RequestParam(name = "memDiscountName", required = false) String memDiscountName, + @RequestParam(name = "memPhone", required = false) String memPhone, @RequestParam(name = "payModel", required = false) Integer payModel, @RequestParam(name = "payType", required = false) Integer payType, @RequestParam(name = "orderStatus", required = false) Integer orderStatus, @@ -181,7 +183,9 @@ public class HighOrderController { map.put("orderNo", orderNo); map.put("paySerialNo", paySerialNo); map.put("payModel", payModel); + map.put("memDiscountName", memDiscountName); map.put("payType", payType); + map.put("memPhone", memPhone); map.put("orderStatus", orderStatus); map.put("createTimeS", createTimeS); map.put("createTimeE", createTimeE); 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 3b23e503..37bd14dc 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java +++ b/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java @@ -128,11 +128,13 @@ public interface HighOrderMapperExt { " and a.giveaway_type = 0" + " and EXISTS (select 1 from high_coupon c where c.id = a.goods_id " + " and c.company_id = #{map.companyId} " + + " and c.coupon_name = #{map.memDiscountName} ", " and c.merchant_id = #{map.merchantId} )" + " and b.order_no = #{map.orderNo}", " and b.pay_serial_no = #{map.paySerialNo} ", " and b.pay_model = #{map.payModel} ", " and b.pay_type = #{map.payType} ", + " and b.mem_phone = #{map.memPhone} ", " and b.order_status in (#{map.orderStatus}) ", " = #{map.createTimeS} ]]> ", " ",