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

荣誉勋章增加use字段

Browse Source
This commit is contained in:
tianfeng 2026-01-23 17:45:37 +08:00
parent 5bcf9c36ce
commit bc973c1bcc
6 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/material/UseBadgeDTO.java
View File

@ -50,6 +50,11 @@ public class UseBadgeDTO implements Serializable {
*/
private String type;
/**
* 是否佩戴上
*/
private Boolean use;
/**
* 徽章key.
*/

6
rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/user/props/UserUseBadgeDTO.java
View File

@ -50,6 +50,12 @@ public class UserUseBadgeDTO implements Serializable {
*/
private String type;
/**
* 是否佩戴上
*/
private Boolean use;
/**
* 徽章key.
*/

2
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/common/props/UserBadgeCommon.java
View File

@ -122,6 +122,6 @@ public class UserBadgeCommon {
*/
public List<BadgeBackpackDTO> listUseNotExpireTimeByUserIds(Set<Long> userIds) {
return badgeInfraConvertor.toListBadgeBackpackDTO(
badgeBackpackService.listUseNotExpireTimeByUserIds(userIds));
badgeBackpackService.listNotExpireTimeByUserIds(userIds));
}
}

5
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/badge/BadgeBackpackService.java
View File

@ -72,6 +72,11 @@ public interface BadgeBackpackService extends BaseService<BadgeBackpack> {
*/
List<BadgeBackpack> listUseNotExpireTimeByUserIds(Set<Long> userIds);
/**
* 获取一组用户未过期的徽章.
*/
List<BadgeBackpack> listNotExpireTimeByUserIds(Set<Long> userIds);
/**
* 获取一组指定的徽章信息.
*/

15
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/badge/impl/BadgeBackpackServiceImpl.java
View File

@ -141,6 +141,21 @@ public class BadgeBackpackServiceImpl extends
.orElseGet(CollectionUtils::newArrayList);
}
@Override
public List<BadgeBackpack> listNotExpireTimeByUserIds(Set<Long> userIds) {
if (CollectionUtils.isEmpty(userIds)) {
return CollectionUtils.newArrayList();
}
return Optional.ofNullable(query()
.in(userIds.size() > 1, BadgeBackpack::getUserId, userIds)
.eq(Objects.equals(userIds.size(), 1), BadgeBackpack::getUserId, userIds.iterator().next())
.list())
.map(badgeBackpacks -> badgeBackpacks.stream().filter(this::filterAvailable)
.collect(Collectors.toList()))
.orElseGet(CollectionUtils::newArrayList);
}
@Override
public List<BadgeBackpack> listUserNotExpireTimeByBadgeIds(Long userId, Collection<Long> badgeIds) {
if (CollectionUtils.isEmpty(badgeIds)) {

3
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/gateway/user/UserRunProfileTransportGatewayImpl.java
View File

@ -91,7 +91,7 @@ public class UserRunProfileTransportGatewayImpl implements UserRunProfileTranspo
@Override
public UserProfile getByUserId(Long userId) {
UserRunProfile userRunProfile = userRunProfileService.getById(userId);
UserRunProfile userRunProfile = null;
if (Objects.nonNull(userRunProfile)) {
// 拥有靓号
UserSpecialId userSpecialId = userSpecialIdService.getByUserId(userId);
@ -356,6 +356,7 @@ public class UserRunProfileTransportGatewayImpl implements UserRunProfileTranspo
entity.setSelectUrl(badgePictureConfig.getSelectUrl());
entity.setNotSelectUrl(badgePictureConfig.getNotSelectUrl());
entity.setAnimationUrl(badgePictureConfig.getAnimationUrl());
entity.setUse(badgeBackpack.getUseProps());
entity.setExpireTime(
Objects.equals(badgeBackpack.getExpireType(), BadgeBackpackExpireType.PERMANENT.name())
? TimestampUtils.nowPlusYear(10).getTime()