Merge remote-tracking branch 'origin/master'

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

@@ -1019,14 +1019,14 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
             courseWatchLogMapper.insertFsCourseWatchLog(fsCourseWatchLog);
         }
 
-//        // 判断是否重粉，添加关系表数据
+        // 添加会员销售关系表数据
         // 逻辑调整：如果会员已经绑定了销售，直接提示，不添加重粉数据了-2025年6月16日14点58分
-//        FsUserCompanyUser fsUserCompanyUser = getFsUserCompanyUser(param, fsUser);
-//        QueryWrapper<FsUserCompanyUser> queryWrapper = new QueryWrapper<FsUserCompanyUser>().eq("user_id", param.getUserId()).eq("company_user_id", param.getCompanyUserId());
-//        Integer i = fsUserCompanyUserMapper.selectCount(queryWrapper);
-//        if(i == 0) {
-//            fsUserCompanyUserMapper.insertFsUserCompanyUser(fsUserCompanyUser);
-//        }
+        FsUserCompanyUser fsUserCompanyUser = getFsUserCompanyUser(param, fsUser);
+        QueryWrapper<FsUserCompanyUser> queryWrapper = new QueryWrapper<FsUserCompanyUser>().eq("user_id", param.getUserId()).eq("company_user_id", param.getCompanyUserId());
+        Integer i = fsUserCompanyUserMapper.selectCount(queryWrapper);
+        if(i == 0) {
+            fsUserCompanyUserMapper.insertFsUserCompanyUser(fsUserCompanyUser);
+        }
 
 //        // 如果重粉需要打上重粉标签
 //        if(1 == fsUserCompanyUser.getIsRepeatFans()){
@@ -1097,6 +1097,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
 
         long duration = 0L;
         long tipsTime = 0L;
+        long tipsTime2 = 0L;
         int isFinish = 0;
         FsUserCourseVideoLinkDetailsVO vo = new FsUserCourseVideoLinkDetailsVO();
         vo.setCourseVideoDetails(courseVideoDetails);
@@ -1121,9 +1122,11 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         }
 //
         if (courseVideoDetails != null && courseVideoDetails.getDuration() != null){
-            tipsTime = courseVideoDetails.getDuration()/2;
+            tipsTime = courseVideoDetails.getDuration() / 3;
+            tipsTime2 = (courseVideoDetails.getDuration() * 2) / 3;
         }
         vo.setTipsTime(tipsTime);
+        vo.setTipsTime2(tipsTime2);
         //判断是否完课
         if (watchLog!=null && watchLog.getLogType() == 2) {
             isFinish = 1;

fs-service-system/src/main/java/com/fs/course/vo/newfs/FsUserCourseVideoLinkDetailsVO.java

@@ -29,6 +29,10 @@ public class FsUserCourseVideoLinkDetailsVO {
     private LocalDateTime endDateTime;
     private boolean isRang;
 
-    @ApiModelProperty(value = "视频提示时间")
+    @ApiModelProperty(value = "视频提示时间-第一阶段")
     private Long tipsTime;
+
+    @ApiModelProperty(value = "视频提示时间-第二阶段")
+    private Long tipsTime2;
+
 }

fs-service-system/src/main/java/com/fs/store/service/impl/FsUserServiceImpl.java

@@ -851,13 +851,13 @@ public class FsUserServiceImpl implements IFsUserService
             return ResponseResult.fail(405,"销售不存在");
         }
 
-        // 判断是否绑定了销售
-//        FsUserCompanyUser fsUserCompanyUser = getFsUserCompanyUser(param, fsUser);
-//        QueryWrapper<FsUserCompanyUser> queryWrapper = new QueryWrapper<FsUserCompanyUser>().eq("user_id", param.getUserId()).eq("company_user_id", param.getCompanyUserId());
-//        Integer i = fsUserCompanyUserMapper.selectCount(queryWrapper);
-//        if(i == 0) {
-//            fsUserCompanyUserMapper.insertFsUserCompanyUser(fsUserCompanyUser);
-//        }
+        // 添加关系表数据
+        FsUserCompanyUser fsUserCompanyUser = getFsUserCompanyUser(param, fsUser);
+        QueryWrapper<FsUserCompanyUser> queryWrapper = new QueryWrapper<FsUserCompanyUser>().eq("user_id", param.getUserId()).eq("company_user_id", param.getCompanyUserId());
+        Integer i = fsUserCompanyUserMapper.selectCount(queryWrapper);
+        if(i == 0) {
+            fsUserCompanyUserMapper.insertFsUserCompanyUser(fsUserCompanyUser);
+        }
 
         // 关联销售
         if(fsUser.getCompanyUserId() == null) {