Merge remote-tracking branch 'origin/bjcz_his_scrm' into bjcz_his_scrm

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

@@ -738,7 +738,7 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
             if (log.getUserId() == null || log.getUserId().equals(0L) || !log.getUserId().equals(param.getUserId())) {
                 log.setUserId(param.getUserId());
             }
-
+            log.setAppId(param.getAppId());
             log.setUpdateTime(new Date());
             //重粉逻辑
             //
@@ -762,6 +762,7 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
             //看课记录中userId为0绑定userId
             log.setUserId(param.getUserId());
             log.setUpdateTime(new Date());
+            log.setAppId(param.getAppId());
             courseWatchLogMapper.updateFsCourseWatchLog(log);
         }
         //重粉逻辑
@@ -847,6 +848,7 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
                             log.setUserId(param.getUserId());
                         }
                         log.setUpdateTime(new Date());
+                        log.setAppId(param.getAppId());
                         courseWatchLogMapper.updateFsCourseWatchLog(log);
                     }
                     return R.error(567, "群聊通用链接").put("qwExternalId", UnionEXt.getId());
@@ -881,6 +883,7 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
         log.setCreateTime(new Date());
         log.setLogType(3);
         log.setWatchType(2);
+        log.setAppId(param.getAppId());
         logger.info("【群聊生成看课记录】:{}", param);
         courseWatchLogMapper.insertFsCourseWatchLog(log);
     }
@@ -1006,7 +1009,7 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
             if (log.getUserId() == null || log.getUserId().equals(0L) || !log.getUserId().equals(param.getUserId())) {
                 log.setUserId(param.getUserId());
             }
-
+            log.setAppId(param.getAppId());
             log.setUpdateTime(new Date());
             courseWatchLogMapper.updateFsCourseWatchLog(log);
 
@@ -2462,6 +2465,8 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
             //添加判断：该用户是否已经存在此课程的看课记录，并且看课记录的销售id不是传入的销售id
             if (watchCourseVideo != null) {
                 FsCourseWatchLog updateLog = new FsCourseWatchLog();
+                updateLog.setLogId(watchCourseVideo.getLogId());
+                updateLog.setAppId(param.getAppId());
                 updateLog.setUpdateTime(new Date());
                 courseWatchLogMapper.updateFsCourseWatchLog(updateLog);
             } else {
@@ -2471,6 +2476,7 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
                 fsCourseWatchLog.setDuration(0L);
                 fsCourseWatchLog.setCreateTime(new Date());
                 fsCourseWatchLog.setLogType(1);
+                fsCourseWatchLog.setAppId(param.getAppId());
                 courseWatchLogMapper.insertFsCourseWatchLog(fsCourseWatchLog);
                 String redisKey = "h5wxuser:watch:heartbeat:" + param.getUserId() + ":" + param.getVideoId() + ":" + 0;
                 redisCache.setCacheObject(redisKey, LocalDateTime.now().toString());
@@ -2565,6 +2571,7 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
             updateLog.setPeriodId(param.getPeriodId());
             updateLog.setProject(courseProject);
             updateLog.setUpdateTime(new Date());
+            updateLog.setAppId(param.getAppId());
             courseWatchLogMapper.updateFsCourseWatchLog(updateLog);
         } else {
             // ========== 看课记录不存在，先进行各项限制检查，通过后才能创建看课记录 ==========
@@ -2610,6 +2617,7 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
             fsCourseWatchLog.setCreateTime(new Date());
             fsCourseWatchLog.setLogType(1);
             fsCourseWatchLog.setProject(courseProject);
+            fsCourseWatchLog.setAppId(param.getAppId());
             courseWatchLogMapper.insertFsCourseWatchLog(fsCourseWatchLog);
 
             String redisKey = "h5wxuser:watch:heartbeat:" + param.getUserId() + ":" + param.getVideoId() + ":" + param.getCompanyUserId();