项目邮件改为项目的发件信息

2025-12-05 14:54:22 +08:00
parent 53913d3777
commit 97d9aefbeb
9 changed files with 111 additions and 58 deletions
@@ -163,8 +163,8 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
                        };

                         await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
-                        SendEmailHelper.ChangeEmailSenderName(messageToSend, trialInfo.EmailFromName);
-                        await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
+
+                        await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);

                        //处理标记已通知的任务

@@ -14,6 +14,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Linq.Dynamic.Core;
 using System.Reactive.Joins;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -199,6 +200,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
                {
                    IsSystemDoc = true,
                    Id = trialDoc.Id,
+                    TrialId= trialDoc.TrialId,
                    CreateTime = trialDoc.CreateTime,
                    IsDeleted = trialDoc.IsDeleted,
                    SignViewMinimumMinutes = trialDoc.SignViewMinimumMinutes,
@@ -231,7 +233,8 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
                {
                    IsSystemDoc = false,
                    Id = trialDoc.Id,
-                    EmailFromName=trial.EmailFromName,
+                    TrialId = trialDoc.TrialId,
+                    EmailFromName =trial.EmailFromName,
                    CreateTime = trialDoc.CreateTime,
                    IsDeleted = trialDoc.IsDeleted,
                    SignViewMinimumMinutes = trialDoc.SignViewMinimumMinutes,
@@ -290,8 +293,10 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring

                        var trial = datalist.Where(x => x.ConfirmUserId == userinfo.Id).FirstOrDefault();

-                        SendEmailHelper.ChangeEmailSenderName(messageToSend, trial.EmailFromName);
-                        await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
+                        var trialInfo = await _trialRepository.Where(x=>x.Id==trial.TrialId).FirstNotNullAsync();
+
+ 
+                        await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);
                        msg += "发送成功";
                    }