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 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); }