|
|
@@ -570,40 +570,45 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
|
|
|
//文字和短链一起
|
|
|
case "1":
|
|
|
case "3":
|
|
|
- if ("1".equals(st.getIsBindUrl())) {
|
|
|
- String qwUserId = qwUser.getQwUserId();
|
|
|
- String companyId = qwUser.getCompanyId().toString();
|
|
|
- Long externalUserId = vo.getId();
|
|
|
-// addWatchLogIfNeeded(param.getSopId(), param.getVideoId(), param.getCourseId(), null, qwUserId, companyUserId, companyId, externalUserId, param.getStartTime(), createTime);
|
|
|
- FsCourseLinkCreateParam createParam = new FsCourseLinkCreateParam();
|
|
|
- createParam.setCourseId(param.getCourseId().longValue());
|
|
|
- createParam.setVideoId(param.getVideoId().longValue());
|
|
|
- createParam.setCorpId(qwSop.getCorpId());
|
|
|
- createParam.setCompanyUserId(Long.parseLong(companyUserId));
|
|
|
- createParam.setCompanyId(Long.parseLong(companyId));
|
|
|
- createParam.setChatId(groupUser.getChatId());
|
|
|
- createParam.setQwUserId(qwUser.getId());
|
|
|
- createParam.setDays(st.getExpiresDays());
|
|
|
- R createLink = courseLinkService.createRoomLinkUrl(createParam);
|
|
|
- if (createLink.get("code").equals(500)) {
|
|
|
- throw new BaseException("链接生成失败！");
|
|
|
- }
|
|
|
- String sortLink = (String) createLink.get("url");
|
|
|
-
|
|
|
- if (StringUtils.isNotEmpty(sortLink)) {
|
|
|
- if ("3".equals(st.getContentType())) {
|
|
|
- st.setLinkUrl(sortLink);
|
|
|
- } else {
|
|
|
- String currentValue = st.getValue();
|
|
|
- if (currentValue == null) {
|
|
|
- st.setValue(sortLink);
|
|
|
- } else {
|
|
|
- st.setValue(currentValue.replaceAll("#销售称呼#", StringUtil.strIsNullOrEmpty(qwUser.getWelcomeText()) ? "" : qwUser.getWelcomeText()) + "\n" + sortLink);
|
|
|
- }
|
|
|
- }
|
|
|
- } else {
|
|
|
- log.warn("生成短链失败，跳过设置 URL。");
|
|
|
- }
|
|
|
+// if ("1".equals(st.getIsBindUrl())) {
|
|
|
+// String qwUserId = qwUser.getQwUserId();
|
|
|
+// String companyId = qwUser.getCompanyId().toString();
|
|
|
+// Long externalUserId = vo.getId();
|
|
|
+//// addWatchLogIfNeeded(param.getSopId(), param.getVideoId(), param.getCourseId(), null, qwUserId, companyUserId, companyId, externalUserId, param.getStartTime(), createTime);
|
|
|
+// FsCourseLinkCreateParam createParam = new FsCourseLinkCreateParam();
|
|
|
+// createParam.setCourseId(param.getCourseId().longValue());
|
|
|
+// createParam.setVideoId(param.getVideoId().longValue());
|
|
|
+// createParam.setCorpId(qwSop.getCorpId());
|
|
|
+// createParam.setCompanyUserId(Long.parseLong(companyUserId));
|
|
|
+// createParam.setCompanyId(Long.parseLong(companyId));
|
|
|
+// createParam.setChatId(groupUser.getChatId());
|
|
|
+// createParam.setQwUserId(qwUser.getId());
|
|
|
+// createParam.setDays(st.getExpiresDays());
|
|
|
+// R createLink = courseLinkService.createRoomLinkUrl(createParam);
|
|
|
+// if (createLink.get("code").equals(500)) {
|
|
|
+// throw new BaseException("链接生成失败！");
|
|
|
+// }
|
|
|
+// String sortLink = (String) createLink.get("url");
|
|
|
+//
|
|
|
+// if (StringUtils.isNotEmpty(sortLink)) {
|
|
|
+// if ("3".equals(st.getContentType())) {
|
|
|
+// st.setLinkUrl(sortLink);
|
|
|
+// } else {
|
|
|
+// String currentValue = st.getValue();
|
|
|
+// if (currentValue == null) {
|
|
|
+// st.setValue(sortLink);
|
|
|
+// } else {
|
|
|
+// st.setValue(currentValue.replaceAll("#销售称呼#", StringUtil.strIsNullOrEmpty(qwUser.getWelcomeText()) ? "" : qwUser.getWelcomeText()) + "\n" + sortLink);
|
|
|
+// }
|
|
|
+// }
|
|
|
+// } else {
|
|
|
+// log.warn("生成短链失败，跳过设置 URL。");
|
|
|
+// }
|
|
|
+// }
|
|
|
+
|
|
|
+ if ("1".equals(st.getContentType())) {
|
|
|
+ st.setValue(st.getValue()
|
|
|
+ .replaceAll("#销售称呼#", StringUtil.strIsNullOrEmpty(qwUser.getWelcomeText()) ? "" : qwUser.getWelcomeText()));
|
|
|
}
|
|
|
break;
|
|
|
//小程序单独
|
|
|
@@ -677,39 +682,42 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
|
|
|
//文字和短链一起
|
|
|
case "1":
|
|
|
case "3":
|
|
|
- if ("1".equals(st.getIsBindUrl())) {
|
|
|
- FsCourseLinkCreateParam createParam = new FsCourseLinkCreateParam();
|
|
|
- createParam.setCourseId(param.getCourseId().longValue());
|
|
|
- createParam.setVideoId(param.getVideoId().longValue());
|
|
|
- createParam.setCorpId(groupChat.getCorpId());
|
|
|
- createParam.setCompanyUserId(qwUser.getCompanyUserId());
|
|
|
- createParam.setCompanyId(qwUser.getCompanyId());
|
|
|
- createParam.setChatId(groupChat.getChatId());
|
|
|
- createParam.setQwUserId(qwUser.getId());
|
|
|
- createParam.setDays(st.getExpiresDays());
|
|
|
- R createLink = courseLinkService.createRoomLinkUrl(createParam);
|
|
|
- if (createLink.get("code").equals(500)) {
|
|
|
- throw new BaseException("链接生成失败！");
|
|
|
- }
|
|
|
- String link = (String) createLink.get("url");
|
|
|
- if (StringUtils.isNotEmpty(link)) {
|
|
|
- if ("3".equals(st.getContentType())) {
|
|
|
- st.setLinkUrl(link);
|
|
|
- } else {
|
|
|
- String currentValue = st.getValue();
|
|
|
- if (currentValue == null) {
|
|
|
- st.setValue(link);
|
|
|
- } else {
|
|
|
- st.setValue(currentValue
|
|
|
- .replaceAll("#销售称呼#", StringUtil.strIsNullOrEmpty(qwUser.getWelcomeText()) ? "" : qwUser.getWelcomeText())
|
|
|
- + "\n" + link);
|
|
|
- }
|
|
|
- }
|
|
|
- } else {
|
|
|
- log.error("生成短链失败，跳过设置 URL。");
|
|
|
- }
|
|
|
+// if ("1".equals(st.getIsBindUrl())) {
|
|
|
+// FsCourseLinkCreateParam createParam = new FsCourseLinkCreateParam();
|
|
|
+// createParam.setCourseId(param.getCourseId().longValue());
|
|
|
+// createParam.setVideoId(param.getVideoId().longValue());
|
|
|
+// createParam.setCorpId(groupChat.getCorpId());
|
|
|
+// createParam.setCompanyUserId(qwUser.getCompanyUserId());
|
|
|
+// createParam.setCompanyId(qwUser.getCompanyId());
|
|
|
+// createParam.setChatId(groupChat.getChatId());
|
|
|
+// createParam.setQwUserId(qwUser.getId());
|
|
|
+// createParam.setDays(st.getExpiresDays());
|
|
|
+// R createLink = courseLinkService.createRoomLinkUrl(createParam);
|
|
|
+// if (createLink.get("code").equals(500)) {
|
|
|
+// throw new BaseException("链接生成失败！");
|
|
|
+// }
|
|
|
+// String link = (String) createLink.get("url");
|
|
|
+// if (StringUtils.isNotEmpty(link)) {
|
|
|
+// if ("3".equals(st.getContentType())) {
|
|
|
+// st.setLinkUrl(link);
|
|
|
+// } else {
|
|
|
+// String currentValue = st.getValue();
|
|
|
+// if (currentValue == null) {
|
|
|
+// st.setValue(link);
|
|
|
+// } else {
|
|
|
+// st.setValue(currentValue
|
|
|
+// .replaceAll("#销售称呼#", StringUtil.strIsNullOrEmpty(qwUser.getWelcomeText()) ? "" : qwUser.getWelcomeText())
|
|
|
+// + "\n" + link);
|
|
|
+// }
|
|
|
+// }
|
|
|
+// } else {
|
|
|
+// log.error("生成短链失败，跳过设置 URL。");
|
|
|
+// }
|
|
|
+// }
|
|
|
+ if ("1".equals(st.getContentType())) {
|
|
|
+ st.setValue(st.getValue()
|
|
|
+ .replaceAll("#销售称呼#", StringUtil.strIsNullOrEmpty(qwUser.getWelcomeText()) ? "" : qwUser.getWelcomeText()));
|
|
|
}
|
|
|
-
|
|
|
break;
|
|
|
//小程序单独
|
|
|
case "4":
|
|
|
@@ -833,37 +841,37 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
|
|
|
//文字和短链一起
|
|
|
case "1":
|
|
|
case "3":
|
|
|
- if ("1".equals(st.getIsBindUrl())) {
|
|
|
-
|
|
|
- addWatchLogIfNeeded(param.getSopId(), param.getVideoId(), param.getCourseId(),item.getFsUserId(), qwUserId, companyUserId, companyId, item.getExternalId(),param.getStartTime(),createTime );
|
|
|
-
|
|
|
- String sortLink = generateShortLink(st, param.getCorpId(), createTime, param.getCourseId(), param.getVideoId(),
|
|
|
- Long.valueOf(qwUserId), companyUserId, companyId, finalDomainName,item.getExternalId(),config);
|
|
|
-
|
|
|
- if (StringUtils.isNotEmpty(sortLink)) {
|
|
|
- if ("3".equals(st.getContentType())) {
|
|
|
- st.setLinkUrl(sortLink);
|
|
|
- } else {
|
|
|
- String currentValue = st.getValue();
|
|
|
- if (currentValue == null) {
|
|
|
- st.setValue(sortLink);
|
|
|
- } else {
|
|
|
- st.setValue(currentValue
|
|
|
- .replaceAll("#销售称呼#",StringUtil.strIsNullOrEmpty(qwUser.getWelcomeText())?"":qwUser.getWelcomeText())
|
|
|
- .replaceAll("#客户称呼#",StringUtil.strIsNullOrEmpty(contact.getStageStatus())|| "0".equals(contact.getStageStatus())?"同学":contact.getStageStatus())
|
|
|
- + "\n" + sortLink);
|
|
|
- }
|
|
|
- }
|
|
|
- } else {
|
|
|
- log.warn("生成短链失败，跳过设置 URL。");
|
|
|
- }
|
|
|
- }else {
|
|
|
+// if ("1".equals(st.getIsBindUrl())) {
|
|
|
+//
|
|
|
+// addWatchLogIfNeeded(param.getSopId(), param.getVideoId(), param.getCourseId(),item.getFsUserId(), qwUserId, companyUserId, companyId, item.getExternalId(),param.getStartTime(),createTime );
|
|
|
+//
|
|
|
+// String sortLink = generateShortLink(st, param.getCorpId(), createTime, param.getCourseId(), param.getVideoId(),
|
|
|
+// Long.valueOf(qwUserId), companyUserId, companyId, finalDomainName,item.getExternalId(),config);
|
|
|
+//
|
|
|
+// if (StringUtils.isNotEmpty(sortLink)) {
|
|
|
+// if ("3".equals(st.getContentType())) {
|
|
|
+// st.setLinkUrl(sortLink);
|
|
|
+// } else {
|
|
|
+// String currentValue = st.getValue();
|
|
|
+// if (currentValue == null) {
|
|
|
+// st.setValue(sortLink);
|
|
|
+// } else {
|
|
|
+// st.setValue(currentValue
|
|
|
+// .replaceAll("#销售称呼#",StringUtil.strIsNullOrEmpty(qwUser.getWelcomeText())?"":qwUser.getWelcomeText())
|
|
|
+// .replaceAll("#客户称呼#",StringUtil.strIsNullOrEmpty(contact.getStageStatus())|| "0".equals(contact.getStageStatus())?"同学":contact.getStageStatus())
|
|
|
+// + "\n" + sortLink);
|
|
|
+// }
|
|
|
+// }
|
|
|
+// } else {
|
|
|
+// log.warn("生成短链失败，跳过设置 URL。");
|
|
|
+// }
|
|
|
+// }else {
|
|
|
if ("1".equals(st.getContentType())) {
|
|
|
st.setValue(st.getValue()
|
|
|
.replaceAll("#销售称呼#",StringUtil.strIsNullOrEmpty(qwUser.getWelcomeText())?"":qwUser.getWelcomeText())
|
|
|
.replaceAll("#客户称呼#",StringUtil.strIsNullOrEmpty(contact.getStageStatus()) || "0".equals(contact.getStageStatus())?"同学":contact.getStageStatus()));
|
|
|
}
|
|
|
- }
|
|
|
+// }
|
|
|
|
|
|
break;
|
|
|
//小程序单独
|
|
|
@@ -1265,38 +1273,38 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
|
|
|
//文字和短链一起
|
|
|
case "1":
|
|
|
case "3":
|
|
|
- if ("1".equals(st.getIsBindUrl())) {
|
|
|
-
|
|
|
- addWatchLogIfNeeded(item.getSopId(), param.getVideoId(), param.getCourseId(),item.getFsUserId(), String.valueOf(qwUser.getId()), companyUserId,
|
|
|
- companyId, item.getExternalId(),param.getStartTime(),dataTime );
|
|
|
-
|
|
|
- String sortLink = generateShortLink(st, param.getCorpId(), dataTime, param.getCourseId(), param.getVideoId(),
|
|
|
- qwUser.getId(), companyUserId, companyId, domainName,item.getExternalId(),config);
|
|
|
-
|
|
|
- if (StringUtils.isNotEmpty(sortLink)) {
|
|
|
- if ("3".equals(st.getContentType())) {
|
|
|
- st.setLinkUrl(sortLink);
|
|
|
- } else {
|
|
|
- String currentValue = st.getValue();
|
|
|
- if (currentValue == null) {
|
|
|
- st.setValue(sortLink);
|
|
|
- } else {
|
|
|
- st.setValue(currentValue
|
|
|
- .replaceAll("#销售称呼#",StringUtil.strIsNullOrEmpty(qwUser.getWelcomeText())?"":qwUser.getWelcomeText())
|
|
|
- .replaceAll("#客户称呼#",StringUtil.strIsNullOrEmpty(contact.getStageStatus())|| "0".equals(contact.getStageStatus())?"同学":contact.getStageStatus())
|
|
|
- + "\n" + sortLink);
|
|
|
- }
|
|
|
- }
|
|
|
- } else {
|
|
|
- log.warn("生成短链失败，跳过设置 URL。");
|
|
|
- }
|
|
|
- }else {
|
|
|
+// if ("1".equals(st.getIsBindUrl())) {
|
|
|
+//
|
|
|
+// addWatchLogIfNeeded(item.getSopId(), param.getVideoId(), param.getCourseId(),item.getFsUserId(), String.valueOf(qwUser.getId()), companyUserId,
|
|
|
+// companyId, item.getExternalId(),param.getStartTime(),dataTime );
|
|
|
+//
|
|
|
+// String sortLink = generateShortLink(st, param.getCorpId(), dataTime, param.getCourseId(), param.getVideoId(),
|
|
|
+// qwUser.getId(), companyUserId, companyId, domainName,item.getExternalId(),config);
|
|
|
+//
|
|
|
+// if (StringUtils.isNotEmpty(sortLink)) {
|
|
|
+// if ("3".equals(st.getContentType())) {
|
|
|
+// st.setLinkUrl(sortLink);
|
|
|
+// } else {
|
|
|
+// String currentValue = st.getValue();
|
|
|
+// if (currentValue == null) {
|
|
|
+// st.setValue(sortLink);
|
|
|
+// } else {
|
|
|
+// st.setValue(currentValue
|
|
|
+// .replaceAll("#销售称呼#",StringUtil.strIsNullOrEmpty(qwUser.getWelcomeText())?"":qwUser.getWelcomeText())
|
|
|
+// .replaceAll("#客户称呼#",StringUtil.strIsNullOrEmpty(contact.getStageStatus())|| "0".equals(contact.getStageStatus())?"同学":contact.getStageStatus())
|
|
|
+// + "\n" + sortLink);
|
|
|
+// }
|
|
|
+// }
|
|
|
+// } else {
|
|
|
+// log.warn("生成短链失败，跳过设置 URL。");
|
|
|
+// }
|
|
|
+// }else {
|
|
|
if ("1".equals(st.getContentType())) {
|
|
|
st.setValue(st.getValue()
|
|
|
.replaceAll("#销售称呼#",StringUtil.strIsNullOrEmpty(qwUser.getWelcomeText())?"":qwUser.getWelcomeText())
|
|
|
.replaceAll("#客户称呼#",StringUtil.strIsNullOrEmpty(contact.getStageStatus()) || "0".equals(contact.getStageStatus())?"同学":contact.getStageStatus()));
|
|
|
}
|
|
|
- }
|
|
|
+// }
|
|
|
|
|
|
break;
|
|
|
//小程序单独
|
