Merge branch 'dev' of http://139.159.177.244:3000/hurui/hai-server into dev

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);

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 " +
             " <if test='map.companyId != null'> and c.company_id = #{map.companyId} </if> " +
+            " <if test='map.memDiscountName != null'> and c.coupon_name = #{map.memDiscountName} </if>",
             " <if test='map.merchantId != null'> and c.merchant_id = #{map.merchantId} </if> )" +
             " <if test='map.orderNo != null'> and b.order_no = #{map.orderNo}</if>",
             " <if test='map.paySerialNo != null'> and b.pay_serial_no = #{map.paySerialNo} </if>",
             " <if test='map.payModel != null'> and b.pay_model = #{map.payModel} </if>",
             " <if test='map.payType != null'> and b.pay_type = #{map.payType} </if>",
+            " <if test='map.memPhone != null'> and b.mem_phone = #{map.memPhone} </if>",
             " <if test='map.orderStatus != null'> and b.order_status in (#{map.orderStatus}) </if>",
             " <if test='map.createTimeS != null'> <![CDATA[ and b.create_time >= #{map.createTimeS} ]]> </if>",
             " <if test='map.createTimeE != null'> <![CDATA[ and b.create_time <= #{map.createTimeE} ]]> </if>",