|
@@ -1582,6 +1582,12 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
|
|
|
//2、如果只绑定了当前销售,需要添加看课记录(正常流程);
|
|
|
//3、以上都不是,则标识重粉,需要加入关系表,并打上重粉标签
|
|
|
FsUserCompanyUser userCompanyUser = userCompanyUserService.selectByUserIdAndProjectId(fsUser.getUserId(), param.getProjectId());
|
|
|
+
|
|
|
+ // 添加逻辑:如果存在fs_user表数据,但是又不存在fs_user_company_user表,则表示是以前企微看课的,需要手动绑定
|
|
|
+ if(Objects.isNull(userCompanyUser) && fsUser.getCompanyUserId() == null && fsUser.getIsAddQw() == 1){
|
|
|
+ userCompanyUserService.bindRelationship(fsUser.getUserId(), param.getProjectId(), param.getCompanyId(), param.getCompanyUserId(), 1);
|
|
|
+ }
|
|
|
+
|
|
|
if(Objects.isNull(userCompanyUser)) {
|
|
|
Company company = companyService.selectCompanyById(param.getCompanyId());
|
|
|
if((companyUser.getIsAllowedAllRegister() !=null && companyUser.getIsAllowedAllRegister() != 1)){
|
|
@@ -1632,9 +1638,11 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
|
|
|
return ResponseResult.fail(504, "请观看最新的课程项目");
|
|
|
}
|
|
|
// 项目看课数限制
|
|
|
- Integer logCount = fsUserCourseMapper.selectTodayCourseWatchLogCountByUserIdAndProjectId(param.getUserId(), param.getProjectId());
|
|
|
- if (Objects.isNull(watchCourseVideo) && logCount > 0) {
|
|
|
- return ResponseResult.fail(504, "超过项目看课数量限制");
|
|
|
+ if(!"福本源".equals(signProjectName) && !"宽益堂".equals(signProjectName)) {
|
|
|
+ Integer logCount = fsUserCourseMapper.selectTodayCourseWatchLogCountByUserIdAndProjectId(param.getUserId(), param.getProjectId());
|
|
|
+ if (Objects.isNull(watchCourseVideo) && logCount > 0) {
|
|
|
+ return ResponseResult.fail(504, "超过项目看课数量限制");
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
//添加判断:该用户是否已经存在此课程的看课记录,并且看课记录的销售id不是传入的销售id
|