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

H5资源组配置 道具券关联荣誉

Browse Source
This commit is contained in:
tianfeng 2025-11-24 12:13:14 +08:00
parent c5402adbaa
commit 331716c086
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/query/WeekKingQueenActivityExe.java
View File

@ -103,8 +103,7 @@ public class WeekKingQueenActivityExe {
)
);
propsActivityRewardMap.values().stream().flatMap(Collection::stream)
.filter(props -> Objects.equals(props.getType(),
PropsActivityRewardEnum.BADGE.name()))
.filter(props -> Objects.equals(props.getType(),PropsActivityRewardEnum.BADGE.name()) || Objects.equals(props.getType(),PropsActivityRewardEnum.PROP_COUPON.name()))
.forEach(props -> {
BadgePictureConfigDTO picture = badgePictureMap.get(Long.valueOf(props.getContent()));
if (Objects.isNull(picture)) {
@ -119,8 +118,7 @@ public class WeekKingQueenActivityExe {
private Set<Long> getBadgeIds(
Map<Long, List<PropsActivityRewardConfigInfoDTO>> propsActivityRewardMap) {
return propsActivityRewardMap.values().stream().flatMap(Collection::stream)
.filter(props -> Objects.equals(props.getType(),
PropsActivityRewardEnum.BADGE.name()))
.filter(props -> Objects.equals(props.getType(),PropsActivityRewardEnum.BADGE.name()) || Objects.equals(props.getType(),PropsActivityRewardEnum.PROP_COUPON.name()))
.map(props -> Long.valueOf(props.getContent()))
.collect(Collectors.toSet());
}

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

@ -105,7 +105,8 @@ public class PropsActivityRewardConfigClientServiceImpl implements
Map<Long, BadgeConfig> sysBadgeConfigMap = sysBadgeConfigService
.mapByIds(propsActivityRewardConfigs.stream().filter(config ->
Objects.equals(config.getType(), PropsActivityRewardEnum.BADGE.name()))
Objects.equals(config.getType(), PropsActivityRewardEnum.BADGE.name()) ||
Objects.equals(config.getType(), PropsActivityRewardEnum.PROP_COUPON.name()))
.map(config -> Long.valueOf(config.getContent()))
.collect(Collectors.toSet()));
@ -170,7 +171,7 @@ public class PropsActivityRewardConfigClientServiceImpl implements
setGift(config, propsActivity, giftConfig);
}
if (Objects.equals(config.getType(), PropsActivityRewardEnum.BADGE.name())) {
if (Objects.equals(config.getType(), PropsActivityRewardEnum.BADGE.name()) || Objects.equals(config.getType(), PropsActivityRewardEnum.PROP_COUPON.name())) {
BadgeConfig sysBadgeConfig = sysBadgeConfigMap
.get(DataTypeUtils.toLong(config.getContent()));
if (sysBadgeConfig != null) {