|
|
@@ -2648,13 +2648,17 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
|
|
|
}
|
|
|
// 项目看课数限制
|
|
|
if (CloudHostUtils.hasCloudHostName("四福堂")) {
|
|
|
- FsUserCoursePeriodDays fsUserCoursePeriodDays = fsUserCoursePeriodDaysMapper.selectFsUserCoursePeriodDaysByPeriodDays(param.getCourseId(),param.getPeriodId(),param.getVideoId());
|
|
|
+ FsUserCoursePeriodDays fsUserCoursePeriodDays = fsUserCoursePeriodDaysMapper.selectFsUserCoursePeriodDaysByPeriodDays(param.getCourseId(), param.getPeriodId(), param.getVideoId());
|
|
|
|
|
|
- String startTime = fsUserCoursePeriodDays.getStartDateTime() != null ?DateUtil.formatLocalDateTime(fsUserCoursePeriodDays.getStartDateTime(),YYYY_MM_DD_HH_MM_SS) : null;
|
|
|
- String endTime = fsUserCoursePeriodDays.getEndDateTime() != null ? DateUtil.formatLocalDateTime(fsUserCoursePeriodDays.getEndDateTime(),YYYY_MM_DD_HH_MM_SS) : null;
|
|
|
+ String startTime = null;
|
|
|
+ String endTime = null;
|
|
|
+ if (ObjectUtils.isNotEmpty(fsUserCoursePeriodDays)) {
|
|
|
+ startTime = fsUserCoursePeriodDays.getStartDateTime() != null ? DateUtil.formatLocalDateTime(fsUserCoursePeriodDays.getStartDateTime(), YYYY_MM_DD_HH_MM_SS) : null;
|
|
|
+ endTime = fsUserCoursePeriodDays.getEndDateTime() != null ? DateUtil.formatLocalDateTime(fsUserCoursePeriodDays.getEndDateTime(), YYYY_MM_DD_HH_MM_SS) : null;
|
|
|
+ }
|
|
|
|
|
|
- log.error("进入了看课限制:传入参数:={},watchCourseVideo={}",param, watchCourseVideo);
|
|
|
- Long logCount = fsUserCourseMapper.countDistinctVideoByUserAndProject(param.getUserId(), courseProject,startTime,endTime);
|
|
|
+ log.error("进入了看课限制:传入参数:={},watchCourseVideo={}", param, watchCourseVideo);
|
|
|
+ Long logCount = fsUserCourseMapper.countDistinctVideoByUserAndProject(param.getUserId(), courseProject, startTime, endTime);
|
|
|
if (Objects.isNull(watchCourseVideo) && logCount > 0) {
|
|
|
return ResponseResult.fail(ExceptionCodeEnum.EXCEED_COURSE_LIMIT.getCode(), ExceptionCodeEnum.EXCEED_COURSE_LIMIT.getDescription());
|
|
|
}
|