From 1a9f8bb0f36ce1bb2dba2436a2e145126e6f579d Mon Sep 17 00:00:00 2001 From: alina <1449359159@qq.com> Date: Mon, 27 Mar 2023 15:15:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=99=BB=E9=8C=84=E4=B8=8B=E5=96=AE?= =?UTF-8?q?=E6=99=82=E5=BE=8C=E5=BE=8C=E7=BA=8C=E7=9A=84=E9=83=B5=E4=BB=B6?= =?UTF-8?q?=E4=B8=AD=E4=B8=8D=E9=A1=AF=E7=A4=BA=E6=8C=89=E9=88=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EasyBL.WEBAPP/ShowEasy/BookingMail.cs | 2 +- .../ShowEasy/BookingMaintain_UpdService.cs | 50 +++++++++++++++---- 2 files changed, 42 insertions(+), 10 deletions(-) diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMail.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMail.cs index e52428b..cef2ae0 100644 --- a/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMail.cs +++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMail.cs @@ -2075,7 +2075,7 @@ namespace EasyBL.WEBAPP.SYS sb.Append(""); sb.Append(""); sb.Append("

"); - //sb.Append("你好，" + Name + "，"); + sb.Append("你好，" + Name + "，"); sb.Append("

"); sb.Append(""); sb.Append(""); diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMaintain_UpdService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMaintain_UpdService.cs index 40c1409..2cf27d8 100644 --- a/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMaintain_UpdService.cs +++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMaintain_UpdService.cs @@ -409,7 +409,18 @@ namespace EasyBL.WEBAPP.WSM }; toEmail.Add(oEmailTo); oEmail.Title = "訂單處理中通知"; //取fonfig - oEmail.EmailBody = new BookingMail().BookingProcessing(objBookingOnline.MemberName, objBookingOnline.BookingNo); + if (string.IsNullOrEmpty(objBookingOnline.Account)) + { + //未登錄，沒有查看訂單按鈕 + oEmail.EmailBody = new BookingMail().BookingProcessing_NoLogin(objBookingOnline.MemberName); + + } + else + { + oEmail.EmailBody = new BookingMail().BookingProcessing(objBookingOnline.MemberName, objBookingOnline.BookingNo); + } + + oEmail.IsCCSelf = false; oEmail.Attachments = null; oEmail.EmailTo = toEmail; @@ -596,14 +607,30 @@ namespace EasyBL.WEBAPP.WSM } else if (oNewEntity.PaymentStatus == "04") { //退款中 oEmail.Title = "取消訂單退款中通知"; - oEmail.EmailBody = new BookingMail().Refunding(objBookingOnline); + if (string.IsNullOrEmpty(objBookingOnline.Account)) + { + //未登錄，沒有查看訂單按鈕 + oEmail.EmailBody = new BookingMail().Refunding_NoLogin(objBookingOnline); + } + else + { + oEmail.EmailBody = new BookingMail().Refunding(objBookingOnline); + } } else if (oNewEntity.PaymentStatus == "05") { //已退款 oEmail.Title = "取消訂單已退款通知"; - oEmail.EmailBody = new BookingMail().Refunded(objBookingOnline); - } + if (string.IsNullOrEmpty(objBookingOnline.Account)) + { + //未登錄，沒有查看訂單按鈕 + oEmail.EmailBody = new BookingMail().Refunded_NoLogin(objBookingOnline); + } + else + { + oEmail.EmailBody = new BookingMail().Refunded(objBookingOnline); + } + } oEmail.IsCCSelf = false; oEmail.Attachments = null; @@ -758,7 +785,16 @@ namespace EasyBL.WEBAPP.WSM }; toEmail.Add(oEmailTo); oEmail.Title = "取消訂單通知"; //取fonfig - oEmail.EmailBody = new BookingMail().SECancelOrderNotifyToUser(objBookingOnline); + if (string.IsNullOrEmpty(objBookingOnline.Account)) + { + //未登錄，沒有查看訂單按鈕 + oEmail.EmailBody = new BookingMail().SECancelOrderNotifyToUser_NoLogin(objBookingOnline); + } + else + { + oEmail.EmailBody = new BookingMail().SECancelOrderNotifyToUser(objBookingOnline); + } + oEmail.IsCCSelf = false; oEmail.Attachments = null; oEmail.EmailTo = toEmail; @@ -795,10 +831,6 @@ namespace EasyBL.WEBAPP.WSM oEmail1.Attachments = null; oEmail1.EmailTo = toEmail1; var bSend1 = new MailService(i_crm.ORIGID, true).MailFactory(oEmail1, out sError); - - - - } }