Merge remote-tracking branch 'origin/wechat-pay' into wechat-pay

src/main/java/cn/quantgroup/xyqb/controller/external/user/WeChatController.java

@@ -425,7 +425,7 @@ public class WeChatController implements IBaseController {
         if ("baitiao".equals(merchant.getName())) {
             return userUIAddr + "/landing?key=baitiao&target=cashTarget5&channelId=222&registerFrom=198";
         } else if ("wechat-pay".equals(merchant.getName())) {
-          return userUIAddr + "/landing?key=wechat-pay&target=cashTarget4&channelId=1&registerFrom" + registerFrom;
+          return userUIAddr + "/landing?key=wechat-pay&target=cashTarget5&channelId=1&registerFrom" + registerFrom;
         } else {
             return userUIAddr + "/landing?key=xyqb&target=cashTarget4&channelId=1&registerFrom=" + registerFrom;
         }
@@ -435,7 +435,7 @@ public class WeChatController implements IBaseController {
         if ("baitiao".equals(merchant.getName())) {
             return userUIAddr + "/landing?key=baitiao&target=cashTarget5&registerFrom=198&channelId=222&isWechat=true&openId=" + userInfo.getOpenId();
         } else if ("wechat-pay".equals(merchant.getName())) {
-          return userUIAddr + "/landing?key=wechat-pay&target=cashTarget4&registerFrom= "  + registerFrom + "&channelId=1&isWechat=true&openId=" + userInfo.getOpenId();
+          return userUIAddr + "/landing?key=wechat-pay&target=cashTarget5&registerFrom= "  + registerFrom + "&channelId=1&isWechat=true&openId=" + userInfo.getOpenId();
         } else {
             return userUIAddr + "/landing?key=xyqb&target=cashTarget4&registerFrom= "  + registerFrom + "&channelId=1&isWechat=true&openId=" + userInfo.getOpenId();
         }

src/main/java/cn/quantgroup/xyqb/controller/internal/platform/PlatformAPIController.java

@@ -10,6 +10,8 @@ import cn.quantgroup.xyqb.service.merchant.IMerchantService;
 import cn.quantgroup.xyqb.service.page.IPageService;
 import com.google.common.collect.ImmutableMap;
 import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -22,6 +24,9 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/platform/api")
 public class PlatformAPIController implements IBaseController {
 
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(PlatformAPIController.class);
+
     @Autowired
     private IPageService pageService;
     @Autowired

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserDetailServiceImpl.java

@@ -10,6 +10,7 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
 import javax.persistence.criteria.*;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -47,22 +48,21 @@ public class UserDetailServiceImpl implements IUserDetailService {
     }
 
     private Specification<UserDetail> getSpecification(String name, String phoneNo, String idNo) {
+        List<Predicate> list = new ArrayList<>();
         Specification<UserDetail> specification = new Specification<UserDetail>() {
             @Override
             public Predicate toPredicate(Root<UserDetail> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
                 if (!StringUtils.isEmpty(name)) {
-                    Path<String> namePath = root.get("name");
-                    criteriaQuery.where(criteriaBuilder.equal(namePath, name));
+                    list.add(criteriaBuilder.equal(root.get("name").as(String.class), name));
                 }
                 if (!StringUtils.isEmpty(phoneNo)) {
-                    Path<String> phonePath = root.get("phoneNo");
-                    criteriaQuery.where(criteriaBuilder.equal(phonePath, phoneNo));
+                    list.add(criteriaBuilder.equal(root.get("phoneNo").as(String.class), phoneNo));
                 }
                 if (!StringUtils.isEmpty(idNo)) {
-                    Path<String> idNoPath = root.get("idNo");
-                    criteriaQuery.where(criteriaBuilder.equal(idNoPath, idNo));
+                    list.add(criteriaBuilder.equal(root.get("idNo").as(String.class), idNo));
                 }
-                return null;
+                Predicate[] p = new Predicate[list.size()];
+                return criteriaBuilder.and(list.toArray(p));
             }
         };
         return specification;