From 331716c086b5a9a3a19f89001c1befa6e75f3872 Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Mon, 24 Nov 2025 12:13:14 +0800 Subject: [PATCH] =?UTF-8?q?H5=E8=B5=84=E6=BA=90=E7=BB=84=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=20=E9=81=93=E5=85=B7=E5=88=B8=E5=85=B3=E8=81=94=E8=8D=A3?= =?UTF-8?q?=E8=AA=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../command/activity/query/WeekKingQueenActivityExe.java | 6 ++---- .../impl/PropsActivityRewardConfigClientServiceImpl.java | 5 +++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/query/WeekKingQueenActivityExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/query/WeekKingQueenActivityExe.java index f7eaa7b4..a3d6a3a6 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/query/WeekKingQueenActivityExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/query/WeekKingQueenActivityExe.java @@ -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 getBadgeIds( Map> 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()); } diff --git a/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/material/props/impl/PropsActivityRewardConfigClientServiceImpl.java b/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/material/props/impl/PropsActivityRewardConfigClientServiceImpl.java index 2123bc73..c9f882b3 100644 --- a/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/material/props/impl/PropsActivityRewardConfigClientServiceImpl.java +++ b/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/material/props/impl/PropsActivityRewardConfigClientServiceImpl.java @@ -105,7 +105,8 @@ public class PropsActivityRewardConfigClientServiceImpl implements Map 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) {