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

统计月签到次数 问题

Browse Source
This commit is contained in:
wangw
2024-12-12 17:56:10 +08:00
parent 9775cf129a
commit 4227ece60a
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,9 +52,9 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
//月 签到记录 //月 签到记录
QueryWrapper<UserSignRecord> signWrapper = new QueryWrapper<>(); QueryWrapper<UserSignRecord> signWrapper = new QueryWrapper<>();
signWrapper.eq("user_id", userId); signWrapper.eq("user_id", userId);
signWrapper.lt("sign_day", DateUtil.format(new Date(), "yyyy-MM") + "-00"); signWrapper.gt("sign_day", DateUtil.format(new Date(), "yyyy-MM") + "-00");
signWrapper.orderByAsc("create_time"); signWrapper.orderByAsc("create_time");
List<UserSignRecord> signRecordList = signRecordService.list(signWrapper); int signCount = signRecordService.count(signWrapper);
TaskCenter reTaskCenter = null; TaskCenter reTaskCenter = null;
for (TaskCenter s : taskPage) { for (TaskCenter s : taskPage) {
switch (s.getType()) { switch (s.getType()) {
@@ -78,8 +78,8 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
} }
} else { } else {
if (todaySign) { if (todaySign) {
if ((signRecordList.size() < (s.getNumber().intValue() - 1))) { if ((signCount < (s.getNumber().intValue() - 1))) {
s.setDiscNumber(s.getNumber() - signRecordList.size()); s.setDiscNumber(s.getNumber() - signCount);
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) { } else if (recordService.countTaskNum(userId, s.getId(), DateUtil.beginOfMonth(new Date()).toString()) > 0) {
@@ -88,8 +88,8 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
s.setNumber(null); s.setNumber(null);
} }
} else { } else {
if ((signRecordList.size() < s.getNumber().intValue())) { if ((signCount < s.getNumber().intValue())) {
s.setDiscNumber(s.getNumber() - signRecordList.size()); s.setDiscNumber(s.getNumber() - signCount);
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) { } else if (recordService.countTaskNum(userId, s.getId(), DateUtil.beginOfMonth(new Date()).toString()) > 0) {
@@ -132,9 +132,9 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
//月 签到记录 //月 签到记录
QueryWrapper<UserSignRecord> signWrapper = new QueryWrapper<>(); QueryWrapper<UserSignRecord> signWrapper = new QueryWrapper<>();
signWrapper.eq("user_id", userId); signWrapper.eq("user_id", userId);
signWrapper.lt("sign_day", DateUtil.format(new Date(), "yyyy-MM") + "-00"); signWrapper.gt("sign_day", DateUtil.format(new Date(), "yyyy-MM") + "-00");
signWrapper.orderByAsc("create_time"); signWrapper.orderByAsc("create_time");
List<UserSignRecord> signRecordList = signRecordService.list(signWrapper); int signCount = signRecordService.count(signWrapper);
if (taskCenter.getType().equals(2)) { if (taskCenter.getType().equals(2)) {
Integer dayOrderNum = ordersService.countOrderNum(userId, DateUtil.today() + " 00:00:00"); Integer dayOrderNum = ordersService.countOrderNum(userId, DateUtil.today() + " 00:00:00");
@@ -159,14 +159,14 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
signRecordService.save(signRecord); signRecordService.save(signRecord);
} else { } else {
if (dayOrderNum > 2) { if (dayOrderNum > 2) {
if (signRecordList.size() < (taskCenter.getNumber().intValue() - 1)) { if (signCount < (taskCenter.getNumber().intValue() - 1)) {
return Result.error("领取失败，未达成领取条件"); return Result.error("领取失败，未达成领取条件");
} }
if (recordService.countTaskNum(userId, taskCenter.getId(), DateUtil.today() + " 00:00:00") > 0) { if (recordService.countTaskNum(userId, taskCenter.getId(), DateUtil.today() + " 00:00:00") > 0) {
return Result.error("不可重复领取"); return Result.error("不可重复领取");
} }
} else { } else {
if (signRecordList.size() < taskCenter.getNumber().intValue()) { if (signCount < taskCenter.getNumber().intValue()) {
return Result.error("领取失败，未达成领取条件"); return Result.error("领取失败，未达成领取条件");
} }
if (recordService.countTaskNum(userId, taskCenter.getId(), DateUtil.today() + " 00:00:00") > 0) { if (recordService.countTaskNum(userId, taskCenter.getId(), DateUtil.today() + " 00:00:00") > 0) {
@@ -230,9 +230,9 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
//月 签到记录 //月 签到记录
QueryWrapper<UserSignRecord> signWrapper = new QueryWrapper<>(); QueryWrapper<UserSignRecord> signWrapper = new QueryWrapper<>();
signWrapper.eq("user_id", userId); signWrapper.eq("user_id", userId);
signWrapper.lt("sign_day", DateUtil.format(new Date(), "yyyy-MM") + "-00"); signWrapper.gt("sign_day", DateUtil.format(new Date(), "yyyy-MM") + "-00");
signWrapper.orderByAsc("create_time"); signWrapper.orderByAsc("create_time");
List<UserSignRecord> signRecordList = signRecordService.list(signWrapper); int signCount = signRecordService.count(signWrapper);
//TaskCenter的number为大转盘次数 //TaskCenter的number为大转盘次数
List<TaskCenter> taskCenters = baseMapper.queryTaskDiscCenter(userId); List<TaskCenter> taskCenters = baseMapper.queryTaskDiscCenter(userId);
@@ -246,11 +246,11 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
} }
} else { } else {
if (dayOrderNum > 2) { if (dayOrderNum > 2) {
if (signRecordList.size() - taskCenter.getNumber().intValue() >= -1 && recordService.countTaskNum(userId, taskCenter.getId(), DateUtil.beginOfMonth(new Date()).toString()) < 1) { if (signCount - taskCenter.getNumber().intValue() >= -1 && recordService.countTaskNum(userId, taskCenter.getId(), DateUtil.beginOfMonth(new Date()).toString()) < 1) {
countTaskDisc = countTaskDisc + taskCenter.getDiscNumber(); countTaskDisc = countTaskDisc + taskCenter.getDiscNumber();
} }
} else { } else {
if (signRecordList.size() - taskCenter.getNumber().intValue() >= 0 && recordService.countTaskNum(userId, taskCenter.getId(), DateUtil.beginOfMonth(new Date()).toString()) < 1) { if (signCount - taskCenter.getNumber().intValue() >= 0 && recordService.countTaskNum(userId, taskCenter.getId(), DateUtil.beginOfMonth(new Date()).toString()) < 1) {
countTaskDisc = countTaskDisc + taskCenter.getDiscNumber(); countTaskDisc = countTaskDisc + taskCenter.getDiscNumber();
} }
} }