czg_team/video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' into dev

Browse Source
This commit is contained in:
wangw
2024-12-11 11:00:04 +08:00
parent d30ed4aba6 1d714f7383
commit 85235ae78b
4 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterRecord.java
View File

@@ -29,16 +29,13 @@ public class TaskCenterRecord extends Model<TaskCenterRecord> {
private Long taskId; private Long taskId;
@ApiModelProperty("奖励名称") @ApiModelProperty("奖励名称")
private String name; private String name;
@ApiModelProperty("奖励类型 1 金豆 2 现金 3 4 5") @ApiModelProperty("奖励类型 1 金豆 2 现金 3 4 5 9转盘")
private Integer type; private Integer type;
@ApiModelProperty("${column.comment}")
private Long targetId; private Long targetId;
@ApiModelProperty("数量") @ApiModelProperty("数量")
private Integer number; private Integer number;
@ApiModelProperty("${column.comment}") private String createTime;
private Date createTime; private String updateTime;
@ApiModelProperty("${column.comment}")
private Date updateTime;
} }

2
src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterReward.java
View File

@@ -27,7 +27,7 @@ public class TaskCenterReward extends Model<TaskCenterReward> {
private Long taskId; private Long taskId;
@ApiModelProperty("奖励名称") @ApiModelProperty("奖励名称")
private String name; private String name;
@ApiModelProperty("奖励类型 1 金豆 2 现金红包 3 4 5 6 大转盘抽奖次数") @ApiModelProperty("奖励类型 1 金豆 2 现金红包 3 4 5 9 大转盘抽奖次数")
private Integer type; private Integer type;
private Integer targetId; private Integer targetId;
@ApiModelProperty("数量") @ApiModelProperty("数量")

2
src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterRecordServiceImpl.java
View File

@@ -17,7 +17,7 @@ public class TaskCenterRecordServiceImpl extends ServiceImpl<TaskCenterRecordDao
@Override @Override
public Integer countTaskNum(Long userId, Long taskId, String time) { public Integer countTaskNum(Long userId, Long taskId, String time) {
return baseMapper.selectCount(new QueryWrapper<TaskCenterRecord>().eq("user_id", userId).eq("task_id", taskId).lt("create_time", time)); return baseMapper.selectCount(new QueryWrapper<TaskCenterRecord>().eq("user_id", userId).eq("task_id", taskId).gt("create_time", time));
} }
} }

30
src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java
View File

@@ -47,7 +47,7 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
@Override @Override
public Result queryTaskCenter(Long userId) { public Result queryTaskCenter(Long userId) {
//任务 //任务
IPage<TaskCenter> taskPage = baseMapper.selectPage(new Page<>(1, 50), new QueryWrapper<TaskCenter>().eq("shows", 1).orderByAsc("sort","type")); IPage<TaskCenter> taskPage = baseMapper.selectPage(new Page<>(1, 50), new QueryWrapper<TaskCenter>().eq("shows", 1).orderByAsc("sort", "type"));
boolean todaySign = true; boolean todaySign = true;
//月 签到记录 //月 签到记录
QueryWrapper<UserSignRecord> signWrapper = new QueryWrapper<>(); QueryWrapper<UserSignRecord> signWrapper = new QueryWrapper<>();
@@ -60,24 +60,40 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
if (s.getType() == 2) { if (s.getType() == 2) {
if (s.getNumber().equals(1)) { if (s.getNumber().equals(1)) {
Integer dayOrderNum = ordersService.countOrderNum(userId, DateUtil.today() + " 00:00:00"); Integer dayOrderNum = ordersService.countOrderNum(userId, DateUtil.today() + " 00:00:00");
if (dayOrderNum < 3 || recordService.countTaskNum(userId, s.getId(), DateUtil.today() + " 00:00:00") > 0) { if (dayOrderNum < 3) {
s.setDiscNumber(dayOrderNum); s.setDiscNumber(dayOrderNum);
s.setNumber(3); s.setNumber(3);
s.setDisabled(false); // s.setDisabled(false);
todaySign = false; todaySign = false;
} else if (recordService.countTaskNum(userId, s.getId(), DateUtil.today() + " 00:00:00") > 0) {
s.setButtonTitle("已领取");
s.setNumber(null);
s.setDisabled(false);
} else {
s.setDiscNumber(0);
s.setNumber(null);
s.setJumpType(0);
} }
} else { } else {
if (todaySign) { if (todaySign) {
if ((signRecordList.size() < (s.getNumber().intValue() - 1)) || recordService.countTaskNum(userId, s.getId(), DateUtil.beginOfMonth(new Date()).toString()) > 0) { if ((signRecordList.size() < (s.getNumber().intValue() - 1))) {
s.setDiscNumber(s.getNumber() - signRecordList.size()); s.setDiscNumber(s.getNumber() - signRecordList.size());
s.setNumber(null); s.setNumber(null);
s.setDisabled(false); s.setDisabled(false);
} else if (recordService.countTaskNum(userId, s.getId(), DateUtil.beginOfMonth(new Date()).toString()) > 0) {
s.setButtonTitle("已领取");
s.setDisabled(false);
s.setNumber(null);
} }
} else { } else {
if ((signRecordList.size() < s.getNumber().intValue()) || recordService.countTaskNum(userId, s.getId(), DateUtil.beginOfMonth(new Date()).toString()) > 0) { if ((signRecordList.size() < s.getNumber().intValue())) {
s.setDiscNumber(s.getNumber() - signRecordList.size());
s.setDisabled(false);
s.setNumber(null);
} else if (recordService.countTaskNum(userId, s.getId(), DateUtil.beginOfMonth(new Date()).toString()) > 0) {
s.setButtonTitle("已领取");
s.setDisabled(false); s.setDisabled(false);
s.setNumber(null); s.setNumber(null);
s.setDiscNumber(s.getNumber() - signRecordList.size());
} }
} }
@@ -172,6 +188,8 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
record.setNumber(reward.getNumber()); record.setNumber(reward.getNumber());
record.setName(taskCenter.getTitle() + ":" + record.getName()); record.setName(taskCenter.getTitle() + ":" + record.getName());
record.setTargetId(targetId); record.setTargetId(targetId);
record.setCreateTime(DateUtil.now());
record.setUpdateTime(DateUtil.now());
records.add(record); records.add(record);
} }
recordService.saveBatch(records); recordService.saveBatch(records);