|
@@ -297,20 +297,20 @@ public class IpadSendServer {
|
|
|
|
|
|
|
|
if (qwSopLogs.getSendType() != 12 && noSop) {
|
|
if (qwSopLogs.getSendType() != 12 && noSop) {
|
|
|
// 客户的信息
|
|
// 客户的信息
|
|
|
- QwExternalContactHParam contactHParam = new QwExternalContactHParam();
|
|
|
|
|
- contactHParam.setUserId(qwUser.getQwUserId().trim());
|
|
|
|
|
- contactHParam.setExternalUserId(qwSopLogs.getExternalUserId().trim());
|
|
|
|
|
- contactHParam.setCorpId(qwUser.getCorpId().trim());
|
|
|
|
|
|
|
+// QwExternalContactHParam contactHParam = new QwExternalContactHParam();
|
|
|
|
|
+// contactHParam.setUserId(qwUser.getQwUserId().trim());
|
|
|
|
|
+// contactHParam.setExternalUserId(qwSopLogs.getExternalUserId().trim());
|
|
|
|
|
+// contactHParam.setCorpId(qwUser.getCorpId().trim());
|
|
|
Integer courseType = setting.getCourseType();
|
|
Integer courseType = setting.getCourseType();
|
|
|
if (setting.getType() == 2 && courseType != 0) {// 课程消息,进行复杂的条件判断
|
|
if (setting.getType() == 2 && courseType != 0) {// 课程消息,进行复杂的条件判断
|
|
|
- log.debug("企微查询:{}", contactHParam);
|
|
|
|
|
- Long qwExternalContactId = qwExternalContactMapper.getQwExternalContactId(contactHParam);
|
|
|
|
|
|
|
+// log.debug("企微查询:{}", contactHParam);
|
|
|
|
|
+// Long qwExternalContactId = qwExternalContactMapper.getQwExternalContactId(contactHParam);
|
|
|
FsCourseWatchLog watchLog = watchLogService.getWatchCourseLogVideoBySop(
|
|
FsCourseWatchLog watchLog = watchLogService.getWatchCourseLogVideoBySop(
|
|
|
setting.getVideoId().longValue(),
|
|
setting.getVideoId().longValue(),
|
|
|
String.valueOf(qwUser.getId()),
|
|
String.valueOf(qwUser.getId()),
|
|
|
- qwExternalContactId
|
|
|
|
|
|
|
+ qwSopLogs.getExternalId()
|
|
|
);
|
|
);
|
|
|
- log.debug("ID:{}-看课记录参数:videoID:{}, qwUserID:{}, extID:{}", qwSopLogs.getId(), setting.getVideoId().longValue(), qwUser.getId(), qwExternalContactId);
|
|
|
|
|
|
|
+ log.debug("ID:{}-看课记录参数:videoID:{}, qwUserID:{}, extID:{}", qwSopLogs.getId(), setting.getVideoId().longValue(), qwUser.getId(), qwSopLogs.getExternalId());
|
|
|
log.debug("ID:{}-看课记录:{}", qwSopLogs.getId(), watchLog);
|
|
log.debug("ID:{}-看课记录:{}", qwSopLogs.getId(), watchLog);
|
|
|
String logId = qwSopLogs.getId();
|
|
String logId = qwSopLogs.getId();
|
|
|
if (watchLog != null) {
|
|
if (watchLog != null) {
|