|
@@ -1923,8 +1923,10 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
long duration = 0L;
|
|
long duration = 0L;
|
|
|
- long tipsTime = 0L;
|
|
|
|
|
- long tipsTime2 = 0L;
|
|
|
|
|
|
|
+ // ===============倍力优 不需要提示=====================
|
|
|
|
|
+// long tipsTime = 0L;
|
|
|
|
|
+// long tipsTime2 = 0L;
|
|
|
|
|
+ // ===============倍力优 不需要提示=====================
|
|
|
int isFinish = 0;
|
|
int isFinish = 0;
|
|
|
FsUserCourseVideoLinkDetailsVO vo = new FsUserCourseVideoLinkDetailsVO();
|
|
FsUserCourseVideoLinkDetailsVO vo = new FsUserCourseVideoLinkDetailsVO();
|
|
|
vo.setCourseVideoDetails(courseVideoDetails);
|
|
vo.setCourseVideoDetails(courseVideoDetails);
|
|
@@ -1947,17 +1949,19 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
|
|
|
} else {
|
|
} else {
|
|
|
duration = Objects.isNull(watchLog) ? 0 : watchLog.getDuration();
|
|
duration = Objects.isNull(watchLog) ? 0 : watchLog.getDuration();
|
|
|
}
|
|
}
|
|
|
-//
|
|
|
|
|
- if (courseVideoDetails != null && courseVideoDetails.getDuration() != null){
|
|
|
|
|
- // 查询视频是否设置了红包,没有就不提示
|
|
|
|
|
- Integer fsUserCourseVideoRedPackage = fsUserCourseVideoRedPackageMapper.selectRedPacketByCompanyCount(param.getVideoId(), null, param.getPeriodId());
|
|
|
|
|
- if(fsUserCourseVideoRedPackage>0){
|
|
|
|
|
- tipsTime = courseVideoDetails.getDuration() / 3;
|
|
|
|
|
- tipsTime2 = (courseVideoDetails.getDuration() * 2) / 3;
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- vo.setTipsTime(tipsTime);
|
|
|
|
|
- vo.setTipsTime2(tipsTime2);
|
|
|
|
|
|
|
+ // ===============倍力优 不需要提示=====================
|
|
|
|
|
+// if (courseVideoDetails != null && courseVideoDetails.getDuration() != null){
|
|
|
|
|
+// // 查询视频是否设置了红包,没有就不提示
|
|
|
|
|
+// Integer fsUserCourseVideoRedPackage = fsUserCourseVideoRedPackageMapper.selectRedPacketByCompanyCount(param.getVideoId(), null, param.getPeriodId());
|
|
|
|
|
+// if(fsUserCourseVideoRedPackage>0){
|
|
|
|
|
+// tipsTime = courseVideoDetails.getDuration() / 3;
|
|
|
|
|
+// tipsTime2 = (courseVideoDetails.getDuration() * 2) / 3;
|
|
|
|
|
+// }
|
|
|
|
|
+// }
|
|
|
|
|
+// vo.setTipsTime(tipsTime);
|
|
|
|
|
+// vo.setTipsTime2(tipsTime2);
|
|
|
|
|
+
|
|
|
|
|
+ // ===============倍力优 不需要提示=====================
|
|
|
//判断是否完课
|
|
//判断是否完课
|
|
|
if (watchLog!=null && watchLog.getLogType() == 2) {
|
|
if (watchLog!=null && watchLog.getLogType() == 2) {
|
|
|
isFinish = 1;
|
|
isFinish = 1;
|