IRaCIS.Core.Application/MassTransit/Consumer/CommonEmailHelper.cs

@@ -23,8 +23,7 @@ public static class CommonEmailHelper
 
         if (configInfo == null)
         {
-            //"系统未找到当前场景邮件配置信息，请联系运维人员核查"
-            throw new BusinessValidationFailedException(I18n.T("CommonEmail_NotFoundConfig"));
+            throw new BusinessValidationFailedException("系统未找到当前场景邮件配置信息，请联系运维人员核查");
         }
 
 
@@ -37,9 +36,8 @@ public static class CommonEmailHelper
         }
         catch (Exception ex)
         {
-            //"邮件模板内容有误，填充内容出现问题，请联系运维人员核查"
 
-            throw new BusinessValidationFailedException(I18n.T("CommonEmail_ConfigError"));
+            throw new BusinessValidationFailedException("邮件模板内容有误，填充内容出现问题，请联系运维人员核查");
         }
 
 
@@ -54,49 +52,6 @@ public static class CommonEmailHelper
         return configInfo;
     }
 
-    public static async Task<TrialEmailNoticeConfig> GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigrepository, EmailBusinessScenario scenario, MimeMessage messageToSend,
-   Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailFunc)
-    {
-        var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
-
-        var configInfo = await _trialEmailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefaultAsync();
-
-        if (configInfo == null)
-        {
-            //"系统未找到当前场景邮件配置信息，请联系运维人员核查"
-            throw new BusinessValidationFailedException(I18n.T("CommonEmail_NotFoundConfig"));
-        }
-
-
-        var (topicStr, htmlBodyStr) = isEn_US ? (configInfo.EmailTopic, configInfo.EmailHtmlContent) : (configInfo.EmailTopicCN, configInfo.EmailHtmlContentCN);
-
-        try
-        {
-            //每个场景修改主题 和body的逻辑不一样
-            (topicStr, htmlBodyStr) = emailFunc((topicStr, htmlBodyStr));
-        }
-        catch (Exception ex)
-        {
-            //"邮件模板内容有误，填充内容出现问题，请联系运维人员核查"
-
-            throw new BusinessValidationFailedException(I18n.T("CommonEmail_ConfigError"));
-        }
-
-
-        messageToSend.Subject = topicStr;
-
-        var builder = new BodyBuilder();
-
-        builder.HtmlBody = htmlBodyStr;
-
-        messageToSend.Body = builder.ToMessageBody();
-
-        return configInfo;
-    }
-
-
-
-
     public static string ReplaceCompanyName(SystemEmailSendConfig _systemEmailConfig, string needDealtxt)
     {
         var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
@@ -119,8 +74,7 @@ public static class CommonEmailHelper
         var enumValueList = inDto.DictionaryList.Select(x => x.EnumValue).ToList();
 
 
-        var dicList = await inDto.DictionaryRepository.Where(x => dictionaryCodelist.Contains(x.Parent.Code) && enumValueList.Contains(x.Code)).Select(x => new DictionaryData()
-        {
+        var dicList =await inDto.DictionaryRepository.Where(x => dictionaryCodelist.Contains(x.Parent.Code) && enumValueList.Contains(x.Code)).Select(x=>new DictionaryData() { 
         
         DictionaryCode=x.Parent.Code,
         EnumValue=x.Code,

IRaCIS.Core.Application/MassTransit/Consumer/SiteSurverEmailConsumer.cs

@@ -32,7 +32,7 @@ public class UserSiteSurveySubmitedEventConsumer(
       IRepository<TrialSite> _trialSiteRepository,
        IRepository<TrialUserRole> _trialUserRoleRepository,
       IRepository<TrialSiteSurvey> _trialSiteSurveyRepository,
-      IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigrepository,
+      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
       IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig
     ) : IConsumer<UserSiteSurveySubmitedEvent>
 {
@@ -47,13 +47,6 @@ public class UserSiteSurveySubmitedEventConsumer(
 
         var trialId = siteSurveyInfo.TrialId;
 
-        var scenario = _trialSiteSurveyRepository.Where(t => t.Id != trialSiteSurveyId && t.TrialId == siteSurveyInfo.TrialId && t.TrialSiteId == siteSurveyInfo.TrialSiteId).IgnoreQueryFilters().Any() ?
-        EmailBusinessScenario.Approval_UpdateSiteSurvey : EmailBusinessScenario.Approval_SubmitSiteSurvey;
-
-
-        if (_trialEmailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).Any())
-        {
-
         var trialUserList = await _trialUserRoleRepository.Where(t => t.TrialId == siteSurveyInfo.TrialId)
             .Where(t => t.UserRole.UserTypeEnum == UserTypeEnum.SPM || t.UserRole.UserTypeEnum == UserTypeEnum.CPM || t.UserRole.UserTypeEnum == UserTypeEnum.ProjectManager || t.UserRole.UserTypeEnum == UserTypeEnum.APM)
             .Select(t => new { t.UserRole.FullName, t.UserRole.IdentityUser.EMail, t.UserRole.UserTypeEnum }).ToListAsync();
@@ -117,11 +110,12 @@ public class UserSiteSurveySubmitedEventConsumer(
             return (topicStr, htmlBodyStr);
         };
 
+        var scenario = _trialSiteSurveyRepository.Where(t => t.Id != trialSiteSurveyId && t.TrialId == siteSurveyInfo.TrialId && t.TrialSiteId == siteSurveyInfo.TrialSiteId).IgnoreQueryFilters().Any() ?
+          EmailBusinessScenario.Approval_UpdateSiteSurvey : EmailBusinessScenario.Approval_SubmitSiteSurvey;
 
-            await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(_trialEmailNoticeConfigrepository, scenario, messageToSend, emailConfigFunc);
+        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, scenario, messageToSend, emailConfigFunc);
 
         await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
-        }
 
     }
 }
@@ -149,9 +143,6 @@ public class SiteSurveySPMSubmitedEventConsumer(
 
         var trialId = siteSurveyInfo.TrialId;
 
-
-
-
         var messageToSend = new MimeMessage();
 
         var trialUserList = _trialUserRoleRepository.Where(t => t.TrialId == trialId)