diff --git a/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/material/UseOwnBadgeDTO.java b/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/material/UseOwnBadgeDTO.java index e5611b21..36795ed2 100644 --- a/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/material/UseOwnBadgeDTO.java +++ b/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/material/UseOwnBadgeDTO.java @@ -72,7 +72,6 @@ public class UseOwnBadgeDTO implements Serializable { /** * 过期时间. */ - @JsonSerialize(using = ToStringSerializer.class) private Long expireTime; /** diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/material/query/UserBadgeTableQryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/material/query/UserBadgeTableQryExe.java index ed73bc9f..207925d9 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/material/query/UserBadgeTableQryExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/material/query/UserBadgeTableQryExe.java @@ -102,7 +102,8 @@ public class UserBadgeTableQryExe { badgeConfigCO.setNotSelectUrl(badgePictureConfig.getNotSelectUrl()); return new BadgeTableCO() .setBadgeConfig(badgeConfigCO) - .setActivation(Objects.nonNull(badgeBackpackMap.get(badgeConfig.getId()))); + .setActivation(Objects.nonNull(badgeBackpackMap.get(badgeConfig.getId()))) + .setExpireTime(Objects.nonNull(badgeBackpackMap.get(badgeConfig.getId())) ? badgeBackpackMap.get(badgeConfig.getId()).getExpireTime() : null); }; } diff --git a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/material/BadgeTableCO.java b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/material/BadgeTableCO.java index 2e6b926c..e16ed134 100644 --- a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/material/BadgeTableCO.java +++ b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/material/BadgeTableCO.java @@ -5,6 +5,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.sql.Timestamp; + /** *

* 徽章表格. @@ -25,6 +27,12 @@ public class BadgeTableCO extends ClientObject { */ private Boolean activation; + + /** + * 过期时间. + */ + private Timestamp expireTime; + /** * 徽章配置信息. */