diff --git a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletTaskAppServiceImpl.java b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletTaskAppServiceImpl.java index 6333c9c..05eff47 100644 --- a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletTaskAppServiceImpl.java +++ b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletTaskAppServiceImpl.java @@ -1,5 +1,6 @@ package com.playlet.web.service.app.impl; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.github.pagehelper.PageHelper; @@ -17,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.text.DecimalFormat; +import java.util.Date; import java.util.List; /** @@ -35,14 +37,14 @@ public class PlayletTaskAppServiceImpl implements PlayletTaskAppService { private final IPlayletRevenueRecordService revenueRecordService; @Override - public PageInfo getTaskPage(PlayletTask playletTask, Integer pageSize, Integer pageNum) { + public PageInfo getTaskPage(PlayletTask playletTask, Integer pageNum, Integer pageSize) { PageHelper.startPage(pageNum, pageSize); List revenueRecordList = playletTaskService.selectPlayletTaskList(playletTask); return PageInfo.of(revenueRecordList); } @Override - public PageInfo getTaskPageByUser(PlayletTask playletTask, Integer pageSize, Integer pageNum) { + public PageInfo getTaskPageByUser(PlayletTask playletTask, Integer pageNum, Integer pageSize) { PageHelper.startPage(pageNum, pageSize); List revenueRecordList = playletTaskService.selectPlayletTaskListByUser(playletTask); return PageInfo.of(revenueRecordList); @@ -61,8 +63,7 @@ public class PlayletTaskAppServiceImpl implements PlayletTaskAppService { throw new ServiceException("参与任务失败,任务还未开始或者已结束。"); } // 是否在任务时间线内 - Long timeByNow = System.currentTimeMillis(); - if (task.getStartTime() >= timeByNow && timeByNow <= task.getEndTime()) { + if (DateUtil.compare(task.getStartTime(), new Date()) >=0 && DateUtil.compare(task.getEndTime(), new Date())<=0) { // 用户数据绑定。 playletUserTaskAppService.insertPlayletUserTask(PlayletUserTask.dataSupplement(task)); return Boolean.TRUE; diff --git a/playlet-system/src/main/java/com/playlet/system/domain/PlayletTask.java b/playlet-system/src/main/java/com/playlet/system/domain/PlayletTask.java index 905ce7a..64cb092 100644 --- a/playlet-system/src/main/java/com/playlet/system/domain/PlayletTask.java +++ b/playlet-system/src/main/java/com/playlet/system/domain/PlayletTask.java @@ -9,6 +9,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import com.playlet.common.annotation.Excel; +import java.util.Date; + /** * @Date: 2024-03-21 23:44 * @Author: 但星霖 @@ -47,14 +49,14 @@ public class PlayletTask extends BaseEntity { */ @Excel(name = "任务开始时间") @ApiModelProperty(value = "任务开始时间") - private Long startTime; + private Date startTime; /** * 任务结束时间 */ @Excel(name = "任务结束时间") @ApiModelProperty(value = "任务结束时间") - private Long endTime; + private Date endTime; /** * 任务短剧平台 @@ -75,14 +77,14 @@ public class PlayletTask extends BaseEntity { */ @Excel(name = "任务投稿开始时间") @ApiModelProperty(value = "任务投稿开始时间") - private Long contributeStartTime; + private Date contributeStartTime; /** * 任务投稿结束时间 */ @Excel(name = "任务投稿结束时间") @ApiModelProperty(value = "任务投稿结束时间") - private Long contributeEndTime; + private Date contributeEndTime; /** * 任务要求 diff --git a/playlet-system/src/main/java/com/playlet/system/domain/PlayletUserTask.java b/playlet-system/src/main/java/com/playlet/system/domain/PlayletUserTask.java index b43030f..44623fa 100644 --- a/playlet-system/src/main/java/com/playlet/system/domain/PlayletUserTask.java +++ b/playlet-system/src/main/java/com/playlet/system/domain/PlayletUserTask.java @@ -54,14 +54,14 @@ public class PlayletUserTask extends BaseEntity { */ @ApiModelProperty(value = "任务开始时间") @Excel(name = "任务开始时间") - private Long taskStartTime; + private Date taskStartTime; /** * 任务结束时间 */ @ApiModelProperty(value = "任务结束时间") @Excel(name = "任务结束时间") - private Long taskEndTime; + private Date taskEndTime; public static PlayletUserTask dataSupplement(PlayletTask task){ PlayletUserTask userTask = new PlayletUserTask(); @@ -70,7 +70,7 @@ public class PlayletUserTask extends BaseEntity { userTask.setUserTaskState(1); userTask.setCreateBy(task.getUserId()); userTask.setUpdateBy(task.getUserId()); - userTask.setTaskEndTime(task.getStartTime()); + userTask.setTaskStartTime(task.getStartTime()); userTask.setTaskEndTime(task.getEndTime()); userTask.setCreateTime(new Date()); userTask.setUpdateTime(new Date());