添加字段

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

@@ -432,23 +432,36 @@ public class UserController implements IBaseController {
     }
 
     @RequestMapping("/associate_wechat")
-    public JsonResult associateWithWechat(String openId) {
+    public JsonResult associateWithWechat(String openId, String phoneNo) {
         User user = getCurrentUser();
         Long userId = user.getId();
         WechatUserInfo userInfo = wechatService.findWechatUserInfoFromDb(openId);
         if (userInfo != null && userInfo.getUserId() == null) {
             userInfo.setUserId(userId);
+            userInfo.setPhoneNo(phoneNo);
             wechatService.saveWechatUserInfo(userInfo);
         }
         return JsonResult.buildSuccessResult(null, null);
     }
 
+    /**
+     * 确保一个微信号只能和一个xyqb账号进行关联
+     * @param openId
+     * @return
+     */
     @RequestMapping("/validateBinding")
     public JsonResult validateBinding(String openId) {
+        //查询微信关联表,已经存在的openId不能再次关联
         WechatUserInfo wechatUserInfo = wechatService.findWechatUserInfoFromDb(openId);
         if(wechatUserInfo != null && wechatUserInfo.getUserId() != null) {
             return JsonResult.buildSuccessResult(null, false);
         }
+        //查询user表，根据手机号.已经存在的手机无法再次关联.
+        String phoneNo = wechatUserInfo.getPhoneNo();
+        User user = userService.findByPhoneInDb(phoneNo);
+        if(null != user && user.getId() > 0L){
+            return JsonResult.buildSuccessResult(null, false);
+        }
         return JsonResult.buildSuccessResult(null, true);
     }
 

src/main/java/cn/quantgroup/xyqb/entity/WechatUserInfo.java

@@ -24,6 +24,8 @@ public class WechatUserInfo implements Serializable{
     private Long userId;
     @Column(name = "open_id")
     private String openId;
+    @Column(name = "phone_no")
+    private String phoneNo;
     @Column(name = "nick_name")
     private String nickName;
     @Column(name = "sex")