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

徽章列表永久时间处理

Browse Source
This commit is contained in:
tianfeng 2025-11-20 15:54:27 +08:00
parent 2eed26678b
commit 663d9b4b28
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/material/query/UserBadgeTableQryExe.java
View File

@ -12,9 +12,13 @@ import com.red.circle.other.infra.database.rds.entity.badge.BadgePictureConfig;
import com.red.circle.other.infra.database.rds.service.badge.BadgeBackpackService;
import com.red.circle.other.infra.database.rds.service.badge.BadgeConfigService;
import com.red.circle.other.infra.database.rds.service.badge.BadgePictureConfigService;
import com.red.circle.other.inner.enums.material.BadgeBackpackExpireType;
import com.red.circle.other.inner.enums.material.BadgeConfigTypeEnum;
import com.red.circle.tool.core.collection.CollectionUtils;
import com.red.circle.tool.core.date.TimestampUtils;
import com.red.circle.tool.core.text.StringUtils;
import java.sql.Timestamp;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
@ -103,8 +107,15 @@ public class UserBadgeTableQryExe {
return new BadgeTableCO()
.setBadgeConfig(badgeConfigCO)
.setActivation(Objects.nonNull(badgeBackpackMap.get(badgeConfig.getId())))
.setExpireTime(Objects.nonNull(badgeBackpackMap.get(badgeConfig.getId())) ? badgeBackpackMap.get(badgeConfig.getId()).getExpireTime() : null);
.setExpireTime(getBadgeExpireTime(badgeBackpackMap.get(badgeConfig.getId())));
};
}
private Long getBadgeExpireTime(BadgeBackpack badgeBackpack) {
return Objects.equals(badgeBackpack.getExpireType(), BadgeBackpackExpireType.PERMANENT.name())
? TimestampUtils.nowPlusYear(10).getTime()
: badgeBackpack.getExpireTime().getTime();
}
}

2
rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/material/BadgeTableCO.java
View File

@ -31,7 +31,7 @@ public class BadgeTableCO extends ClientObject {
/**
* 过期时间.
*/
private Timestamp expireTime;
private Long expireTime;
/**
* 徽章配置信息.