diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java index f3a0ef1e..e1729543 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java @@ -1263,7 +1263,7 @@ public class CourseServiceImpl extends ServiceImpl implements @Override public Result getRedEnvelopeTips(Long userId) { // 查询 用户 购买次数 - Integer count = ordersService.countOrderNum(userId, DateUtil.formatTime(DateUtil.beginOfDay(new Date()))); + Integer count = ordersService.countOrderNum(userId, DateUtil.formatDateTime(DateUtil.beginOfDay(new Date()))); String totalCount = commonInfoService.findOne(901).getValue(); diff --git a/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java b/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java index 971eb6d9..343c3ad0 100644 --- a/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java +++ b/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java @@ -68,8 +68,8 @@ public class TaskCenterController { @Login @GetMapping("/app/taskCenter/selectTaskCenter") @ApiOperation("App查询任务中心") - public Result selectAppTaskCenter(Integer page, Integer limit, @ApiIgnore @RequestAttribute("userId") Long userId) { - return taskCenterService.queryTaskCenter(page, limit, userId); + public Result selectAppTaskCenter(@ApiIgnore @RequestAttribute("userId") Long userId) { + return taskCenterService.queryTaskCenter(userId); } @Login diff --git a/src/main/java/com/sqx/modules/taskCenter/service/TaskCenterService.java b/src/main/java/com/sqx/modules/taskCenter/service/TaskCenterService.java index 98fcf196..9bc01f5c 100644 --- a/src/main/java/com/sqx/modules/taskCenter/service/TaskCenterService.java +++ b/src/main/java/com/sqx/modules/taskCenter/service/TaskCenterService.java @@ -8,7 +8,7 @@ import java.util.Map; public interface TaskCenterService extends IService { - Result queryTaskCenter(Integer page, Integer limit, Long userId); + Result queryTaskCenter(Long userId); Result taskReceive(Long userId, Long id); diff --git a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java index 8b3d4914..1abd6ec7 100644 --- a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java +++ b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java @@ -45,9 +45,9 @@ public class TaskCenterServiceImpl extends ServiceImpl taskPage = baseMapper.selectPage(new Page<>(page, limit), new QueryWrapper().eq("shows", 1).orderByAsc("sort","type")); + IPage taskPage = baseMapper.selectPage(new Page<>(1, 50), new QueryWrapper().eq("shows", 1).orderByAsc("sort","type")); boolean todaySign = true; //月 签到记录 QueryWrapper signWrapper = new QueryWrapper<>(); @@ -62,6 +62,7 @@ public class TaskCenterServiceImpl extends ServiceImpl 0) { s.setDiscNumber(dayOrderNum); + s.setNumber(3); s.setDisabled(false); todaySign = false; } @@ -69,11 +70,13 @@ public class TaskCenterServiceImpl extends ServiceImpl 0) { s.setDiscNumber(s.getNumber() - signRecordList.size()); + s.setNumber(null); s.setDisabled(false); } } else { if ((signRecordList.size() < s.getNumber().intValue()) || recordService.countTaskNum(userId, s.getId(), DateUtil.beginOfMonth(new Date()).toString()) > 0) { s.setDisabled(false); + s.setNumber(null); s.setDiscNumber(s.getNumber() - signRecordList.size()); } }