Merge branch 'feature-changeFlow-221110' of…

Merge branch 'feature-changeFlow-221110' of https://yxwbgit.mail.netease.com/yx-qc-change-flow/yanxuan-qc-change-system into feature-changeFlow-221110

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java

@@ -267,7 +267,7 @@ public class ChangeFlowBiz {
                 + changeRecord.getId().toString();
             qcSendEmail(changeCommander, subjectParam, EmailTemplateEnum.YX_QC_CHANGE_EXECUTE, param);
             // 如果是供应商，再次发送供应商邮件
-            if (changeFlowCreateReq.getCreateSource().equals(CreateSourceEnum.QC.getType())) {
+            if (changeFlowCreateReq.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
                 sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), subjectParam,
                     EmailTemplateEnum.YX_QC_CHANGE_EXECUTE, param);
             }
@@ -294,7 +294,7 @@ public class ChangeFlowBiz {
         String subjectParam = changeRecord.getId().toString();
         qcSendEmail(changeCommander, subjectParam, EmailTemplateEnum.YX_QC_CHANGE_RELEASE_FLOW, param);
         // 如果是供应商，再次发送供应商邮件
-        if (changeFlowCreateReq.getCreateSource().equals(CreateSourceEnum.QC.getType())) {
+        if (changeFlowCreateReq.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
             sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), subjectParam,
                 EmailTemplateEnum.YX_QC_CHANGE_RELEASE_FLOW, param);
         }
@@ -527,7 +527,7 @@ public class ChangeFlowBiz {
                 qcSendEmail(changeRecord.getChangeCommander(), subjectParam,
                     EmailTemplateEnum.YX_QC_CHANGE_EXECUTE, param);
                 // 如果是供应商，再次发送供应商邮件
-                if (changeRecord.getCreateSource().equals(CreateSourceEnum.QC.getType())) {
+                if (changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
                     sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), subjectParam,
                         EmailTemplateEnum.YX_QC_CHANGE_EXECUTE, param);
                 }
@@ -587,7 +587,7 @@ public class ChangeFlowBiz {
                         qcSendEmail(changeRecord.getChangeCommander(), finishSubjectParam,
                             EmailTemplateEnum.YX_QC_CHANGE_FINISH, finishPartMap);
                         // 如果是供应商，再次发送供应商邮件
-                        if (changeRecord.getCreateSource().equals(CreateSourceEnum.QC.getType())) {
+                        if (changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
                             sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), finishSubjectParam,
                                 EmailTemplateEnum.YX_QC_CHANGE_FINISH, finishPartMap);
                         }
@@ -616,7 +616,7 @@ public class ChangeFlowBiz {
                         qcSendEmail(changeRecord.getChangeCommander(), cancelSubjectParam,
                             EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_CANCEL, cancelMap);
                         // 如果是供应商，再次发送供应商邮件
-                        if (changeRecord.getCreateSource().equals(CreateSourceEnum.QC.getType())) {
+                        if (changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
                             sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), cancelSubjectParam,
                                     EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_CANCEL, cancelMap);
                         }
@@ -712,7 +712,7 @@ public class ChangeFlowBiz {
         String cancelSubjectParam = changeRecord.getId().toString();
         qcSendEmail(changeCommander, cancelSubjectParam, EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_CANCEL, cancelMap);
         // 如果是供应商，再次发送供应商邮件
-        if (changeRecord.getCreateSource().equals(CreateSourceEnum.QC.getType())) {
+        if (changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
             sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), cancelSubjectParam,
                 EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_CANCEL, cancelMap);
         }
@@ -1029,7 +1029,7 @@ public class ChangeFlowBiz {
         String cancelSubjectParam = changeRecord.getId().toString();
         qcSendEmail(changeCommander, cancelSubjectParam, EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_FORWARD, cancelMap);
         // 如果是供应商，再次发送供应商邮件
-        if (changeRecord.getCreateSource().equals(CreateSourceEnum.QC.getType())) {
+        if (changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
             sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), cancelSubjectParam,
                     EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_FORWARD, cancelMap);
         }

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

@@ -47,7 +47,8 @@ public class SupplierSendService {
                 .subject(req.getMailSubject()).type(EmailTypeEnum.HTML.getType()).build();
             req.setMailContent(this.content(factor));
             log.debug("[sendSupplierEmail] 发送供应商邮件内容 subjectParam:{}, req:{}", subjectParam, JSON.toJSONString(req));
-            flowRpcSupplierSendService.sendEmail(req);
+            String result = flowRpcSupplierSendService.sendEmail(req);
+            log.info("[sendSupplierEmail] result:{}", result);
         } catch (Exception e) {
             log.error("[op:sendSupplierEmail] error,supplier:{},subjectParam:{}, e:{}", supplier, subjectParam, e);
         }

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/task/AutoSubmit.java

@@ -141,7 +141,7 @@ public class AutoSubmit extends IJobHandler {
         changeFlowBiz.qcSendEmail(changeRecord.getChangeCommander(), subjectParam,
             EmailTemplateEnum.YX_QC_CHANGE_AFFIRM, map);
         // 如果是供应商，再次发送供应商邮件
-        if (changeRecord.getCreateSource().equals(CreateSourceEnum.QC.getType())) {
+        if (changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
             sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), subjectParam,
                 EmailTemplateEnum.YX_QC_CHANGE_AFFIRM, map);
         }

yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/TestController.java

@@ -116,7 +116,7 @@ public class TestController {
         changeFlowBiz.qcSendEmail(appConfig.getSendEmail(), subjectParam,
                         emailTemplateEnum, JSON.parseObject(mapToJson, Map.class));
         // 如果是供应商，再次发送供应商邮件
-        if (req.getCreateSource().equals(CreateSourceEnum.QC.getType())) {
+        if (req.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
             Assert.notNull(req.getChangeSupplier(), "同舟端负责人不可为空");
             sendSupplierEmail.sendSupplierEmail(req.getChangeSupplier(), subjectParam,
                     emailTemplateEnum, JSON.parseObject(mapToJson, Map.class));