Merge branch 'dev/2024/0408/update-product' of Harper/feifan-backend-zx-app into master

修改微信登录

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

@@ -122,10 +122,10 @@ public class MemberAuthServiceImpl implements MemberAuthService {
                 //如果会员表中有记录
                 user = userService.getUserByMobile(phone);
                 if (user == null) {
-                    user = userService.createUser(socialUser.getNickname(), socialUser.getAvatar(), getClientIP(), getTerminal());
+                    user = userService.createUser(phone,socialUser.getNickname(), socialUser.getAvatar(), getClientIP(), getTerminal());
                 }
             } else {
-                user = userService.createUser(socialUser.getNickname(), socialUser.getAvatar(), getClientIP(), getTerminal());
+                user = userService.createUser(null,socialUser.getNickname(), socialUser.getAvatar(), getClientIP(), getTerminal());
             }
 
             socialUserApi.bindSocialUser(new SocialUserBindReqDTO(user.getId(), getUserType().getValue(),

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/service/user/MemberUserService.java

@@ -50,13 +50,14 @@ public interface MemberUserService {
      * 创建用户
      * 目的：三方登录时，如果未绑定用户时，自动创建对应用户
      *
+     * @param mobile   手机号
      * @param nickname   昵称
      * @param avtar      头像
      * @param registerIp 注册 IP
      * @param terminal   终端 {@link TerminalEnum}
      * @return 用户对象
      */
-    MemberUserDO createUser(String nickname, String avtar, String registerIp, Integer terminal);
+    MemberUserDO createUser(String mobile, String nickname, String avtar, String registerIp, Integer terminal);
 
     /**
      * 更新用户的最后登陆信息

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/service/user/MemberUserServiceImpl.java

@@ -83,16 +83,16 @@ public class MemberUserServiceImpl implements MemberUserService {
             return user;
         }
         // 用户不存在，则进行创建
-        return createUser(mobile, null, null, registerIp, terminal);
+        return privateCreateUser(mobile, null, null, registerIp, terminal);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public MemberUserDO createUser(String nickname, String avtar, String registerIp, Integer terminal) {
-        return createUser(null, nickname, avtar, registerIp, terminal);
+    public MemberUserDO createUser(String nickname,String mobile, String avtar, String registerIp, Integer terminal) {
+        return privateCreateUser(mobile, nickname, avtar, registerIp, terminal);
     }
 
-    private MemberUserDO createUser(String mobile, String nickname, String avtar,
+    private MemberUserDO privateCreateUser(String mobile, String nickname, String avtar,
                                     String registerIp, Integer terminal) {
         // 生成密码
         String password = IdUtil.fastSimpleUUID();