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-24 11:48:56 +08:00
parent 971b384033
commit c5402adbaa
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -177,7 +177,7 @@ public class PropsActivityRewardGroupClientServiceImpl implements
private void handlePropsAssemble(List<PropsActivityRewardConfigInfoDTO> propsActivityRewards, private void handlePropsAssemble(List<PropsActivityRewardConfigInfoDTO> propsActivityRewards,
Map<Long, BadgePictureConfig> badgePictureMap) { Map<Long, BadgePictureConfig> badgePictureMap) {
propsActivityRewards.stream() propsActivityRewards.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 -> { .forEach(props -> {
BadgePictureConfig picture = badgePictureMap.get(Long.valueOf(props.getContent())); BadgePictureConfig picture = badgePictureMap.get(Long.valueOf(props.getContent()));
if (Objects.isNull(picture)) { if (Objects.isNull(picture)) {
@ -189,8 +189,8 @@ public class PropsActivityRewardGroupClientServiceImpl implements
} }
private Set<Long> getBadgeContentList(List<PropsActivityRewardConfigInfoDTO> list) { private Set<Long> getBadgeContentList(List<PropsActivityRewardConfigInfoDTO> list) {
return list.stream().filter(props -> Objects.equals(props.getType(), return list.stream().filter(props -> Objects.equals(props.getType(),PropsActivityRewardEnum.BADGE.name()) ||
PropsActivityRewardEnum.BADGE.name())) Objects.equals(props.getType(),PropsActivityRewardEnum.PROP_COUPON.name()))
.map(props -> Long.valueOf(props.getContent())) .map(props -> Long.valueOf(props.getContent()))
.collect(Collectors.toSet()); .collect(Collectors.toSet());
} }
@ -220,7 +220,7 @@ public class PropsActivityRewardGroupClientServiceImpl implements
} }
Set<Long> sourceIds = propsActivityRewardConfigs.stream().filter(config -> Set<Long> sourceIds = propsActivityRewardConfigs.stream().filter(config ->
Objects.equals(config.getType(), PropsActivityRewardEnum.PROPS.name())) Objects.equals(config.getType(), PropsActivityRewardEnum.PROPS.name()) || Objects.equals(config.getType(), PropsActivityRewardEnum.PROP_COUPON.name()))
.map(config -> Long.valueOf(config.getContent())) .map(config -> Long.valueOf(config.getContent()))
.collect(Collectors.toSet()); .collect(Collectors.toSet());
@ -251,7 +251,7 @@ public class PropsActivityRewardGroupClientServiceImpl implements
Map<Long, BadgeConfig> sysBadgeConfigMap = badgeConfigService Map<Long, BadgeConfig> sysBadgeConfigMap = badgeConfigService
.mapByIds(propsActivityRewardConfigs.stream().filter(config -> .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())) .map(config -> Long.valueOf(config.getContent()))
.collect(Collectors.toSet())); .collect(Collectors.toSet()));
@ -265,13 +265,15 @@ public class PropsActivityRewardGroupClientServiceImpl implements
PropsActivityRewardConfigInfoDTO propsActivity = propsInnerConvertor.toPropsActivityRewardConfigInfoDTO( PropsActivityRewardConfigInfoDTO propsActivity = propsInnerConvertor.toPropsActivityRewardConfigInfoDTO(
config); config);
propsActivity.setSort(Objects.isNull(propsActivity.getSort()) ? 0 : propsActivity.getSort()); propsActivity.setSort(Objects.isNull(propsActivity.getSort()) ? 0 : propsActivity.getSort());
if (Objects.equals(config.getType(), PropsActivityRewardEnum.PROPS.name())) { if (Objects.equals(config.getType(), PropsActivityRewardEnum.PROPS.name()) || Objects.equals(config.getType(), PropsActivityRewardEnum.PROP_COUPON.name())) {
PropsSourceRecord sourceRecord = sourceRecordMap PropsSourceRecord sourceRecord = sourceRecordMap
.get(Long.valueOf(config.getContent())); .get(Long.valueOf(config.getContent()));
propsActivity.setCover(sourceRecord.getCover()); if (Objects.nonNull(sourceRecord)) {
propsActivity.setSourceUrl(sourceRecord.getSourceUrl()); propsActivity.setCover(sourceRecord.getCover());
propsActivity.setAmount(sourceRecord.getAmount()); propsActivity.setSourceUrl(sourceRecord.getSourceUrl());
propsActivity.setName(sourceRecord.getName()); propsActivity.setAmount(sourceRecord.getAmount());
propsActivity.setName(sourceRecord.getName());
}
} }
if (Objects.equals(config.getType(), PropsActivityRewardEnum.FRAGMENTS.name())) { if (Objects.equals(config.getType(), PropsActivityRewardEnum.FRAGMENTS.name())) {
@ -304,11 +306,12 @@ public class PropsActivityRewardGroupClientServiceImpl implements
propsActivity.setName(giftConfig.getGiftName()); propsActivity.setName(giftConfig.getGiftName());
} }
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 BadgeConfig sysBadgeConfig = sysBadgeConfigMap.get(DataTypeUtils.toLong(config.getContent()));
.get(DataTypeUtils.toLong(config.getContent())); if (Objects.nonNull(sysBadgeConfig)) {
propsActivity.setBadgeName(sysBadgeConfig.getBadgeName()); propsActivity.setBadgeName(sysBadgeConfig.getBadgeName());
propsActivity.setName(sysBadgeConfig.getBadgeName()); propsActivity.setName(sysBadgeConfig.getBadgeName());
}
} }
if (!Objects.equals(config.getType(), PropsActivityRewardEnum.SPECIAL_ID.name())) { if (!Objects.equals(config.getType(), PropsActivityRewardEnum.SPECIAL_ID.name())) {