diff --git a/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/task/SpinsTaskRestController.java b/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/task/SpinsTaskRestController.java
index 14bcf040..fe7dc89e 100644
--- a/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/task/SpinsTaskRestController.java
+++ b/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/task/SpinsTaskRestController.java
@@ -33,10 +33,13 @@ public class SpinsTaskRestController {
      * @return 任务列表
      */
     @GetMapping("/list")
-    public List<SpinsTaskCO> getTaskList(AppExtCommand cmd) {
+    public List<SpinsTaskCO> getTaskList(AppExtCommand cmd, @RequestParam(required = false) Long activityId) {
         Long userId = cmd.getReqUserId();
         log.info("获取用户任务列表, userId={}", userId);
-        List<SpinsTaskCO> taskList = spinsTaskService.getUserTaskList(userId);
+        if (activityId == null) {
+            activityId = 2006671533988298666L;
+        }
+        List<SpinsTaskCO> taskList = spinsTaskService.getUserTaskList(userId, activityId);
         return taskList;
     }
 
diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/SpinsTaskQueryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/SpinsTaskQueryExe.java
index 825c9486..833d91e5 100644
--- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/SpinsTaskQueryExe.java
+++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/SpinsTaskQueryExe.java
@@ -39,11 +39,12 @@ public class SpinsTaskQueryExe {
      * @param userId 用户ID
      * @return 任务列表
      */
-    public List<SpinsTaskCO> execute(Long userId) {
+    public List<SpinsTaskCO> execute(Long userId, Long activityId) {
         // 1. 查询所有启用的任务配置
         List<SpinsTaskConfig> taskConfigs = spinsTaskConfigDAO.selectList(
                 new LambdaQueryWrapper<SpinsTaskConfig>()
                         .eq(SpinsTaskConfig::getStatus, 1)
+                        .eq(SpinsTaskConfig::getLotteryActivityId, activityId)
                         .orderByAsc(SpinsTaskConfig::getSortOrder)
         );
 
diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/SpinsTaskReceiveRewardExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/SpinsTaskReceiveRewardExe.java
index f7c42e8d..f13f0acd 100644
--- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/SpinsTaskReceiveRewardExe.java
+++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/SpinsTaskReceiveRewardExe.java
@@ -69,8 +69,9 @@ public class SpinsTaskReceiveRewardExe {
     // 1. 查询任务配置
     List<SpinsTaskConfig> spinsTaskConfigs = spinsTaskConfigDAO.selectList(
         new LambdaQueryWrapper<SpinsTaskConfig>()
-            .eq(SpinsTaskConfig::getTaskCode, taskCode)
             .eq(SpinsTaskConfig::getStatus, 1)
+            .eq(SpinsTaskConfig::getLotteryActivityId, activityId)
+            .eq(SpinsTaskConfig::getTaskCode, taskCode)
     );
 
     if (spinsTaskConfigs.isEmpty()) {
diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/task/SpinsTaskServiceImpl.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/task/SpinsTaskServiceImpl.java
index d10c88a5..eb8a01bc 100644
--- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/task/SpinsTaskServiceImpl.java
+++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/task/SpinsTaskServiceImpl.java
@@ -29,9 +29,9 @@ public class SpinsTaskServiceImpl implements SpinsTaskService {
     private final SpinsTaskReceiveRewardExe spinsTaskReceiveRewardExe;
 
     @Override
-    public List<SpinsTaskCO> getUserTaskList(Long userId) {
+    public List<SpinsTaskCO> getUserTaskList(Long userId, Long activityId) {
         log.info("执行获取用户任务列表, userId={}", userId);
-        return spinsTaskQueryExe.execute(userId);
+        return spinsTaskQueryExe.execute(userId, activityId);
     }
 
     @Override
diff --git a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/service/SpinsTaskService.java b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/service/SpinsTaskService.java
index 0d18a37c..03c647dc 100644
--- a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/service/SpinsTaskService.java
+++ b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/service/SpinsTaskService.java
@@ -20,7 +20,7 @@ public interface SpinsTaskService {
      * @param userId 用户ID
      * @return 任务列表
      */
-    List<SpinsTaskCO> getUserTaskList(Long userId);
+    List<SpinsTaskCO> getUserTaskList(Long userId, Long activityId);
 
     /**
      * 领取任务奖励