FIX:红德堂-看课记录查询修改

fs-service/src/main/java/com/fs/course/mapper/FsCourseWatchLogMapper.java

@@ -15,6 +15,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
+import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -569,4 +570,10 @@ public interface FsCourseWatchLogMapper extends BaseMapper<FsCourseWatchLog> {
     List<FsCourseReportVO>  selectFsCourseReportVO(FsCourseWatchLogStatisticsListParam param);
 
     List<FsUserReportVO>  selectFsUserReportVO(FsCourseWatchLogStatisticsListParam param);
+
+    /**
+     * 查询看课记录
+     */
+    @Select("select * from fs_course_watch_log where user_id = #{userId} and video_id = #{videoId} and period_id = #{periodId} and send_type = 1 order by log_id desc limit 1")
+    FsCourseWatchLog selectWatchLogByUserIdAndVideoIdAndPeriodId(@Param("userId") Long userId, @Param("videoId") Long videoId, @Param("periodId") Long periodId);
 }

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

@@ -2189,8 +2189,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         }
 
         //查询看课记录
-//        FsCourseWatchLog watchCourseVideo = courseWatchLogMapper.getWatchCourseVideoByFsUser(param.getUserId(), param.getVideoId(), param.getCompanyUserId());
-        FsCourseWatchLog watchCourseVideo = courseWatchLogMapper.getCourseWatchLogByUser(param.getUserId(), param.getVideoId());
+        FsCourseWatchLog watchCourseVideo = courseWatchLogMapper.selectWatchLogByUserIdAndVideoIdAndPeriodId(param.getUserId(), param.getVideoId(), param.getPeriodId());
 
         if (!isUserCoursePeriodValid(param)) {
             return ResponseResult.fail(504, "请观看最新的课程项目");