modify: 供应商邮件发送

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

@@ -43,18 +43,18 @@ public class SupplierSendService {
         try {
             SupplierSendEmailReq req = new SupplierSendEmailReq();
             req.setSupplierId(supplier);
-            EmailFactor factor = EmailFactor.builder().data(param).emailTemplateEnum(emailTemplateEnum)
-                .type(EmailTypeEnum.HTML.getType()).build();
-            String content = this.content(factor);
-            req.setMailContent(content);
-            String subject = factor.getSubject();
+            String subject = emailTemplateEnum.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);
+            req.setMailSubject(subject);
+            EmailFactor factor = EmailFactor.builder().data(param).emailTemplateEnum(emailTemplateEnum).subject(subject)
+                .type(EmailTypeEnum.HTML.getType()).build();
+            String content = this.content(factor);
+            req.setMailContent(content);
+            log.debug("[sendSupplierEmail] supplier:{}, subjectParam:{}, subject:{}, content:{}", supplier,
+                subjectParam, subject, JSON.toJSONString(content));
             String result = flowRpcSupplierSendService.sendEmail(req);
             log.info("[sendSupplierEmail] result:{}", result);
         } catch (Exception e) {