hy/aslan-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

user profile dto 封禁校验带上时间参数

Browse Source
This commit is contained in:
tianfeng 2025-10-14 16:10:24 +08:00
parent 66480b6747
commit 7907ab9024
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/user/UserProfileDTO.java
View File

@ -23,6 +23,8 @@ import java.util.function.Predicate;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import lombok.Data; import lombok.Data;
import static com.red.circle.common.business.enums.AccountStatusEnum.ARCHIVE;
/** /**
* 用户资料. * 用户资料.
* *
@ -265,6 +267,11 @@ public class UserProfileDTO implements Serializable {
return AccountStatusEnum.NORMAL; return AccountStatusEnum.NORMAL;
} }
// 封存了，但是时间过期了
if (Objects.equals(ARCHIVE.name(), this.accountStatus) && !this.checkAccountFreeze()) {
return AccountStatusEnum.NORMAL;
}
if (this.checkAccountFreeze()) { if (this.checkAccountFreeze()) {
return AccountStatusEnum.FREEZE; return AccountStatusEnum.FREEZE;
} }

8
rc-service/rc-service-other/other-domain/src/main/java/com/red/circle/other/domain/model/user/UserProfile.java
View File

@ -19,6 +19,9 @@ import java.util.function.Predicate;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import lombok.Data; import lombok.Data;
import static com.red.circle.common.business.enums.AccountStatusEnum.ARCHIVE;
import static com.red.circle.common.business.enums.AccountStatusEnum.ARCHIVE_DEVICE;
/** /**
* 用户模型. * 用户模型.
* *
@ -240,7 +243,10 @@ public class UserProfile implements Serializable {
* @return true 是， false 否 * @return true 是， false 否
*/ */
public boolean checkAccountArchive() { public boolean checkAccountArchive() {
return AccountStatusEnum.isArchive(this.getAccountStatus()); if (Objects.equals(ARCHIVE_DEVICE.name(), this.getAccountStatus())) {
return true;
}
return Objects.equals(ARCHIVE.name(), this.getAccountStatus()) && checkAccountFreeze();
} }
/** /**