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

活动礼物列表新增活动ID字段

Browse Source
This commit is contained in:
tianfeng 2026-02-11 18:27:20 +08:00
parent 301c183b5e
commit 1f03ec5558
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/gift/query/ActivityGiftListQryExe.java
View File

@ -42,16 +42,15 @@ public class ActivityGiftListQryExe {
} }
// 构建 giftId -> bannerId 的映射（取第一个遇到的 bannerId） // 构建 giftId -> bannerId 的映射（取第一个遇到的 bannerId）
Map<Long, Long> giftIdToBannerIdMap = new HashMap<>(); Map<Long, ActivityConfig> giftIdToBannerIdMap = new HashMap<>();
List<Long> giftIds = new ArrayList<>(); List<Long> giftIds = new ArrayList<>();
for (ActivityConfig activity : activities) { for (ActivityConfig activity : activities) {
Long bannerId = activity.getBannerId();
if (CollectionUtils.isNotEmpty(activity.getGiftIds())) { if (CollectionUtils.isNotEmpty(activity.getGiftIds())) {
for (Object giftIdObj : activity.getGiftIds()) { for (Object giftIdObj : activity.getGiftIds()) {
Long giftId = Long.valueOf(giftIdObj.toString()); Long giftId = Long.valueOf(giftIdObj.toString());
if (!giftIdToBannerIdMap.containsKey(giftId)) { if (!giftIdToBannerIdMap.containsKey(giftId)) {
giftIdToBannerIdMap.put(giftId, bannerId); giftIdToBannerIdMap.put(giftId, activity);
giftIds.add(giftId); giftIds.add(giftId);
} }
} }
@ -64,7 +63,7 @@ public class ActivityGiftListQryExe {
// 收集所有需要查询的 bannerId（去重） // 收集所有需要查询的 bannerId（去重）
List<Long> bannerIds = giftIdToBannerIdMap.values().stream() List<Long> bannerIds = giftIdToBannerIdMap.values().stream()
.filter(Objects::nonNull).distinct().collect(Collectors.toList()); .filter(Objects::nonNull).map(ActivityConfig::getBannerId).distinct().collect(Collectors.toList());
Map<Long, String> bannerUrlMap; Map<Long, String> bannerUrlMap;
if (!bannerIds.isEmpty()) { if (!bannerIds.isEmpty()) {
@ -88,7 +87,7 @@ public class ActivityGiftListQryExe {
} }
private ActivityGiftCO convertToActivityGiftCO(GiftConfig giftConfig, private ActivityGiftCO convertToActivityGiftCO(GiftConfig giftConfig,
Map<Long, Long> giftIdToBannerIdMap, Map<Long, ActivityConfig> giftIdToBannerIdMap,
Map<Long, String> bannerUrlMap) { Map<Long, String> bannerUrlMap) {
ActivityGiftCO activityGiftCO = new ActivityGiftCO(); ActivityGiftCO activityGiftCO = new ActivityGiftCO();
activityGiftCO.setId(giftConfig.getId()); activityGiftCO.setId(giftConfig.getId());
@ -103,9 +102,10 @@ public class ActivityGiftListQryExe {
activityGiftCO.setExpiredTime(giftConfig.getExpiredTime()); activityGiftCO.setExpiredTime(giftConfig.getExpiredTime());
// 设置 bannerUrl // 设置 bannerUrl
Long bannerId = giftIdToBannerIdMap.get(giftConfig.getId()); ActivityConfig activityConfig = giftIdToBannerIdMap.get(giftConfig.getId());
String bannerUrl = (bannerId != null) ? bannerUrlMap.get(bannerId) : null; String bannerUrl = (activityConfig.getBannerId() != null) ? bannerUrlMap.get(activityConfig.getBannerId()) : null;
activityGiftCO.setBannerUrl(bannerUrl); activityGiftCO.setBannerUrl(bannerUrl);
activityGiftCO.setActivityId(activityConfig.getId());
return activityGiftCO; return activityGiftCO;
} }

5
rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/gift/ActivityGiftCO.java
View File

@ -72,6 +72,11 @@ public class ActivityGiftCO extends ClientObject {
*/ */
private Timestamp expiredTime; private Timestamp expiredTime;
/**
* 活动ID
*/
private Long activityId;
/** /**
* banner地址. * banner地址.
*/ */