看课课程不存在报错

fs-company/src/main/java/com/fs/company/controller/store/FsStoreOrderController.java

@@ -359,15 +359,9 @@ public class FsStoreOrderController extends BaseController
                         vo.setPayDelivery(java.math.BigDecimal.ZERO);
                         vo.setCost(java.math.BigDecimal.ZERO);
                         vo.setFPrice(java.math.BigDecimal.ZERO);
-                        vo.setBarCode("");
-                        vo.setCateName("");
-                        vo.setBankTransactionId("");
                     }
                     vo.setCost(java.math.BigDecimal.ZERO);
                     vo.setFPrice(java.math.BigDecimal.ZERO);
-                    vo.setBarCode("");
-                    vo.setCateName("");
-                    vo.setBankTransactionId("");
                 }
             }
             ExcelUtil<com.fs.hisStore.vo.FsStoreOrderItemExportZMVO> util = new ExcelUtil<>(com.fs.hisStore.vo.FsStoreOrderItemExportZMVO.class);
@@ -396,15 +390,9 @@ public class FsStoreOrderController extends BaseController
                     vo.setPayPostage(java.math.BigDecimal.ZERO);
                     vo.setCost(java.math.BigDecimal.ZERO);
                     vo.setFPrice(java.math.BigDecimal.ZERO);
-                    vo.setBarCode("");
-                    vo.setCateName("");
-                    vo.setBankTransactionId("");
                 }
                 vo.setCost(java.math.BigDecimal.ZERO);
                 vo.setFPrice(java.math.BigDecimal.ZERO);
-                vo.setBarCode("");
-                vo.setCateName("");
-                vo.setBankTransactionId("");
             }
         }
         ExcelUtil<FsStoreOrderItemExportVO> util = new ExcelUtil<>(FsStoreOrderItemExportVO.class);
@@ -462,15 +450,9 @@ public class FsStoreOrderController extends BaseController
                             vo.setPayDelivery(java.math.BigDecimal.ZERO);
                             vo.setCost(java.math.BigDecimal.ZERO);
                             vo.setFPrice(java.math.BigDecimal.ZERO);
-                            vo.setBarCode("");
-                            vo.setCateName("");
-                            vo.setBankTransactionId("");
                         }
                         vo.setCost(java.math.BigDecimal.ZERO);
                         vo.setFPrice(java.math.BigDecimal.ZERO);
-                        vo.setBarCode("");
-                        vo.setCateName("");
-                        vo.setBankTransactionId("");
                     }
                 }
                 ExcelUtil<com.fs.hisStore.vo.FsStoreOrderItemExportZMVO> util = new ExcelUtil<>(com.fs.hisStore.vo.FsStoreOrderItemExportZMVO.class);
@@ -493,15 +475,9 @@ public class FsStoreOrderController extends BaseController
                     vo.setPayPostage(java.math.BigDecimal.ZERO);
                     vo.setCost(java.math.BigDecimal.ZERO);
                     vo.setFPrice(java.math.BigDecimal.ZERO);
-                    vo.setBarCode("");
-                    vo.setCateName("");
-                    vo.setBankTransactionId("");
                 }
                 vo.setCost(java.math.BigDecimal.ZERO);
                 vo.setFPrice(java.math.BigDecimal.ZERO);
-                vo.setBarCode("");
-                vo.setCateName("");
-                vo.setBankTransactionId("");
             }
         }
         ExcelUtil<FsStoreOrderItemExportVO> util = new ExcelUtil<>(FsStoreOrderItemExportVO.class);

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

@@ -196,7 +196,7 @@ public interface FsUserCourseMapper
     List<FsUserCourseListUVO> selectFsUserCourseCommentListUVO(@Param("maps") FsUserCourseListUParam param);
 
 
-    @Select("select v.video_id,v.title,v.course_id,v.video_url,v.question_bank_id," +
+    @Select("select v.video_id,v.title,v.course_id,v.video_url,v.question_bank_id,v.is_del,v.is_on_put," +
             "SEC_TO_TIME(c.duration) as total_duration,c.views,c.course_name,c.description,c.img_url,c.config_json  " +
             " from fs_user_course_video v " +
             "left join fs_user_course c on v.course_id = c.course_id " +

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

@@ -2702,6 +2702,15 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
                 return ResponseResult.fail(ExceptionCodeEnum.WATCH_LATEST_COURSE.getCode(), ExceptionCodeEnum.WATCH_LATEST_COURSE.getDescription());
             }
         }
+
+        if ("北京卓美".equals(signProjectName)) {
+            FsUserCourseVideoH5VO checkVideo = fsUserCourseMapper.selectFsUserCourseVideoH5VOByVideoId(param.getVideoId());
+            if (checkVideo == null
+                    || (checkVideo.getIsDel() != null && checkVideo.getIsDel() == 1)
+                    || (checkVideo.getIsOnPut() != null && checkVideo.getIsOnPut() == 1)) {
+                return ResponseResult.fail(ExceptionCodeEnum.VIDEO_EXPIRED.getCode(), ExceptionCodeEnum.VIDEO_EXPIRED.getDescription());
+            }
+        }
         // 项目看课数限制
         if (!EXCLUDE_PROJECTS.contains(signProjectName) && !CloudHostUtils.hasCloudHostName("弘德堂")) {
             log.error("进入了看课限制：传入参数：={}，watchCourseVideo={}",param, watchCourseVideo);

fs-service/src/main/java/com/fs/course/vo/FsUserCourseVideoH5VO.java

@@ -38,4 +38,9 @@ public class FsUserCourseVideoH5VO extends BaseEntity
     /** 课堂配置 **/
     private String configJson;
 
+    /** 是否删除 **/
+    private Integer isDel;
+    /** 是否上下架 **/
+    private Integer isOnPut;
+
 }

fs-service/src/main/java/com/fs/enums/ExceptionCodeEnum.java

@@ -27,6 +27,8 @@ public enum ExceptionCodeEnum {
     EXCEED_COURSE_LIMIT(483, "超过项目看课数量限制"),
     ALREADY_WATCHED_OTHER_SALES_COURSE(484, "已看过其他销售分享的此课程，不能重复观看"),
 
+    VIDEO_EXPIRED(485, "该视频源已失效，请联系群主重新发课"),
+
     // ============ 参数相关错误 (500-519) ============
     PARAM_ERROR(501, "参数错误！"),
     GROUP_PARAM_ERROR(502, "群参数异常"),