修改微信绑定功能

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/service/auth/MemberAuthServiceImpl.java

@@ -89,7 +89,9 @@ public class MemberAuthServiceImpl implements MemberAuthService {
 
         // 获得获得注册用户
         MemberUserDO user = userService.createUserIfAbsent(reqVO.getMobile(), reqVO.getUsername(), userIp, getTerminal());
-        Assert.notNull(user, "获取用户失败，查询不到此用户");
+        if(user == null){
+            throw exception(USER_MOBILE_NOT_EXISTS);
+        }
 
         // 如果 socialType 非空，说明需要绑定社交用户
         String openid = null;

feifan-module-system/feifan-module-system-biz/src/main/java/cn/newfeifan/mall/module/system/service/social/SocialUserServiceImpl.java

@@ -160,6 +160,7 @@ public class SocialUserServiceImpl implements SocialUserService {
 
         AuthUser authUser = socialClientService.getAuthUser(socialType, userType, code, state);
         Assert.notNull(authUser, "三方用户不能为空");
+        socialUser = socialUserMapper.selectByTypeAndOpenid(socialType, authUser.getUuid());
 
         return getSocialUserDO(socialType, code, state, socialUser, authUser);
     }
@@ -172,7 +173,6 @@ public class SocialUserServiceImpl implements SocialUserService {
      * @param state 授权 state
      * @return 社交用户
      */
-    @NotNull
     private SocialUserDO getSocialUserDO(Integer socialType, String code, String state, SocialUserDO socialUser, AuthUser authUser) {
         if (socialUser == null) {
             socialUser = new SocialUserDO();