From 7f2910f598b92b05ebfbe7dd66928592cb9a06a6 Mon Sep 17 00:00:00 2001
From: tianfeng <769204422@qq.com>
Date: Wed, 14 Jan 2026 14:56:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Ecp=E5=AD=A3=E5=BA=A6=E6=A6=9C?=
 =?UTF-8?q?=E5=A5=96=E5=8A=B1=E6=B1=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../other/inner/enums/activity/PropsActivityTypeEnum.java   | 5 +++++
 .../adapter/app/activity/room/WeekCpGiftRestController.java | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/enums/activity/PropsActivityTypeEnum.java b/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/enums/activity/PropsActivityTypeEnum.java
index a63f1991..ce0af4f7 100644
--- a/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/enums/activity/PropsActivityTypeEnum.java
+++ b/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/enums/activity/PropsActivityTypeEnum.java
@@ -67,6 +67,11 @@ public enum PropsActivityTypeEnum {
    */
   WEEK_CP_GIFT,
 
+  /**
+   * 每赛季CP相互赠送礼物榜单.
+   */
+  SEASON_CP_GIFT,
+
   /**
    * 房间PK游戏.
    */
diff --git a/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/activity/room/WeekCpGiftRestController.java b/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/activity/room/WeekCpGiftRestController.java
index fcf7ab80..602b3ebc 100644
--- a/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/activity/room/WeekCpGiftRestController.java
+++ b/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/activity/room/WeekCpGiftRestController.java
@@ -10,6 +10,8 @@ import com.red.circle.other.app.dto.cmd.activity.RewardPoolCmd;
 import com.red.circle.other.app.service.activity.WeekCpUserGiftService;
 import com.red.circle.other.inner.enums.activity.PropsActivityTypeEnum;
 import jakarta.validation.Valid;
+
+import java.util.Arrays;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -41,7 +43,9 @@ public class WeekCpGiftRestController extends BaseController {
    */
   @GetMapping("/list-reward-pool")
   public List<RewardPoolCO> listRewardPool(RewardPoolCmd cmd) {
-    cmd.setType(PropsActivityTypeEnum.WEEK_CP_GIFT);
+    if (!Arrays.asList(PropsActivityTypeEnum.WEEK_CP_GIFT, PropsActivityTypeEnum.SEASON_CP_GIFT).contains(cmd.getType())) {
+        return null;
+    }
     cmd.setGroupLimit(3);
     return weekCpUserGiftService.listRewardPool(cmd);
   }