OK

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

@@ -446,22 +446,30 @@ public class UserController implements IBaseController {
     }
 
     @RequestMapping("/associate_wechat")
-    public JsonResult associateWithWechat(String openId, String phoneNo) {
+    public JsonResult associateWithWechat(String openId) {
         User user = getCurrentUser();
         Long userId = user.getId();
-        WechatUserInfo wechatUserInfo = wechatService.findWechatUserInfoByPhoneNo(phoneNo);
-        if (wechatUserInfo != null) {
-            return JsonResult.buildErrorStateResult("该手机号已绑定其他微信号码", null);
-        }
         WechatUserInfo userInfo = wechatService.findWechatUserInfoFromDb(openId);
-        if(!user.getPhoneNo().equals(phoneNo)) {
-            return JsonResult.buildErrorStateResult("该手机号已绑定其他微信号码", null);
+
+        // 已经绑定过了
+        if (userInfo != null && StringUtils.isNotEmpty(userInfo.getPhoneNo())) {
+            return JsonResult.buildSuccessResult(null, null);
+        }
+        // 前置绑定微信出错
+        if (userInfo == null) {
+            return JsonResult.buildSuccessResult(null, null);
         }
-        //限制微信用户和xyqb用户为一对一的关系
-        if (userInfo != null) {
+        // 未绑定信用钱包用户
+        if (userInfo.getUserId() == null) {
             userInfo.setUserId(userId);
-            userInfo.setPhoneNo(phoneNo);
+            userInfo.setPhoneNo(user.getPhoneNo());
+            try {
                 wechatService.saveWechatUserInfo(userInfo);
+            } catch (Exception ex) {
+                // 不做绑定
+                JsonResult.buildErrorStateResult("该手机号已绑定其他微信号码", null);
+            }
+            return JsonResult.buildSuccessResult(null, null);
         }
         return JsonResult.buildSuccessResult(null, null);
     }

src/main/java/cn/quantgroup/xyqb/filter/RequestFilter.java

@@ -31,7 +31,7 @@ public class RequestFilter implements Filter {
     private AntPathMatcher matcher = new AntPathMatcher();
     private static final String [] ALLOWED_PATTERNS = {
         "/innerapi/**", "/user/exist","/user/register","/user/login","/user/register/fast",
-            "/user/login/fast", "/user/reset_password","/user/exist_check", "/user/associate_wechat",
+            "/user/login/fast", "/user/reset_password","/user/exist_check",
             "/jr58/**","/app/login","/app/login_super", "/wechat/**", "/config/**","/api/**","/user/exists_token",
             "/platform/api/page/return_url", "/MP_verify_AWiagUn4kZiwmTt0.txt"
     };