fix：修复看课bug

fs-common/src/main/java/com/fs/common/enums/BizResponseEnum.java

@@ -7,8 +7,8 @@ public enum BizResponseEnum {
     SUCCESS(200, "操作成功"),
     FAIL(500, "操作失败"),
     PARAM_ERROR(400, "参数错误"),
-    DATA_NOT_EXIST(1002, "数据不存在");
-
+    DATA_NOT_EXIST(1002, "数据不存在"),
+    WAIT_APPROVAL(505, "等待审核");
     private final Integer code;
     private final String msg;
 

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

@@ -320,4 +320,7 @@ public interface FsCourseWatchLogMapper extends BaseMapper<FsCourseWatchLog> {
     Map<String, Object> selectSumByUserIdAndVideoId(@Param("userId") Long userId, @Param("videoId") Long videoId);
 
     void batchUpdateFsUserWatchLog(@Param("list") List<FsCourseWatchLog> logs);
+
+    @Select("select * from fs_course_watch_log where user_id = #{userId} and video_id = #{videoId} and send_type = 1")
+    FsCourseWatchLog getCourseWatchLogByUser(@Param("userId") Long userId, @Param("videoId") Long videoId);
 }

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

@@ -945,16 +945,13 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
 
         // 如果开启了黑名单审核，需要提示
         if(fsUser.getStatus() == 0) {
-            return ResponseResult.fail(505, "管理开启了会员审核，请等待审核");
+//            return ResponseResult.fail(505, "管理开启了会员审核，请等待审核");
+            return ResponseResult.fail(BizResponseEnum.WAIT_APPROVAL,companyUser.getQrCodeWeixin());
         }
 
         //查询看课记录
-        FsCourseWatchLog log = new FsCourseWatchLog();
-        log.setUserId(param.getUserId());
-        log.setCompanyUserId(param.getCompanyUserId());
-        log.setVideoId(param.getVideoId());
-        FsCourseWatchLog watchCourseVideo = courseWatchLogMapper.getWatchCourseVideoByFsUser(param.getUserId(), param.getVideoId(), param.getCompanyUserId());
-
+//        FsCourseWatchLog watchCourseVideo = courseWatchLogMapper.getWatchCourseVideoByFsUser(param.getUserId(), param.getVideoId(), param.getCompanyUserId());
+        FsCourseWatchLog watchCourseVideo = courseWatchLogMapper.getCourseWatchLogByUser(param.getUserId(), param.getVideoId());
         // 获取课程所属项目id
         FsUserCourse fsUserCourse = fsUserCourseMapper.selectFsUserCourseByCourseId(param.getCourseId());
         Long courseProject = null;