|
@@ -650,7 +650,8 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
|
|
|
if (param.getLinkType()!=null&¶m.getLinkType()==5) {
|
|
if (param.getLinkType()!=null&¶m.getLinkType()==5) {
|
|
|
log = courseWatchLogMapper.selectFsCourseWatchLogByCourseSopIdAndVideoId(param.getUserId(), param.getVideoId(), param.getQwUserId());
|
|
log = courseWatchLogMapper.selectFsCourseWatchLogByCourseSopIdAndVideoId(param.getUserId(), param.getVideoId(), param.getQwUserId());
|
|
|
if (log == null) {
|
|
if (log == null) {
|
|
|
- return addCustomerService(param.getQwUserId(), msg);
|
|
|
|
|
|
|
+ //return addCustomerService(param.getQwUserId(), msg);
|
|
|
|
|
+ return R.error(msg);
|
|
|
}else {
|
|
}else {
|
|
|
qwExternalId=log.getQwExternalContactId();
|
|
qwExternalId=log.getQwExternalContactId();
|
|
|
}
|
|
}
|
|
@@ -658,7 +659,8 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
|
|
|
}else {
|
|
}else {
|
|
|
log = courseWatchLogMapper.getWatchCourseVideoByExt(qwExternalId, param.getVideoId(),param.getQwUserId());
|
|
log = courseWatchLogMapper.getWatchCourseVideoByExt(qwExternalId, param.getVideoId(),param.getQwUserId());
|
|
|
if (log==null ){
|
|
if (log==null ){
|
|
|
- return addCustomerService(param.getQwUserId(),msg);
|
|
|
|
|
|
|
+ //return addCustomerService(param.getQwUserId(),msg);
|
|
|
|
|
+ return R.error(msg);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -676,18 +678,21 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
|
|
|
|
|
|
|
|
//如果查不出来客户信息,加好友
|
|
//如果查不出来客户信息,加好友
|
|
|
if(externalContact==null){
|
|
if(externalContact==null){
|
|
|
- return addCustomerService(param.getQwUserId(),msg);
|
|
|
|
|
|
|
+ //return addCustomerService(param.getQwUserId(),msg);
|
|
|
|
|
+ return R.error(msg);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//判断外部联系人有没有绑定userId
|
|
//判断外部联系人有没有绑定userId
|
|
|
if (externalContact.getFsUserId()!=null){
|
|
if (externalContact.getFsUserId()!=null){
|
|
|
//有客户有小程序id 但 登录的小程序id和根据外部联系人id查出来的小程序id不一致
|
|
//有客户有小程序id 但 登录的小程序id和根据外部联系人id查出来的小程序id不一致
|
|
|
if (!externalContact.getFsUserId().equals(param.getUserId())) {
|
|
if (!externalContact.getFsUserId().equals(param.getUserId())) {
|
|
|
- return addCustomerService(param.getQwUserId(),msg);
|
|
|
|
|
|
|
+ //return addCustomerService(param.getQwUserId(),msg);
|
|
|
|
|
+ return R.error(msg);
|
|
|
}
|
|
}
|
|
|
//匹配客户公司id
|
|
//匹配客户公司id
|
|
|
if (qwExternalContacts.stream().noneMatch(contact -> contact.getCorpId().equals(param.getCorpId()))){
|
|
if (qwExternalContacts.stream().noneMatch(contact -> contact.getCorpId().equals(param.getCorpId()))){
|
|
|
- return addCustomerService(param.getQwUserId(),msg);
|
|
|
|
|
|
|
+ //return addCustomerService(param.getQwUserId(),msg);
|
|
|
|
|
+ return R.error(msg);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//看课记录中userId为0绑定userId
|
|
//看课记录中userId为0绑定userId
|