提交代码

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<String,Object> 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);

hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java

@@ -389,6 +389,8 @@ public interface HighOrderMapperExt {
             "            <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.memDiscountName != null'> and a.goods_name = #{map.memDiscountName} </if>" +
+            "            <if test='map.memPhone != null'> and b.mem_phone = #{map.memPhone} </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>" +