|
@@ -32,8 +32,7 @@ import java.util.Set;
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
import static cn.iocoder.byzs.framework.common.exception.util.ServiceExceptionUtil.exception;
|
|
import static cn.iocoder.byzs.framework.common.exception.util.ServiceExceptionUtil.exception;
|
|
|
-import static cn.iocoder.byzs.module.system.enums.ErrorCodeConstants.USER_CODE_FAILURE;
|
|
|
|
|
-import static cn.iocoder.byzs.module.system.enums.ErrorCodeConstants.USER_CODE_USED;
|
|
|
|
|
|
|
+import static cn.iocoder.byzs.module.system.enums.ErrorCodeConstants.*;
|
|
|
|
|
|
|
|
@Service
|
|
@Service
|
|
|
public class WebLoginServiceImpl {
|
|
public class WebLoginServiceImpl {
|
|
@@ -59,9 +58,22 @@ public class WebLoginServiceImpl {
|
|
|
if (inviteCode == null) {
|
|
if (inviteCode == null) {
|
|
|
throw exception(USER_CODE_FAILURE);
|
|
throw exception(USER_CODE_FAILURE);
|
|
|
}
|
|
}
|
|
|
- if(!"0".equals(inviteCode.getStatus())){
|
|
|
|
|
|
|
+ if("1".equals(inviteCode.getStatus())){
|
|
|
throw exception(USER_CODE_USED);
|
|
throw exception(USER_CODE_USED);
|
|
|
}
|
|
}
|
|
|
|
|
+ // 校验邀请码是否指定手机号
|
|
|
|
|
+ if (inviteCode.getOnlyPhone() != null && !inviteCode.getOnlyPhone().isEmpty()) {
|
|
|
|
|
+ if (!inviteCode.getOnlyPhone().equals(registerVO.getUsername())) {
|
|
|
|
|
+ throw exception(USER_CODE_ONLY_PHONE_ERROR);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ // 校验邀请码是否过期
|
|
|
|
|
+ if (inviteCode.getExpireTime() != null && inviteCode.getExpireTime().isBefore(LocalDateTime.now())) {
|
|
|
|
|
+ if (!"3".equals(inviteCode.getStatus())){
|
|
|
|
|
+ inviteCodeService.updateInviteCode(new InviteCodeSaveReqVO().setId(inviteCode.getId()).setStatus("3"));
|
|
|
|
|
+ }
|
|
|
|
|
+ throw exception(USER_CODE_EXPIRED);
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
// 注册
|
|
// 注册
|
|
|
AuthRegisterReqVO registerReqVo = new AuthRegisterReqVO();
|
|
AuthRegisterReqVO registerReqVo = new AuthRegisterReqVO();
|
|
@@ -82,7 +94,6 @@ public class WebLoginServiceImpl {
|
|
|
.setUseUserId(userId)
|
|
.setUseUserId(userId)
|
|
|
.setUseUserTenantId(user.getTenantId())
|
|
.setUseUserTenantId(user.getTenantId())
|
|
|
.setUseTime(LocalDateTime.now())
|
|
.setUseTime(LocalDateTime.now())
|
|
|
- .setExpireTime(LocalDateTime.now().plusDays(inviteCode.getValidTime()))
|
|
|
|
|
.setStatus("1"));
|
|
.setStatus("1"));
|
|
|
|
|
|
|
|
|
|
|