增加限制，用户已保存的联系人>=2时，不允许再保存联系人信息

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

@@ -4,6 +4,7 @@ import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.entity.Merchant;
 import cn.quantgroup.xyqb.entity.User;
 import cn.quantgroup.xyqb.entity.WechatUserInfo;
+import cn.quantgroup.xyqb.event.UserinfoChangedEvent;
 import cn.quantgroup.xyqb.model.AuthBean;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.model.webchat.AccessTokenResponse;
@@ -173,7 +174,7 @@ public class WeChatController {
      * @return
      */
     @RequestMapping("/receiveCode/{key}")
-    public void receiveCode(String code, @PathVariable(value = "key") String systemKey, HttpServletResponse response) {
+    public void receiveCode(String code, @PathVariable(value = "key") String systemKey, String redirect, HttpServletResponse response) {
         LOGGER.info("微信登录:" + systemKey);
         // 从code获取token
         Merchant merchant = merchantService.findMerchantByName(systemKey);
@@ -214,18 +215,24 @@ public class WeChatController {
         }
         // 已经关联了用户
         // create session, 登进去，该怎么玩怎么玩。
-        String redirectUrl = createUserSession(user, merchant);
+        String redirectUrl = createUserSession(user, merchant, redirect);
         response.setHeader("Location", redirectUrl);
         response.setStatus(301);
     }
 
-    private String createUserSession(User user, Merchant merchant) {
-        LOGGER.info("微信登录: createUserSession:{} merchant is null:", merchant == null);
-        if ("baitiao".equals(merchant.getName())) {
-            return loginInWechatWithSessionCreated(user, merchant, "cashTarget5", Constants.Channel.BAITIAO);
-        } else {
-            return loginInWechatWithSessionCreated(user, merchant, "cashTarget4", 1L);
+    private String createUserSession(User user, Merchant merchant, String redirect) {
+        if(StringUtils.isEmpty(redirect)) {
+            LOGGER.info("微信登录: createUserSession:{} merchant is null:", merchant == null);
+            if ("baitiao".equals(merchant.getName())) {
+                return loginInWechatWithSessionCreated(user, merchant, "cashTarget5", Constants.Channel.BAITIAO);
+            } else {
+                return loginInWechatWithSessionCreated(user, merchant, "cashTarget4", 1L);
+            }
+        } else if(redirect.equals("redirect")){
+            AuthBean authBean = sessionService.createSession(Constants.Channel.WECHAT, Constants.Channel.WECHAT, "", user, merchant);
+            return userUIAddr + "/weixin/callback?phoneNo=" + user.getPhoneNo() + "&token=" + authBean.getToken();
         }
+        return null;
     }
 
     private String loginInWechatWithSessionCreated(User user, Merchant merchant, String target, Long channelId) {

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

@@ -49,18 +49,20 @@ public class UserDetailServiceImpl implements IUserDetailService {
         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));
-                }
-                if (!StringUtils.isEmpty(phoneNo)) {
-                    Path<String> phonePath = root.get("phoneNo");
-                    criteriaQuery.where(criteriaBuilder.equal(phonePath, phoneNo));
-                }
-                if (!StringUtils.isEmpty(idNo)) {
-                    Path<String> idNoPath = root.get("idNo");
-                    criteriaQuery.where(criteriaBuilder.equal(idNoPath, idNo));
-                }
+                //以下条件不做非空判断,如果判断非空当不填任何条件查询时,会将user_detail表的所有数据都查询出来
+                //不做非空判断,当不填任何条件查询时将返回空列表[]
+                //if (!StringUtils.isEmpty(name)) {
+                Path<String> namePath = root.get("name");
+                criteriaQuery.where(criteriaBuilder.equal(namePath, name));
+                //}
+                //if (!StringUtils.isEmpty(phoneNo)) {
+                Path<String> phonePath = root.get("phoneNo");
+                criteriaQuery.where(criteriaBuilder.equal(phonePath, phoneNo));
+                //}
+                //if (!StringUtils.isEmpty(idNo)) {
+                Path<String> idNoPath = root.get("idNo");
+                criteriaQuery.where(criteriaBuilder.equal(idNoPath, idNo));
+                //}
                 return null;
             }
         };