提交2。0代码

hai-order/src/main/java/com/web/config/AuthConfig.java

@@ -91,6 +91,7 @@ public class AuthConfig implements WebMvcConfigurer {
 	      .excludePathPatterns("/**/swagger-ui.html")
 	      .excludePathPatterns("/login/*")
 	      .excludePathPatterns("/cqNotify/*")
+	      .excludePathPatterns("/mobileRechargeNotify/*")
 	      .excludePathPatterns("/payNotify/*")
 	      .excludePathPatterns("/telChargeCallback/*")
 	      ;

hai-order/src/main/java/com/web/controller/business/OrderMobileRechargeController.java

@@ -63,7 +63,7 @@ public class OrderMobileRechargeController {
                                      @RequestParam(name = "memCardNo", required = false) String memCardNo,
                                      @RequestParam(name = "title", required = false) String title,
                                      @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,
@@ -99,7 +99,7 @@ public class OrderMobileRechargeController {
             map.put("memPhone", memPhone);
             map.put("memCardNo", memCardNo);
             map.put("productType", 9);
-            map.put("status", status);
+            map.put("orderStatus", orderStatus);
             map.put("payType", payType);
 
             PageHelper.startPage(pageNum,pageSize);

hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java

@@ -695,7 +695,7 @@ public class OrderServiceImpl implements OrderService {
         }
 
         if (StringUtils.isNotBlank(MapUtils.getString(param, "title"))) {
-            criteria.andTitleEqualTo("%" + MapUtils.getString(param, "title") + "%");
+            criteria.andTitleLike("%" + MapUtils.getString(param, "title") + "%");
         }
 
         if (StringUtils.isNotBlank(MapUtils.getString(param, "searchTitle"))) {
@@ -719,8 +719,8 @@ public class OrderServiceImpl implements OrderService {
             criteria.andMemPhoneLike("%" + MapUtils.getString(param, "memPhone") + "%");
         }
 
-        if (MapUtils.getInteger(param, "status") != null) {
+        if (MapUtils.getInteger(param, "orderStatus") != null) {
-            criteria.andOrderStatusEqualTo(MapUtils.getInteger(param, "status"));
+            criteria.andOrderStatusEqualTo(MapUtils.getInteger(param, "orderStatus"));
         }
         if (MapUtils.getLong(param, "createTimeS") != null) {
             criteria.andCreateTimeGreaterThanOrEqualTo(new Date(MapUtils.getLong(param, "createTimeS")));