Bläddra i källkod

feat:优化看课判断

caoliqin 3 veckor sedan
förälder
incheckning
05f0e00bb6

+ 2 - 2
fs-service-system/src/main/java/com/fs/course/param/newfs/FsUserCourseVideoLinkParam.java

@@ -28,7 +28,7 @@ public class FsUserCourseVideoLinkParam implements Serializable {
     @ApiModelProperty(value = "营期课程ID")
     private Long id;
 
-    @ApiModelProperty(value = "营期id")
-    private Long periodId;
+//    @ApiModelProperty(value = "营期id")
+//    private Long periodId;
 
 }

+ 10 - 10
fs-service-system/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -997,15 +997,14 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
 
     @Override
     public ResponseResult<FsUserCourseVideoLinkDetailsVO> getLinkCourseVideoDetails(FsUserCourseVideoLinkParam param) {
-        //判断营期的课程状态是否是进行中
-        FsUserCoursePeriodDays periodDays = new FsUserCoursePeriodDays();
-        periodDays.setVideoId(param.getVideoId());
-        periodDays.setPeriodId(param.getPeriodId());
-        //正常情况是只能查询到一条,之前可能存在重复的脏数据,暂使用查询list的方式
-        List<FsUserCoursePeriodDays> fsUserCoursePeriodDays = fsUserCoursePeriodDaysMapper.selectFsUserCoursePeriodDaysList(periodDays);
-        if(fsUserCoursePeriodDays != null && !fsUserCoursePeriodDays.isEmpty()){
-            periodDays = fsUserCoursePeriodDays.get(0);
-        }
+//        FsUserCoursePeriodDays periodDays = new FsUserCoursePeriodDays();
+//        periodDays.setVideoId(param.getVideoId());
+//        periodDays.setPeriodId(param.getPeriodId());
+//        //正常情况是只能查询到一条,之前可能存在重复的脏数据,暂使用查询list的方式
+//        List<FsUserCoursePeriodDays> fsUserCoursePeriodDays = fsUserCoursePeriodDaysMapper.selectFsUserCoursePeriodDaysList(periodDays);
+//        if(fsUserCoursePeriodDays != null && !fsUserCoursePeriodDays.isEmpty()){
+//            periodDays = fsUserCoursePeriodDays.get(0);
+//        }
 //        if(periodDays.getStatus() != 1){
 //            return ResponseResult.fail(403, "当前课程未开始或已结束,暂不能看课");
 //        }
@@ -1058,11 +1057,12 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         }
         vo.setIsFinish(isFinish);
         vo.setPlayDuration(duration);
+        //判断营期的课程状态是否是进行中
         if(param.getId() != null){
             FsUserCoursePeriodDays days = fsUserCoursePeriodDaysMapper.selectById(param.getId());
             vo.setStartDateTime(days.getStartDateTime());
             vo.setEndDateTime(days.getEndDateTime());
-            vo.setRang(DateUtil.isWithinRangeSafe(LocalDateTime.now(), days.getStartDateTime(), days.getEndDateTime()) && periodDays.getStatus() == 1);
+            vo.setRang(DateUtil.isWithinRangeSafe(LocalDateTime.now(), days.getStartDateTime(), days.getEndDateTime()) && days.getStatus() == 1);
         }
         return ResponseResult.ok(vo);
     }