some changes

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

@@ -179,7 +179,7 @@ public class WeChatController {
             return;
         }
         WechatUserInfo userInfo = wechatService.getWechatUserInfoFromWechatServer(token.getAccessToken(), token.getOpenId());
-        if (userInfo == null) {
+        if (userInfo == null || StringUtils.isNotEmpty(userInfo.getOpenId())) {
             // 让用户登录，不关联微信, 构造不关联微信的url
             redirectNormalUrl(response, merchant);
             return;

src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java

@@ -5,6 +5,7 @@ import cn.quantgroup.xyqb.controller.IBaseController;
 import cn.quantgroup.xyqb.entity.Merchant;
 import cn.quantgroup.xyqb.entity.User;
 import cn.quantgroup.xyqb.entity.UserDetail;
+import cn.quantgroup.xyqb.entity.WechatUserInfo;
 import cn.quantgroup.xyqb.exception.UserNotExistException;
 import cn.quantgroup.xyqb.model.AuthBean;
 import cn.quantgroup.xyqb.model.JsonResult;
@@ -16,6 +17,7 @@ import cn.quantgroup.xyqb.service.session.ISessionService;
 import cn.quantgroup.xyqb.service.sms.ISmsService;
 import cn.quantgroup.xyqb.service.user.IUserDetailService;
 import cn.quantgroup.xyqb.service.user.IUserService;
+import cn.quantgroup.xyqb.service.wechat.IWechatService;
 import cn.quantgroup.xyqb.util.PasswordUtil;
 import cn.quantgroup.xyqb.util.ValidationUtil;
 import org.apache.commons.codec.binary.Base64;
@@ -64,6 +66,8 @@ public class UserController implements IBaseController {
     private IUserDetailService userDetailService;
     @Autowired
     private IMerchantService merchantService;
+    @Autowired
+    private IWechatService wechatService;
 
     private static final char[] PWD_BASE = {'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k',
             'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
@@ -427,4 +431,17 @@ public class UserController implements IBaseController {
         }
     }
 
+    public JsonResult associateWithWechat(String openId) {
+        User user = getCurrentUser();
+        Long userId = user.getId();
+        WechatUserInfo userInfo = wechatService.findWechatUserInfoFromDb(openId);
+        if (userInfo != null && userInfo.getUserId() == null) {
+            userInfo.setUserId(userId);
+            wechatService.saveWechatUserInfo(userInfo);
+        }
+
+
+        return JsonResult.buildSuccessResult(null, null);
+    }
+
 }