push

yd-email-api/src/main/java/com/yd/email/api/async/ApiEmailSendAsyncService.java

@@ -121,7 +121,7 @@ public class ApiEmailSendAsyncService {
                         //检测内容是否有占位符，有占位符并且变量分组唯一业务ID为空就替换具体内容。替换具体内容：通用变量字段：收件人姓名、收件人称谓、公司，这三个字段内容从收件人联系人获取
                         //检测内容是否含有通用变量
                         if (StringUtil.hasTyVariables(emailTask.getContent())) {
-                            String content = apiEmailContactService.replacePlaceholders(emailTask.getContent(),recipient.getContactBizId());
+                            String content = apiEmailContactService.replacePlaceholders(emailTask.getContent(),recipient.getContactBizId(),recipient.getCcEmail());
                             apiSendMailDto.setContent(content);
                         }
                     }

yd-email-api/src/main/java/com/yd/email/api/handler/EmailSendJobHandler.java

@@ -131,7 +131,7 @@ public class EmailSendJobHandler {
                         //检测内容是否有占位符，有占位符并且变量分组唯一业务ID为空就替换具体内容。替换具体内容：通用变量字段：收件人姓名、收件人称谓、公司，这三个字段内容从收件人联系人获取
                         //检测内容是否含有通用变量
                         if (StringUtil.hasTyVariables(emailTask.getContent())) {
-                            String content = apiEmailContactService.replacePlaceholders(emailTask.getContent(),recipient.getContactBizId());
+                            String content = apiEmailContactService.replacePlaceholders(emailTask.getContent(),recipient.getContactBizId(),recipient.getCcEmail());
                             apiSendMailDto.setContent(content);
                         }
                     }

yd-email-api/src/main/java/com/yd/email/api/service/ApiEmailContactService.java

@@ -19,5 +19,5 @@ public interface ApiEmailContactService {
 
     Result del(String contactBizId);
 
-    String replacePlaceholders(String content, String contactBizId);
+    String replacePlaceholders(String content, String contactBizId,String ccEmails);
 }

yd-email-api/src/main/java/com/yd/email/api/service/impl/ApiEmailContactServiceImpl.java

@@ -190,7 +190,7 @@ public class ApiEmailContactServiceImpl implements ApiEmailContactService {
      * @return
      */
     @Override
-    public String replacePlaceholders(String content, String contactBizId) {
+    public String replacePlaceholders(String content, String contactBizId,String ccEmails) {
         if (StringUtils.isBlank(content)) return "";
 
         String result = content;
@@ -206,9 +206,13 @@ public class ApiEmailContactServiceImpl implements ApiEmailContactService {
             String companyName = Optional.ofNullable(emailContact.getCompanyName())
                     .orElse("");
 
+            String email = Optional.ofNullable(emailContact.getEmail())
+                    .filter(s -> !s.trim().isEmpty())
+                    .orElse("");
+
             result = result
-                    .replace(GeneralVariableEnum.GENERAL_EMAIL.getItemValue(), name)
-                    .replace(GeneralVariableEnum.GENERAL_CC_EMAIL.getItemValue(), name)
+                    .replace(GeneralVariableEnum.GENERAL_EMAIL.getItemValue(), email)
+                    .replace(GeneralVariableEnum.GENERAL_CC_EMAIL.getItemValue(), ccEmails)
                     .replace(GeneralVariableEnum.GENERAL_CONTACT.getItemValue(), name)
                     .replace(GeneralVariableEnum.GENERAL_APPELLATION.getItemValue(), appellation)
                     .replace(GeneralVariableEnum.GENERAL_COMPANTNAME.getItemValue(), companyName);