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

赠送的勋章最多显示8个

Browse Source
This commit is contained in:
tianfeng 2025-11-14 16:26:51 +08:00
parent 8b2b7e9d47
commit e4d525eaac
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/common/activity/PropsActivitySendCommon.java
View File

@ -460,13 +460,7 @@ public class PropsActivitySendCommon {
if (CollectionUtils.isNotEmpty(useBadges) && useBadges.size() >= 8) { if (CollectionUtils.isNotEmpty(useBadges) && useBadges.size() >= 8) {
//卸下部分佩戴中的徽章 //卸下部分佩戴中的徽章
Set<Long> ids = Sets.newHashSet(); removeWears(useBadges, 8);
for (int i = 0; i < useBadges.size(); i++) {
if (i > 3) {
ids.add(useBadges.get(i).getId());
}
}
badgeBackpackService.removeWearByIds(ids);
} }
if (Objects.equals(prize.getQuantity(), BigDecimal.ZERO)) { if (Objects.equals(prize.getQuantity(), BigDecimal.ZERO)) {
@ -481,8 +475,18 @@ public class PropsActivitySendCommon {
// userProfileRepository.removeCache(userId); // userProfileRepository.removeCache(userId);
} }
private void removeWears(List<BadgeBackpack> useBadges, Integer maxDisplay) {
Set<Long> ids = Sets.newHashSet();
for (int i = 0; i < useBadges.size(); i++) {
if (i > maxDisplay) {
ids.add(useBadges.get(i).getId());
}
}
badgeBackpackService.removeWearByIds(ids);
}
private void sendRoomBadge(SendRewardAbstract param, List<PrizeDescribe> val) {
private void sendRoomBadge(SendRewardAbstract param, List<PrizeDescribe> val) {
Long roomId = roomProfileManagerService.getRoomId(param.getAcceptUserId()); Long roomId = roomProfileManagerService.getRoomId(param.getAcceptUserId());
if (Objects.isNull(roomId)) { if (Objects.isNull(roomId)) {
log.warn("领取房间徽章错误,没有找到用户房间信息:{}", roomId); log.warn("领取房间徽章错误,没有找到用户房间信息:{}", roomId);

22
rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/material/props/impl/BadgeBackpackClientServiceImpl.java
View File

@ -395,16 +395,20 @@ public class BadgeBackpackClientServiceImpl implements BadgeBackpackClientServic
return; return;
} }
Set<Long> ids = Sets.newHashSet(); removeWears(usePropsList, 8);
for (int i = 0; i < usePropsList.size(); i++) {
if (i > 3) {
ids.add(usePropsList.get(i).getId());
}
}
badgeBackpackService.removeWearByIds(ids);
} }
private void removeWears(List<BadgeBackpack> usePropsList, Integer maxDisplay) {
Set<Long> ids = Sets.newHashSet();
for (int i = 0; i < usePropsList.size(); i++) {
if (i > maxDisplay) {
ids.add(usePropsList.get(i).getId());
}
}
badgeBackpackService.removeWearByIds(ids);
}
} }