diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index d70c4aed..4c399dd2 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -4337,11 +4337,11 @@ - + 邮箱发送 - + @@ -6199,7 +6199,7 @@ - + 邮箱发送消息 diff --git a/src/WMS.Web.Domain/IService/Public/ISendMessageService.cs b/src/WMS.Web.Domain/IService/Public/ISendMessageService.cs index a7d12c62..7da6c521 100644 --- a/src/WMS.Web.Domain/IService/Public/ISendMessageService.cs +++ b/src/WMS.Web.Domain/IService/Public/ISendMessageService.cs @@ -25,10 +25,10 @@ namespace WMS.Web.Domain.IService /// /// 邮箱发送 /// - /// + /// /// /// - Task SendEmail(List toMailList, string textBody, string coustomerName); + Task SendEmail(string mailAddress, string textBody, string coustomerName); /// /// 执行 diff --git a/src/WMS.Web.Domain/Services/Public/SendMessageService.cs b/src/WMS.Web.Domain/Services/Public/SendMessageService.cs index c55b434a..29d49c7e 100644 --- a/src/WMS.Web.Domain/Services/Public/SendMessageService.cs +++ b/src/WMS.Web.Domain/Services/Public/SendMessageService.cs @@ -114,14 +114,14 @@ namespace WMS.Web.Domain.Services /// /// /// - public async Task SendEmail(List toMailList, string textBody, string coustomerName) + public async Task SendEmail(string mailAddress, string textBody, string coustomerName) { // 创建 MimeMessage 实例 MimeMessage message = new MimeMessage(); //message.From.Add(new MailboxAddress( _emailOptions.SenderName, _emailOptions.SenderEmail)); // 设置发件人姓名和邮箱地址 message.From.Add(new MailboxAddress("深圳市元创时代", _emailOptions.SenderEmail)); // 设置发件人姓名和邮箱地址 - //message.To.Add(new MailboxAddress("Recipient Name", "244188119@qq.com")); // 设置收件人姓名和邮箱地址 - message.To.AddRange(toMailList); + message.To.Add(new MailboxAddress(coustomerName, mailAddress)); // 设置收件人姓名和邮箱地址 + //message.To.AddRange(toMailList); //message.Subject = _emailOptions.SendTitle+$"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}"; // 设置邮件主题 message.Subject = $"【深圳市元创时代】-产品入库通知{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}"; // 设置邮件主题 @@ -141,13 +141,13 @@ namespace WMS.Web.Domain.Services await client.SendAsync(message); // 发送邮件 await client.DisconnectAsync(true); // 断开连接 } - _logger.LogInformation("邮箱发送消息:成功->收件方:" + JsonConvert.SerializeObject(toMailList) + " 内容:" + textBody); + _logger.LogInformation("邮箱发送消息:成功->收件方:" + mailAddress + " 内容:" + textBody); return Result.ReSuccess(); } catch (Exception ex) { - _logger.LogInformation("邮箱发送消息:失败->收件方:" + JsonConvert.SerializeObject(toMailList) + " 内容:" + textBody); - return Result.ReFailure("邮箱发送失败:" + ex.Message, 50006); + _logger.LogInformation("邮箱发送消息:失败->收件方:" + mailAddress + " 内容:" + textBody); + return Result.ReFailure("邮箱发送:失败->收件方:"+mailAddress+",错误内容:" + ex.Message, 50006); } } @@ -200,7 +200,7 @@ namespace WMS.Web.Domain.Services data.Emails = string.Join(",", item.Emails); foreach (var ema in item.Emails) { - data.EmailList.Add(new MailboxAddress("Recipient Name", ema)); + data.EmailList.Add(new MailboxAddress(item.CustomerName, ema)); } foreach (var current_det in current_notSendDetails) @@ -257,8 +257,12 @@ namespace WMS.Web.Domain.Services i = i + 1; } - //邮箱 - await this.SendEmail(item.EmailList, content, item.CustomerName); + foreach (var email in item.EmailList) + { + //邮箱 + await this.SendEmail(email.Address, content, email.Name); + } + //短信 var sms_result = this.SendSms(item.PhoneNumbers, content); //内容过长-分段发送