modify: 供应商邮件发送

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/rpc/SupplierSendService.java

@@ -8,6 +8,7 @@ package com.netease.mail.yanxuan.change.biz.service.rpc;
 
 import java.util.Map;
 
+import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -42,11 +43,18 @@ public class SupplierSendService {
         try {
             SupplierSendEmailReq req = new SupplierSendEmailReq();
             req.setSupplierId(supplier);
-            req.setMailSubject(subjectParam);
             EmailFactor factor = EmailFactor.builder().data(param).emailTemplateEnum(emailTemplateEnum)
-                .subject(req.getMailSubject()).type(EmailTypeEnum.HTML.getType()).build();
-            req.setMailContent(this.content(factor));
-            log.debug("[sendSupplierEmail] 发送供应商邮件内容 subjectParam:{}, req:{}", subjectParam, JSON.toJSONString(req));
+                .type(EmailTypeEnum.HTML.getType()).build();
+            String content = this.content(factor);
+            req.setMailContent(content);
+            String subject = factor.getSubject();
+            //标题参数处理
+            if (Strings.isNotBlank(subjectParam)) {
+                subject = String.format(subject, subjectParam);
+            }
+            req.setMailSubject(subjectParam);
+            log.debug("[sendSupplierEmail] supplier:{}, subjectParam:{}, content:{}, subject:{}", supplier,
+                subjectParam, JSON.toJSONString(content), subject);
             String result = flowRpcSupplierSendService.sendEmail(req);
             log.info("[sendSupplierEmail] result:{}", result);
         } catch (Exception e) {