From 8d20ad4899696af82565c7f6c20728e45944546a Mon Sep 17 00:00:00 2001
From: tianfeng <769204422@qq.com>
Date: Wed, 14 Jan 2026 15:28:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A5=96=E5=8A=B1=E6=B1=A0=E5=A2=9E=E5=8A=A0re?=
 =?UTF-8?q?sourceGroupId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../command/activity/query/RewardPoolQueryExe.java  | 13 +++++++++----
 .../app/dto/clientobject/activity/RewardPoolCO.java |  5 +++++
 2 files changed, 14 insertions(+), 4 deletions(-)

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> activityRewardProps = activityResources.get(weeklyGiftConfig.getResourceGroupId()).getActivityRewardProps();
+          return getWeekRewardPoolCO(weeklyGiftConfig.getResourceGroupId(), activityRewardProps);
+
+        })
         .collect(Collectors.toList());
   }
 
 
-  private RewardPoolCO getWeekRewardPoolCO(
+  private RewardPoolCO getWeekRewardPoolCO(Long resourceGroupId,
       List<ActivityRewardProps> 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;
+
   /**
    * 奖励池.
    */