feat：APP独立发课、看课

fs-app-task/src/main/java/com/fs/app/task/consumer/welcome/SendWelcomeTask.java

@@ -301,6 +301,8 @@ public class SendWelcomeTask {
         BeanUtils.copyProperties(link, courseMap);
         courseMap.setMode(1);//区分是app发课
         courseMap.setAppCustomerId(customerId);//客服
+        // 1代表欢迎语发送
+        courseMap.setSourceType(1);
         String courseJson = JSON.toJSONString(courseMap);
         String realLinkFull = AppUriEnum.APP_LINK_PREFIX.getUri() + courseJson;
         link.setQwUserId(customerId);

fs-service/src/main/java/com/fs/app/course/dto/AppCourseRealLinkDTO.java

@@ -44,4 +44,9 @@ public class AppCourseRealLinkDTO {
 
     private Long appCustomerId;
 
+    /**
+     * 来源类型，0-sop，1-欢迎语
+     */
+    private Integer sourceType;
+
 }

fs-service/src/main/java/com/fs/app/sop/service/impl/AppSopTaskServiceImpl.java

@@ -724,6 +724,8 @@ public class AppSopTaskServiceImpl implements IAppSopTaskService {
         BeanUtils.copyProperties(link, courseMap);
         courseMap.setMode(1);//区分是app发课
         courseMap.setAppCustomerId(sopLogs.getAppCustomerId());//客服
+        // 0代表sop发送
+        courseMap.setSourceType(0);
         String courseJson = JSON.toJSONString(courseMap);
         String realLinkFull = AppUriEnum.APP_LINK_PREFIX.getUri() + courseJson;
         link.setQwUserId(sopLogs.getAppCustomerId());

fs-service/src/main/java/com/fs/app/sop/service/impl/AppSopUserLogServiceImpl.java

@@ -413,6 +413,7 @@ public class AppSopUserLogServiceImpl extends ServiceImpl<AppSopUserLogMapper, A
         BeanUtils.copyProperties(link, courseMap);
         courseMap.setMode(1);//区分是app发课
         courseMap.setAppCustomerId(userLogsInfo.getAppCustomerId());//客服
+        courseMap.setSourceType(0);
         String courseJson = JSON.toJSONString(courseMap);
         String realLinkFull = AppUriEnum.APP_LINK_PREFIX.getUri() + courseJson;
         link.setQwUserId(userLogsInfo.getAppCustomerId());

fs-service/src/main/java/com/fs/course/param/FsUserCourseVideoFinishUParam.java

@@ -25,4 +25,8 @@ public class FsUserCourseVideoFinishUParam implements Serializable {
     private Long periodId;
     private Integer projectId;
     private String link;
+    /**
+     * 来源类型，0-sop，1-欢迎语
+     */
+    private Integer sourceType;
 }

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

@@ -958,7 +958,7 @@ public class FsUserCourseServiceImpl implements IFsUserCourseService
         String durationStr = redisCache.getCacheObject(redisKey);
 
         AppCourseWatchLog log = appCourseWatchLogMapper.selectOne(new LambdaQueryWrapper<AppCourseWatchLog>().eq(AppCourseWatchLog::getUserId, param.getUserId())
-                .eq(AppCourseWatchLog::getAppCustomerId, fsCourseLink.getQwUserId()).eq(AppCourseWatchLog::getVideoId, param.getVideoId()));
+                .eq(AppCourseWatchLog::getAppCustomerId, fsCourseLink.getQwUserId()).eq(AppCourseWatchLog::getVideoId, param.getVideoId()).eq(AppCourseWatchLog::getSourceType, param.getSourceType()));
         if (log == null) {
             return R.error("请联系客服先注册!");
         }