【更新】优化判断注册的用户邮箱和手机号是否需要绑定的方法

pull/281/head
xuyuxiang 2025-07-30 20:25:35 +08:00
parent c7fc575242
commit 4c88225f35
2 changed files with 40 additions and 72 deletions

View File

@ -1017,52 +1017,36 @@ public class ClientUserServiceImpl extends ServiceImpl<ClientUserMapper, ClientU
@Override @Override
public Boolean isUserNeedBindPhone() { public Boolean isUserNeedBindPhone() {
// 获取当前用户id
String loginId = StpClientUtil.getLoginIdAsString();
// 获取当前用户 // 获取当前用户
ClientUser clientUser = this.queryEntity(StpClientUtil.getLoginIdAsString()); ClientUser clientUser = this.queryEntity(loginId);
// 查询当前用户是否注册的 // 查询当前用户是否注册的
ClientUserExt clientUserExt = clientUserExtService.getOne(new LambdaQueryWrapper<ClientUserExt>().eq(ClientUserExt::getUserId, StpClientUtil.getLoginIdAsString()) ClientUserExt clientUserExt = clientUserExtService.getOne(new LambdaQueryWrapper<ClientUserExt>()
.eq(ClientUserExt::getUserId, loginId)
.eq(ClientUserExt::getSourceFromType, ClientUserSourceFromTypeEnum.SYSTEM_REGISTER.getValue())); .eq(ClientUserExt::getSourceFromType, ClientUserSourceFromTypeEnum.SYSTEM_REGISTER.getValue()));
// 不为空,则判断手机号是否为空 // 判断是否需要绑定手机号
if(ObjectUtil.isNotEmpty(clientUserExt)){ return ObjectUtil.isNotEmpty(clientUserExt)
// 手机号为空,判断系统注册后是否需要绑定手机号 && ObjectUtil.isEmpty(clientUser.getPhone())
if(ObjectUtil.isEmpty(clientUser.getPhone())) { ? Convert.toBool(devConfigApi.getValueByKey(SNOWY_SYS_DEFAULT_REGISTER_NEED_BIND_PHONE_FOR_C_KEY), false)
String registerNeedBindPhone = devConfigApi.getValueByKey(SNOWY_SYS_DEFAULT_REGISTER_NEED_BIND_PHONE_FOR_C_KEY); : false;
if(ObjectUtil.isNotEmpty(registerNeedBindPhone)){
return Convert.toBool(registerNeedBindPhone);
} else {
return false;
}
} else {
return false;
}
} else {
return false;
}
} }
@Override @Override
public Boolean isUserNeedBindEmail() { public Boolean isUserNeedBindEmail() {
// 获取当前用户id
String loginId = StpClientUtil.getLoginIdAsString();
// 获取当前用户 // 获取当前用户
ClientUser clientUser = this.queryEntity(StpClientUtil.getLoginIdAsString()); ClientUser clientUser = this.queryEntity(loginId);
// 查询当前用户是否注册的 // 查询当前用户是否注册的
ClientUserExt clientUserExt = clientUserExtService.getOne(new LambdaQueryWrapper<ClientUserExt>().eq(ClientUserExt::getUserId, StpClientUtil.getLoginIdAsString()) ClientUserExt clientUserExt = clientUserExtService.getOne(new LambdaQueryWrapper<ClientUserExt>()
.eq(ClientUserExt::getUserId,loginId)
.eq(ClientUserExt::getSourceFromType, ClientUserSourceFromTypeEnum.SYSTEM_REGISTER.getValue())); .eq(ClientUserExt::getSourceFromType, ClientUserSourceFromTypeEnum.SYSTEM_REGISTER.getValue()));
// 不为空,则判断邮箱是否为空 // 判断是否需要绑定邮箱
if(ObjectUtil.isNotEmpty(clientUserExt)){ return ObjectUtil.isNotEmpty(clientUserExt)
// 邮箱为空,判断系统注册后是否需要绑定邮箱 && ObjectUtil.isEmpty(clientUser.getEmail())
if(ObjectUtil.isEmpty(clientUser.getEmail())) { ? Convert.toBool(devConfigApi.getValueByKey(SNOWY_SYS_DEFAULT_REGISTER_NEED_BIND_EMAIL_FOR_C_KEY), false)
String registerNeedBindEmail = devConfigApi.getValueByKey(SNOWY_SYS_DEFAULT_REGISTER_NEED_BIND_EMAIL_FOR_C_KEY); : false;
if(ObjectUtil.isNotEmpty(registerNeedBindEmail)){
return Convert.toBool(registerNeedBindEmail);
} else {
return false;
}
} else {
return false;
}
} else {
return false;
}
} }
@Override @Override

View File

@ -2253,52 +2253,36 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override @Override
public Boolean isUserNeedBindPhone() { public Boolean isUserNeedBindPhone() {
// 获取当前用户id
String loginId = StpUtil.getLoginIdAsString();
// 获取当前用户 // 获取当前用户
SysUser sysUser = this.queryEntity(StpUtil.getLoginIdAsString()); SysUser sysUser = this.queryEntity(loginId);
// 查询当前用户是否注册的 // 查询当前用户是否注册的
SysUserExt sysUserExt = sysUserExtService.getOne(new LambdaQueryWrapper<SysUserExt>().eq(SysUserExt::getUserId, StpUtil.getLoginIdAsString()) SysUserExt sysUserExt = sysUserExtService.getOne(new LambdaQueryWrapper<SysUserExt>()
.eq(SysUserExt::getUserId, loginId)
.eq(SysUserExt::getSourceFromType, SysUserSourceFromTypeEnum.SYSTEM_REGISTER.getValue())); .eq(SysUserExt::getSourceFromType, SysUserSourceFromTypeEnum.SYSTEM_REGISTER.getValue()));
// 不为空,则判断手机号是否为空 // 判断是否需要绑定手机号
if(ObjectUtil.isNotEmpty(sysUserExt)){ return ObjectUtil.isNotEmpty(sysUserExt)
// 手机号为空,判断系统注册后是否需要绑定手机号 && ObjectUtil.isEmpty(sysUser.getPhone())
if(ObjectUtil.isEmpty(sysUser.getPhone())) { ? Convert.toBool(devConfigApi.getValueByKey(SNOWY_SYS_DEFAULT_REGISTER_NEED_BIND_PHONE_FOR_B_KEY), false)
String registerNeedBindPhone = devConfigApi.getValueByKey(SNOWY_SYS_DEFAULT_REGISTER_NEED_BIND_PHONE_FOR_B_KEY); : false;
if(ObjectUtil.isNotEmpty(registerNeedBindPhone)){
return Convert.toBool(registerNeedBindPhone);
} else {
return false;
}
} else {
return false;
}
} else {
return false;
}
} }
@Override @Override
public Boolean isUserNeedBindEmail() { public Boolean isUserNeedBindEmail() {
// 获取当前用户id
String loginId = StpUtil.getLoginIdAsString();
// 获取当前用户 // 获取当前用户
SysUser sysUser = this.queryEntity(StpUtil.getLoginIdAsString()); SysUser sysUser = this.queryEntity(loginId);
// 查询当前用户是否注册的 // 查询当前用户是否注册的
SysUserExt sysUserExt = sysUserExtService.getOne(new LambdaQueryWrapper<SysUserExt>().eq(SysUserExt::getUserId, StpUtil.getLoginIdAsString()) SysUserExt sysUserExt = sysUserExtService.getOne(new LambdaQueryWrapper<SysUserExt>()
.eq(SysUserExt::getUserId, loginId)
.eq(SysUserExt::getSourceFromType, SysUserSourceFromTypeEnum.SYSTEM_REGISTER.getValue())); .eq(SysUserExt::getSourceFromType, SysUserSourceFromTypeEnum.SYSTEM_REGISTER.getValue()));
// 不为空,则判断邮箱是否为空 // 判断是否需要绑定邮箱
if(ObjectUtil.isNotEmpty(sysUserExt)){ return ObjectUtil.isNotEmpty(sysUserExt)
// 邮箱为空,判断系统注册后是否需要绑定邮箱 && ObjectUtil.isEmpty(sysUser.getEmail())
if(ObjectUtil.isEmpty(sysUser.getEmail())) { ? Convert.toBool(devConfigApi.getValueByKey(SNOWY_SYS_DEFAULT_REGISTER_NEED_BIND_EMAIL_FOR_B_KEY), false)
String registerNeedBindEmail = devConfigApi.getValueByKey(SNOWY_SYS_DEFAULT_REGISTER_NEED_BIND_EMAIL_FOR_B_KEY); : false;
if(ObjectUtil.isNotEmpty(registerNeedBindEmail)){
return Convert.toBool(registerNeedBindEmail);
} else {
return false;
}
} else {
return false;
}
} else {
return false;
}
} }
/** /**