消息内容增加销售称呼和客户称呼转换

fs-service/src/main/java/com/fs/qw/service/impl/QwExternalContactServiceImpl.java

@@ -2332,7 +2332,7 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
                 }
             }
         }
-
+        ExternalContact externalContact = externalContactResult.getExternal_contact();
         if (isSend && welcomeCode != null && welcomeCode != "") {
             if (qwUser != null) {
                 // 查询成员的欢迎语以及欢迎图片
@@ -2371,7 +2371,14 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
                         // 如果没有找到匹配项
                         if (!match) {
                             TextMessage textMessage = new TextMessage();
-                            textMessage.setContent(qwFriendWelcomeVO.getWelcomeText());
+                            try {
+                                textMessage.setContent(qwFriendWelcomeVO.getWelcomeText()
+                                        .replaceAll("#销售称呼#",StringUtil.strIsNullOrEmpty(qwFriendWelcomeVO.getWelcomeText()) ? "" : qwFriendWelcomeVO.getWelcomeText())
+                                        .replaceAll("#客户称呼#",StringUtil.strIsNullOrEmpty(externalContact.getName()) ? "" : externalContact.getName()));
+                            }catch (Exception e){
+                                log.error("替换失败！", e);
+                                textMessage.setContent(qwFriendWelcomeVO.getWelcomeText().replaceAll("#销售称呼#", "").replaceAll("#客户称呼#", ""));
+                            }
                             sendWelcomeMsgParam.setText(textMessage);
                             msgParamList.add(qwFriendWelcomeVO.getWelcomeText());
                             List<SendWelcomeMsgParam.Attachment> attachmentsAll = JSON.parseArray(qwFriendWelcomeVO.getAttachments(), SendWelcomeMsgParam.Attachment.class);
@@ -2387,7 +2394,14 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
                     } else {
                         // 不分时段
                         TextMessage textMessage = new TextMessage();
-                        textMessage.setContent(qwFriendWelcomeVO.getWelcomeText());
+                        try {
+                            textMessage.setContent(qwFriendWelcomeVO.getWelcomeText()
+                                    .replaceAll("#销售称呼#",StringUtil.strIsNullOrEmpty(qwFriendWelcomeVO.getWelcomeText()) ? "" : qwFriendWelcomeVO.getWelcomeText())
+                                    .replaceAll("#客户称呼#",StringUtil.strIsNullOrEmpty(externalContact.getName()) ? "" : externalContact.getName()));
+                        }catch (Exception e){
+                            log.error("替换失败！", e);
+                            textMessage.setContent(qwFriendWelcomeVO.getWelcomeText().replaceAll("#销售称呼#", "").replaceAll("#客户称呼#", ""));
+                        }
                         sendWelcomeMsgParam.setText(textMessage);
                         msgParamList.add(qwFriendWelcomeVO.getWelcomeText());
                         // 设置所有附件
@@ -2429,7 +2443,6 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
             }
         }
 
-        ExternalContact externalContact = externalContactResult.getExternal_contact();
         List<FollowUser> followUsers = externalContactResult.getFollow_user();
         logger.info("外部联系人的情况里面0:"+userID+":"+externalUserID+":"+followUsers+":"+externalContactResult.getErrmsg());
         if (state != null && state != "") {