Merge remote-tracking branch 'origin/feature-changeFlow-221110' into feature-changeFlow-221110

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/InteriorChangeConfigServiceImpl.java

@@ -321,7 +321,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
         }
         for (String rpc : rpcMap.keySet()){
             ChangeGoodsPrincipalPO goodsRpc = map.get(Long.parseLong(rpc));
-            if (type == 1){
+            if (type == ChangePrincipalEnum.GOODS_BU.getType()){
                 goodsRpc.setFunctionaryName(rpcMap.get(rpc).get("uid").toString());
                 goodsRpc.setFunctionaryEmail(rpcMap.get(rpc).get("name").toString());
             }else {

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/email/service/IEmailService.java

 package com.netease.mail.yanxuan.change.integration.email.service;
 
-import com.netease.mail.yanxuan.change.integration.email.email.EmailFactor;
+import com.netease.mail.yanxuan.change.integration.email.enums.EmailTemplateEnum;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -9,14 +10,15 @@ import java.util.List;
  */
 public interface IEmailService {
 
+
+
     /**
      *
-     * @param toList 收件人列表
-     * @param ccList 抄送人列表
-     * @param factor 要素
+     * @param toList 接收人
+     * @param ccList 抄送人
+     * @param map  邮箱参数
+     * @param emailTemplateEnum  标题枚举
      * @param subjectParams  标题参数
      */
-    void sendEmail(Collection<String> toList, Collection<String> ccList, EmailFactor factor, List<String>subjectParams);
-
-
+    void sendEmail(Collection<String> toList, Collection<String> ccList, HashMap<String,Object> map, EmailTemplateEnum emailTemplateEnum, List<String>subjectParams);
 }

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/email/service/impl/EmailServiceImpl.java

@@ -2,6 +2,7 @@ package com.netease.mail.yanxuan.change.integration.email.service.impl;
 
 import com.netease.mail.yanxuan.change.integration.email.email.EmailFactor;
 import com.netease.mail.yanxuan.change.integration.email.enums.EmailTemplateEnum;
+import com.netease.mail.yanxuan.change.integration.email.enums.EmailTypeEnum;
 import com.netease.mail.yanxuan.change.integration.email.service.IEmailService;
 import com.netease.mail.yanxuan.change.integration.email.service.UasClientService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,6 +10,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -24,16 +26,20 @@ public class EmailServiceImpl implements IEmailService {
     @Override
     @Async("asyncEmail")
     public void sendEmail(Collection<String> toList, Collection<String> ccList,
-                          EmailFactor factor,List<String>subjectParams) {
-        if (factor != null) {
-            String content = this.content(factor);
+                            HashMap<String,Object> map, EmailTemplateEnum emailTemplateEnum, List<String>subjectParams) {
+        EmailFactor emailFactor = new EmailFactor();
+        //固定
+        emailFactor.setType(EmailTypeEnum.TEXT.getType());
+        emailFactor.setEmailTemplateEnum(emailTemplateEnum);
+        if (map != null) {
+            String content = this.content(emailFactor);
             if (!CollectionUtils.isEmpty(toList)) {
                 toList = toList.stream().filter(e -> e != null).collect(Collectors.toList());
             }
             if (!CollectionUtils.isEmpty(ccList)) {
                 ccList = ccList.stream().filter(e -> e != null).collect(Collectors.toList());
             }
-            String subject = factor.getSubject();
+            String subject = emailFactor.getSubject();
             //标题参数处理
             if (subjectParams != null){
                 subject = String.format(subject,subjectParams.toArray());