任务 是否已领取
This commit is contained in:
@@ -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,28 +60,38 @@ 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 {
|
} else if (recordService.countTaskNum(userId, s.getId(), DateUtil.today() + " 00:00:00") > 0) {
|
||||||
|
s.setButtonTitle("已领取");
|
||||||
|
s.setDisabled(false);
|
||||||
|
} else {
|
||||||
|
s.setButtonTitle("");
|
||||||
s.setDiscNumber(0);
|
s.setDiscNumber(0);
|
||||||
s.setNumber(3);
|
s.setNumber(3);
|
||||||
s.setJumpType(0);
|
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);
|
||||||
}
|
}
|
||||||
} 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.setDiscNumber(s.getNumber() - signRecordList.size());
|
||||||
s.setDisabled(false);
|
s.setDisabled(false);
|
||||||
s.setNumber(null);
|
s.setNumber(null);
|
||||||
|
} else if (recordService.countTaskNum(userId, s.getId(), DateUtil.beginOfMonth(new Date()).toString()) > 0) {
|
||||||
|
s.setButtonTitle("已领取");
|
||||||
|
s.setDisabled(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user