任务奖励 列表
This commit is contained in:
@@ -1,19 +1,27 @@
|
|||||||
package com.sqx.modules.taskCenter.controller;
|
package com.sqx.modules.taskCenter.controller;
|
||||||
|
|
||||||
|
|
||||||
|
import cn.hutool.core.date.DateUtil;
|
||||||
|
import com.sqx.modules.app.annotation.Login;
|
||||||
|
import com.sqx.modules.taskCenter.entity.TaskCenterRecord;
|
||||||
import com.sqx.modules.taskCenter.entity.TaskCenterReward;
|
import com.sqx.modules.taskCenter.entity.TaskCenterReward;
|
||||||
|
import com.sqx.modules.taskCenter.service.TaskCenterRecordService;
|
||||||
import com.sqx.modules.taskCenter.service.TaskCenterRewardService;
|
import com.sqx.modules.taskCenter.service.TaskCenterRewardService;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.sqx.common.utils.DateUtils;
|
import com.sqx.common.utils.DateUtils;
|
||||||
import com.sqx.common.utils.Result;
|
import com.sqx.common.utils.Result;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
|
import io.swagger.annotations.ApiImplicitParam;
|
||||||
|
import io.swagger.annotations.ApiImplicitParams;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
import springfox.documentation.annotations.ApiIgnore;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@RestController
|
@RestController
|
||||||
@@ -25,6 +33,8 @@ public class TaskCenterRewardController {
|
|||||||
*/
|
*/
|
||||||
@Autowired
|
@Autowired
|
||||||
private TaskCenterRewardService taskCenterRewardService;
|
private TaskCenterRewardService taskCenterRewardService;
|
||||||
|
@Autowired
|
||||||
|
private TaskCenterRecordService recordService;
|
||||||
|
|
||||||
@PostMapping("/insertTaskCenterReward")
|
@PostMapping("/insertTaskCenterReward")
|
||||||
@ApiOperation("添加任务奖励")
|
@ApiOperation("添加任务奖励")
|
||||||
@@ -70,5 +80,28 @@ public class TaskCenterRewardController {
|
|||||||
public Result selectTaskCenterReward(Integer page, Integer limit, TaskCenterReward taskCenterReward) {
|
public Result selectTaskCenterReward(Integer page, Integer limit, TaskCenterReward taskCenterReward) {
|
||||||
return Result.success().put("data", taskCenterRewardService.page(new Page<>(page, limit), new QueryWrapper<>(taskCenterReward).orderByDesc("id")));
|
return Result.success().put("data", taskCenterRewardService.page(new Page<>(page, limit), new QueryWrapper<>(taskCenterReward).orderByDesc("id")));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Login
|
||||||
|
@GetMapping("/selectTaskCenterUserReward")
|
||||||
|
@ApiOperation("查询用户任务奖励列表")
|
||||||
|
@ApiImplicitParams({
|
||||||
|
@ApiImplicitParam(name = "taskId", value = "任务id", dataTypeClass = Long.class),
|
||||||
|
})
|
||||||
|
public Result selectTaskCenterUserReward(@ApiIgnore @RequestAttribute("userId") Long userId, Long taskId) {
|
||||||
|
QueryWrapper<TaskCenterReward> rewards = new QueryWrapper<TaskCenterReward>().eq("task_id", taskId);
|
||||||
|
List<TaskCenterReward> list = taskCenterRewardService.list(rewards);
|
||||||
|
TaskCenterRecord record = recordService.getOne(new QueryWrapper<TaskCenterRecord>()
|
||||||
|
.eq("user_id", userId)
|
||||||
|
.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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return Result.success().put("data", list);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.sqx.modules.taskCenter.entity;
|
package com.sqx.modules.taskCenter.entity;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import com.baomidou.mybatisplus.extension.activerecord.Model;
|
import com.baomidou.mybatisplus.extension.activerecord.Model;
|
||||||
import io.swagger.annotations.ApiModel;
|
import io.swagger.annotations.ApiModel;
|
||||||
@@ -33,6 +34,9 @@ public class TaskCenterReward extends Model<TaskCenterReward> {
|
|||||||
private Integer totalNumber;
|
private Integer totalNumber;
|
||||||
@ApiModelProperty("剩余数量")
|
@ApiModelProperty("剩余数量")
|
||||||
private Integer surplusNumber;
|
private Integer surplusNumber;
|
||||||
|
@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