任务奖励 列表
This commit is contained in:
@@ -21,7 +21,9 @@ import org.springframework.web.bind.annotation.*;
|
|||||||
import springfox.documentation.annotations.ApiIgnore;
|
import springfox.documentation.annotations.ApiIgnore;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@RestController
|
@RestController
|
||||||
@@ -88,6 +90,7 @@ public class TaskCenterRewardController {
|
|||||||
@ApiImplicitParam(name = "taskId", value = "任务id", dataTypeClass = Long.class),
|
@ApiImplicitParam(name = "taskId", value = "任务id", dataTypeClass = Long.class),
|
||||||
})
|
})
|
||||||
public Result selectTaskCenterUserReward(@ApiIgnore @RequestAttribute("userId") Long userId, Long taskId) {
|
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);
|
QueryWrapper<TaskCenterReward> rewards = new QueryWrapper<TaskCenterReward>().eq("task_id", taskId);
|
||||||
List<TaskCenterReward> list = taskCenterRewardService.list(rewards);
|
List<TaskCenterReward> list = taskCenterRewardService.list(rewards);
|
||||||
TaskCenterRecord record = recordService.getOne(new QueryWrapper<TaskCenterRecord>()
|
TaskCenterRecord record = recordService.getOne(new QueryWrapper<TaskCenterRecord>()
|
||||||
@@ -95,13 +98,10 @@ 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) {
|
||||||
for (TaskCenterReward reward : list) {
|
map.put("receive", record.getId());
|
||||||
if (record.getSourceId().equals(reward.getId())) {
|
|
||||||
reward.setReceive(true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return Result.success().put("data", list);
|
map.put("data", list);
|
||||||
|
return Result.success(map);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -35,8 +35,6 @@ public class TaskCenterReward extends Model<TaskCenterReward> {
|
|||||||
@ApiModelProperty("剩余数量")
|
@ApiModelProperty("剩余数量")
|
||||||
private Integer surplusNumber;
|
private Integer surplusNumber;
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
@ApiModelProperty("是否已领取")
|
|
||||||
private boolean isReceive = false;
|
|
||||||
private String createTime;
|
private String createTime;
|
||||||
private String updateTime;
|
private String updateTime;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user