是否已兑换
This commit is contained in:
@@ -98,6 +98,13 @@ public class TaskCenterRewardController {
|
|||||||
.eq("task_id", taskId)
|
.eq("task_id", taskId)
|
||||||
.gt("create_time", DateUtil.beginOfMonth(new Date()) + " 00:00:00"));
|
.gt("create_time", DateUtil.beginOfMonth(new Date()) + " 00:00:00"));
|
||||||
if (record != null) {
|
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("receive", record.getSourceId());
|
||||||
map.put("record", record.getId());
|
map.put("record", record.getId());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,7 +27,8 @@ public class TaskCenterReward extends Model<TaskCenterReward> {
|
|||||||
private String name;
|
private String name;
|
||||||
@ApiModelProperty("奖励类型 1 金币 2 现金红包 3 4 5 9 大转盘抽奖次数")
|
@ApiModelProperty("奖励类型 1 金币 2 现金红包 3 4 5 9 大转盘抽奖次数")
|
||||||
private Integer type;
|
private Integer type;
|
||||||
private Integer targetId;
|
@TableField(exist = false)
|
||||||
|
private Long targetId;
|
||||||
@ApiModelProperty("数量")
|
@ApiModelProperty("数量")
|
||||||
private Integer number;
|
private Integer number;
|
||||||
@ApiModelProperty("总数量")
|
@ApiModelProperty("总数量")
|
||||||
|
|||||||
Reference in New Issue
Block a user