Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

无关风月

2024-10-23 3dbb04b1f0d75ee66745ea404bbcef102dda0781

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java

@@ -54,19 +54,30 @@
            if(Objects.isNull(appUser)){
                appUser = new TAppUser();
                appUser.setPhone(appletUserDecodeData.getPhoneNumber());
                appUser.setInviteUserId(inviteUserId);
            }
        }
        if(Objects.nonNull(appUser.getStatus())){
            throwInfo(appUser.getStatus());
            switch (appUser.getStatus()){
                case 1:
                    break;
                case 2:
                    throw new ServiceException("账号被冻结,请联系管理员");
                case 3:
                    appUser = new TAppUser();
                    appUser.setPhone(appletUserDecodeData.getPhoneNumber());
                    break;
            }
        }
        appUser.setInviteUserId(inviteUserId);
        appUser.setAvatar(appletUserDecodeData.getAvatarUrl());
        appUser.setCity(appletUserDecodeData.getCity());
        appUser.setName(appletUserDecodeData.getNickName());
        appUser.setProvince(appletUserDecodeData.getProvince());
        appUser.setWxOpenid(appletUserDecodeData.getOpenId());
        this.saveOrUpdate(appUser);
        inviteUserService.saveInviteUser(appUser.getId(), inviteUserId);
        if(Objects.nonNull(inviteUserId)){
            inviteUserService.saveInviteUser(appUser.getId(), inviteUserId);
        }
        return this.getUserInfo(appUser);
    }

@@ -86,15 +97,26 @@
            if(Objects.isNull(appUser)){
                appUser = new TAppUser();
                appUser.setPhone(phone);
                appUser.setInviteUserId(inviteUserId);
            }
        }
        if(Objects.nonNull(appUser.getStatus())){
            throwInfo(appUser.getStatus());
            switch (appUser.getStatus()){
                case 1:
                    break;
                case 2:
                    throw new ServiceException("账号被冻结,请联系管理员");
                case 3:
                    appUser = new TAppUser();
                    appUser.setPhone(phone);
                    break;
            }
        }
        appUser.setInviteUserId(inviteUserId);
        appUser.setAliOpenid(response.getOpenId());
        this.saveOrUpdate(appUser);
        inviteUserService.saveInviteUser(appUser.getId(), inviteUserId);
        if(Objects.nonNull(inviteUserId)){
            inviteUserService.saveInviteUser(appUser.getId(), inviteUserId);
        }
        return this.getUserInfo(appUser);
    }
//    @Override
@@ -149,7 +171,7 @@
            case 2:
                throw new ServiceException("账号被冻结,请联系管理员");
            case 3:
                throw new ServiceException("账号已注销,请重新注册使用");
//                throw new ServiceException("账号已注销,请重新注册使用");
            default:
                break;
        }