修改标题

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/impl/MarketingCampaignSopDetailServiceImpl.java

@@ -90,6 +90,7 @@ public class MarketingCampaignSopDetailServiceImpl
         Map<Long,CustomerVO> customerEntityMap = customerVOList.stream().collect(Collectors.toMap(CustomerVO::getId, customerVO -> customerVO));
         for (MarketEmailsEntity marketEmailsEntity : marketEmailsEntityList) {
             String emailContentNew = emailContent;
+            String emailSubjectNew = emailSubject;
             //查询客户信息
 //            客户名称：${customerName}$
 //            区域名称：${areaName}$
@@ -103,7 +104,7 @@ public class MarketingCampaignSopDetailServiceImpl
             String companyUrl = "";
             String liaisonName = "";
             String email = "";
-            marketEmailsEntity.setSubject(emailSubject);
+//            marketEmailsEntity.setSubject(emailSubject);
             marketEmailsEntity.setStatus(-1);
             CustomerVO customerEntity = customerEntityMap.get(marketEmailsEntity.getCustomerId());
             if (customerEntity != null) {
@@ -122,7 +123,6 @@ public class MarketingCampaignSopDetailServiceImpl
                 if (!ObjectUtils.isEmpty(customerEntity.getCustomerCompany().getName())){
                     companyName = customerEntity.getCustomerCompany().getName();
                 }
-
                 if (!ObjectUtils.isEmpty(customerEntity.getCustomerCompany().getWebsite())){
                     companyUrl = customerEntity.getCustomerCompany().getWebsite();
                 }
@@ -138,7 +138,16 @@ public class MarketingCampaignSopDetailServiceImpl
                         .replace("${companyUrl}$", companyUrl)
                         .replace("${liaisonName}$", liaisonName)
                         .replace("${email}$", email);
+
+                emailSubjectNew = emailSubjectNew.replace("${customerName}$", customerName)
+                        .replace("${areaName}$", areaName)
+                        .replace("${companyName}$", companyName)
+                        .replace("${companyUrl}$", companyUrl)
+                        .replace("${liaisonName}$", liaisonName)
+                        .replace("${email}$", email);
                 marketEmailsEntity.setContent(emailContentNew);
+                marketEmailsEntity.setSubject(emailSubjectNew);
+
             }
             if (!ObjectUtils.isEmpty(marketEmailsEntity.getCustomerId()) && !ObjectUtils.isEmpty(customerEntityMap.get(marketEmailsEntity.getCustomerId()).getCustomerCompany()) && !ObjectUtils.isEmpty(customerEntityMap.get(marketEmailsEntity.getCustomerId()).getCustomerCompany().getEmail())){
                 marketEmailsEntity.setRecipient(customerEntityMap.get(marketEmailsEntity.getCustomerId()).getCustomerCompany().getEmail());