From 184b3401117cca10e73d11b33db2fb8155a53cb6 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 25 Dec 2024 17:04:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=B7=B2=E5=85=91=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taskCenter/controller/TaskCenterRewardController.java | 7 +++++++ .../sqx/modules/taskCenter/entity/TaskCenterReward.java | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) 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 2fac05a4..0f0f5d5a 100644 --- a/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterRewardController.java +++ b/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterRewardController.java @@ -98,6 +98,13 @@ public class TaskCenterRewardController { .eq("task_id", taskId) .gt("create_time", DateUtil.beginOfMonth(new Date()) + " 00:00:00")); if (record != null) { + if (record.getTargetId() != null) { + for (TaskCenterReward reward : list) { + if (reward.getId().equals(record.getSourceId())) { + reward.setTargetId(record.getTargetId()); + } + } + } map.put("receive", record.getSourceId()); map.put("record", record.getId()); } 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 a7386d9b..a0caf07e 100644 --- a/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterReward.java +++ b/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterReward.java @@ -27,7 +27,8 @@ public class TaskCenterReward extends Model { private String name; @ApiModelProperty("奖励类型 1 金币 2 现金红包 3 4 5 9 大转盘抽奖次数") private Integer type; - private Integer targetId; + @TableField(exist = false) + private Long targetId; @ApiModelProperty("数量") private Integer number; @ApiModelProperty("总数量")