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

Merge branch 'test' into dev

This commit is contained in:
wangw 2024-12-11 10:06:09 +08:00
parent 35cc3a6c4d 6bc31b3484
commit d30ed4aba6
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java
View File

@ -1263,7 +1263,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, Course> 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();

4
src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java
View File

@ -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

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

@ -8,7 +8,7 @@ import java.util.Map;
public interface TaskCenterService extends IService<TaskCenter> {
Result queryTaskCenter(Integer page, Integer limit, Long userId);
Result queryTaskCenter(Long userId);
Result taskReceive(Long userId, Long id);

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

@ -45,9 +45,9 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
private UserMoneyDetailsService userMoneyDetailsService;
@Override
public Result queryTaskCenter(Integer page, Integer limit, Long userId) {
public Result queryTaskCenter(Long userId) {
//任务
IPage<TaskCenter> taskPage = baseMapper.selectPage(new Page<>(page, limit), 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;
//月 签到记录
QueryWrapper<UserSignRecord> signWrapper = new QueryWrapper<>();
@ -62,6 +62,7 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
Integer dayOrderNum = ordersService.countOrderNum(userId, DateUtil.today() + " 00:00:00");
if (dayOrderNum < 3 || recordService.countTaskNum(userId, s.getId(), DateUtil.today() + " 00:00:00") > 0) {
s.setDiscNumber(dayOrderNum);
s.setNumber(3);
s.setDisabled(false);
todaySign = false;
}
@ -69,11 +70,13 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
if (todaySign) {
if ((signRecordList.size() < (s.getNumber().intValue() - 1)) || recordService.countTaskNum(userId, s.getId(), DateUtil.beginOfMonth(new Date()).toString()) > 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());
}
}