diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/query/RewardPoolQueryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/query/RewardPoolQueryExe.java index c6aa2552..f7b863d1 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/query/RewardPoolQueryExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/query/RewardPoolQueryExe.java @@ -38,16 +38,21 @@ public class RewardPoolQueryExe { getGroupIds(ruleConfigs)); return ruleConfigs.stream() - .map(weeklyGiftConfig -> getWeekRewardPoolCO( - activityResources.get(weeklyGiftConfig.getResourceGroupId()).getActivityRewardProps())) + .map(weeklyGiftConfig -> { + List activityRewardProps = activityResources.get(weeklyGiftConfig.getResourceGroupId()).getActivityRewardProps(); + return getWeekRewardPoolCO(weeklyGiftConfig.getResourceGroupId(), activityRewardProps); + + }) .collect(Collectors.toList()); } - private RewardPoolCO getWeekRewardPoolCO( + private RewardPoolCO getWeekRewardPoolCO(Long resourceGroupId, List activityPropsGroups) { - return new RewardPoolCO().setActivityRewardProps(activityPropsGroups.stream() + return new RewardPoolCO() + .setResourceGroupId(resourceGroupId) + .setActivityRewardProps(activityPropsGroups.stream() .map(rewardProps -> new ActivityRewardPropsDTO() .setId(rewardProps.getId()) .setCover(rewardProps.getCover()) diff --git a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/activity/RewardPoolCO.java b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/activity/RewardPoolCO.java index 7d26a137..0cdeff56 100644 --- a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/activity/RewardPoolCO.java +++ b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/activity/RewardPoolCO.java @@ -1,6 +1,8 @@ package com.red.circle.other.app.dto.clientobject.activity; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.red.circle.framework.dto.ClientObject; import com.red.circle.other.inner.model.dto.activity.props.ActivityRewardPropsDTO; import java.util.List; @@ -18,6 +20,9 @@ import lombok.experimental.Accessors; @EqualsAndHashCode(callSuper = true) public class RewardPoolCO extends ClientObject { + @JsonSerialize(using = ToStringSerializer.class) + private Long resourceGroupId; + /** * 奖励池. */