From f21972b14c1b6ea4291afd915eb16321a3de4686 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 25 Dec 2024 15:07:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=A5=96=E5=8A=B1=20=20?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TaskCenterRewardController.java       | 12 ++++++------
 .../modules/taskCenter/entity/TaskCenterReward.java  |  2 --
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterRewardController.java b/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterRewardController.java
index f77249f1..6b537923 100644
--- a/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterRewardController.java
+++ b/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterRewardController.java
@@ -21,7 +21,9 @@ import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @RestController
@@ -88,6 +90,7 @@ public class TaskCenterRewardController {
             @ApiImplicitParam(name = "taskId", value = "任务id", dataTypeClass = Long.class),
     })
     public Result selectTaskCenterUserReward(@ApiIgnore @RequestAttribute("userId") Long userId, Long taskId) {
+        Map<String, Object> map = new HashMap<>();
         QueryWrapper<TaskCenterReward> rewards = new QueryWrapper<TaskCenterReward>().eq("task_id", taskId);
         List<TaskCenterReward> list = taskCenterRewardService.list(rewards);
         TaskCenterRecord record = recordService.getOne(new QueryWrapper<TaskCenterRecord>()
@@ -95,13 +98,10 @@ public class TaskCenterRewardController {
                 .eq("task_id", taskId)
                 .gt("create_time", DateUtil.beginOfMonth(new Date()) + " 00:00:00"));
         if (record != null) {
-            for (TaskCenterReward reward : list) {
-                if (record.getSourceId().equals(reward.getId())) {
-                    reward.setReceive(true);
-                }
-            }
+            map.put("receive", record.getId());
         }
-        return Result.success().put("data", list);
+        map.put("data", list);
+        return Result.success(map);
     }
 }
 
diff --git a/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterReward.java b/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterReward.java
index 6039c774..a7386d9b 100644
--- a/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterReward.java
+++ b/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterReward.java
@@ -35,8 +35,6 @@ public class TaskCenterReward extends Model<TaskCenterReward> {
     @ApiModelProperty("剩余数量")
     private Integer surplusNumber;
     @TableField(exist = false)
-    @ApiModelProperty("是否已领取")
-    private boolean isReceive = false;
     private String createTime;
     private String updateTime;