From bb67a73d64c2b3022b4661727d6a7aabebdbffa8 Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Wed, 18 Mar 2026 12:26:00 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=81=E5=88=B8=E4=BB=BB=E5=8A=A1=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=B4=BB=E5=8A=A8ID=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../other/adapter/app/task/SpinsTaskRestController.java | 7 +++++-- .../red/circle/other/app/command/SpinsTaskQueryExe.java | 3 ++- .../other/app/command/SpinsTaskReceiveRewardExe.java | 3 ++- .../other/app/service/task/SpinsTaskServiceImpl.java | 4 ++-- .../com/red/circle/other/app/service/SpinsTaskService.java | 2 +- 5 files changed, 12 insertions(+), 7 deletions(-) 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 getTaskList(AppExtCommand cmd) { + public List getTaskList(AppExtCommand cmd, @RequestParam(required = false) Long activityId) { Long userId = cmd.getReqUserId(); log.info("获取用户任务列表, userId={}", userId); - List taskList = spinsTaskService.getUserTaskList(userId); + if (activityId == null) { + activityId = 2006671533988298666L; + } + List 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 execute(Long userId) { + public List execute(Long userId, Long activityId) { // 1. 查询所有启用的任务配置 List taskConfigs = spinsTaskConfigDAO.selectList( new LambdaQueryWrapper() .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 spinsTaskConfigs = spinsTaskConfigDAO.selectList( new LambdaQueryWrapper() - .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 getUserTaskList(Long userId) { + public List 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 getUserTaskList(Long userId); + List getUserTaskList(Long userId, Long activityId); /** * 领取任务奖励