邮件发送修改

IRaCIS.Core.Application/MassTransit/Recurring/OldRecurringEmailHelper.cs

@@ -18,7 +18,7 @@ public static class OldRecurringEmailHelper
     public static string EmailNamePlaceholder => StaticData.EmailSend.EmailNamePlaceholder;
 
 
-
+    //发送项目邮件的通用方法 已经处理
     public static async Task SendTrialEmailAsync(
       IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigRepository,
       IRepository<Trial> _trialRepository,

IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs

@@ -76,6 +76,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
                 CurrentStaffTrainDays = trialDoc.CurrentStaffTrainDays,
                 NewStaffTrainDays = trialDoc.NewStaffTrainDays,
                 Id = trialDoc.Id,
+                TrialId= trialDoc.TrialId,
                 IsSystemDoc = false,
                 CreateTime = trialDoc.CreateTime,
                 FullFilePath = trialDoc.Path,
@@ -110,6 +111,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
                 {
                     Console.WriteLine($"{index}发送定时过期提醒,邮箱：{userinfo.EMail}，姓名{userinfo.UserName}");
                     index++;
+                    var trialInfo =  _trialRepository.Where(x => x.Id == userinfo.TrialId).FirstOrDefault();
                     var messageToSend = new MimeMessage();
                     //发件地址
                     messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
@@ -139,7 +141,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
                     {
                         await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc);
                      
-                        await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
+                        await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);
                     }