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("<tr>");
             sb.Append("<td bgcolor = \"#FEFEFE\" width = \"340\" style = \"display: block;padding-top: 30px;padding-left: 30px;padding-right: 30px;adding-bottom: 10px;font-family: arial, sans-serif;color: #000000;text-align: left\";>");
             sb.Append("<h1 style = \"font-family: 'arial', 'sans-serif'; font-weight: 700;  font-size: 16px; line-height: 18px; color: #000000; margin: 0 0 0 0;\">");
-            //sb.Append("你好，" + Name + "，");
+            sb.Append("你好，" + Name + "，");
             sb.Append("</h1>");
             sb.Append("</td>");
             sb.Append("</tr>");
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);
-                                
-
-                              
-
                             }
                         }