|
@@ -1701,7 +1701,13 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
|
|
|
if(fsUserCoursePeriodDays != null && !fsUserCoursePeriodDays.isEmpty()){
|
|
if(fsUserCoursePeriodDays != null && !fsUserCoursePeriodDays.isEmpty()){
|
|
|
periodDays = fsUserCoursePeriodDays.get(0);
|
|
periodDays = fsUserCoursePeriodDays.get(0);
|
|
|
}
|
|
}
|
|
|
- if(periodDays != null && periodDays.getLastJoinTime() !=null && LocalDateTime.now().isAfter(periodDays.getLastJoinTime())) {
|
|
|
|
|
|
|
+
|
|
|
|
|
+ // 检查是否开启自由模式
|
|
|
|
|
+ FsUserCoursePeriod period = fsUserCoursePeriodMapper.selectFsUserCoursePeriodById(param.getPeriodId());
|
|
|
|
|
+ boolean isFreeMode = (period != null && period.getFreeMode() != null && period.getFreeMode() == 1);
|
|
|
|
|
+
|
|
|
|
|
+ // 只有在非自由模式下才检查红包领取时间限制
|
|
|
|
|
+ if(!isFreeMode && periodDays != null && periodDays.getLastJoinTime() !=null && LocalDateTime.now().isAfter(periodDays.getLastJoinTime())) {
|
|
|
return R.error(403,"已超过领取红包时间");
|
|
return R.error(403,"已超过领取红包时间");
|
|
|
}
|
|
}
|
|
|
|
|
|