diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/gift/query/ActivityGiftListQryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/gift/query/ActivityGiftListQryExe.java index 1560bba2..28514999 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/gift/query/ActivityGiftListQryExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/gift/query/ActivityGiftListQryExe.java @@ -65,12 +65,12 @@ public class ActivityGiftListQryExe { List bannerIds = giftIdToBannerIdMap.values().stream() .filter(Objects::nonNull).map(ActivityConfig::getBannerId).distinct().collect(Collectors.toList()); - Map bannerUrlMap; + Map bannerUrlMap; if (!bannerIds.isEmpty()) { LambdaQueryWrapper query = Wrappers.lambdaQuery() .in(BannerConfig::getId, bannerIds); bannerUrlMap = bannerConfigService.list(query).stream() - .collect(Collectors.toMap(BannerConfig::getId, BannerConfig::getCover, (u1, u2) -> u1)); + .collect(Collectors.toMap(BannerConfig::getId, e -> e, (u1, u2) -> u1)); } else { bannerUrlMap = new HashMap<>(); } @@ -88,7 +88,7 @@ public class ActivityGiftListQryExe { private ActivityGiftCO convertToActivityGiftCO(GiftConfig giftConfig, Map giftIdToBannerIdMap, - Map bannerUrlMap) { + Map bannerUrlMap) { ActivityGiftCO activityGiftCO = new ActivityGiftCO(); activityGiftCO.setId(giftConfig.getId()); activityGiftCO.setGiftCode(giftConfig.getGiftCode()); @@ -103,8 +103,12 @@ public class ActivityGiftListQryExe { // 设置 bannerUrl ActivityConfig activityConfig = giftIdToBannerIdMap.get(giftConfig.getId()); - String bannerUrl = (activityConfig.getBannerId() != null) ? bannerUrlMap.get(activityConfig.getBannerId()) : null; - activityGiftCO.setBannerUrl(bannerUrl); + BannerConfig bannerConfig = (activityConfig.getBannerId() != null) ? bannerUrlMap.get(activityConfig.getBannerId()) : null; + if (bannerConfig != null) { + activityGiftCO.setBannerUrl(bannerConfig.getCover()); + activityGiftCO.setJumpUrl(bannerConfig.getParams()); + } + activityGiftCO.setActivityId(activityConfig.getId()); return activityGiftCO; diff --git a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/gift/ActivityGiftCO.java b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/gift/ActivityGiftCO.java index beb2d263..808bd637 100644 --- a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/gift/ActivityGiftCO.java +++ b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/gift/ActivityGiftCO.java @@ -82,4 +82,9 @@ public class ActivityGiftCO extends ClientObject { */ private String bannerUrl; + /** + * banner跳转地址 + */ + private String jumpUrl; + }