From f465b446f5cca2c2f77878cc99a79ee71e286f79 Mon Sep 17 00:00:00 2001
From: alina <1449359159@qq.com>
Date: Tue, 14 Mar 2023 14:58:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E4=B8=AD=E9=87=91=E9=A1=8D3=E4=BD=8D1?=
 =?UTF-8?q?=E6=92=87=E5=92=8C=E6=96=B0=E8=87=BA=E5=B9=A3=E9=A1=AF=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EasyBL.WEBAPP/ShowEasy/BookingMail.cs     | 13 +++---
 .../ShowEasy/BookingMaintain_UpdService.cs    | 42 +++++++++++--------
 2 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMail.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMail.cs
index e9b08c0..a61d7d2 100644
--- a/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMail.cs
+++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMail.cs
@@ -134,7 +134,7 @@ namespace EasyBL.WEBAPP.SYS
             //cost
             sb.Append("<h1 style =\"padding-bottom: 25px;font-family: 'arial','sans-serif';font-weight: 500;font-size: 14px;line-height: 18px;color: #f48800;margin: 0 0 0 0;\">");
             //sb.Append("$3,500 台幣");
-            sb.Append("$" + BookingOnlineModel.TotalPrice + " 台幣");
+            sb.Append("$" + int.Parse(BookingOnlineModel.TotalPrice.ToString()).ToString("#,###") + " " + BookingOnlineModel.CurrencyName);
             sb.Append("</h1>");
             //前往付款按鈕 (連結要記得修改!)
             //sb.Append("<a class=\"s-btn s-btn__primary\" href=\"https://www.showeasy.com\" target=\"_parent\" style=\"width: 88px;background: #f48800;border: 1px solid #ee9546;font-family: arial, sans-serif;font-size: 14px;line-height: 16px;color: #ffffff;text-align: center;text-decoration: none;padding: 12px 20px;display: block;border-radius: 16px;white-space: nowrap;\">");
@@ -281,7 +281,8 @@ namespace EasyBL.WEBAPP.SYS
             //cost
             sb.Append("<h1 style =\"padding-bottom: 10px;font-family: 'arial','sans-serif';font-weight: 500;font-size: 14px;line-height: 18px;color: #f48800;margin: 0 0 0 0;\">");
             //sb.Append("$3,500 台幣");
-            sb.Append("$" + BookingOnlineModel.TotalPrice + " 台幣");
+            sb.Append("$" + int.Parse(BookingOnlineModel.TotalPrice.ToString()).ToString("#,###") + " " + BookingOnlineModel.CurrencyName);
+
             sb.Append("</h1>");
             sb.Append("</td>");
             sb.Append("</tr>");
@@ -422,7 +423,7 @@ namespace EasyBL.WEBAPP.SYS
             //cost
             sb.Append("<h1 style =\"padding-bottom: 10px;font-family: 'arial','sans-serif';font-weight: 500;font-size: 14px;line-height: 18px;color: #f48800;margin: 0 0 0 0;\">");
             //sb.Append("$3,500 台幣");
-            sb.Append("$" + BookingOnlineModel.TotalPrice + " 台幣");
+            sb.Append("$" + int.Parse(BookingOnlineModel.TotalPrice.ToString()).ToString("#,###") + " " + BookingOnlineModel.CurrencyName);
             sb.Append("</h1>");
             sb.Append("</td>");
             sb.Append("</tr>");
@@ -581,7 +582,7 @@ namespace EasyBL.WEBAPP.SYS
             //cost
             sb.Append("<h1 style =\"padding-bottom: 15px;font-family: 'arial','sans-serif';font-weight: 500;font-size: 14px;line-height: 18px;color: #f48800;margin: 0 0 0 0;\">");
             //sb.Append("$3,500 台幣");
-            sb.Append("$" + BookingOnlineModel.TotalPrice + " 台幣");
+            sb.Append("$" + int.Parse(BookingOnlineModel.TotalPrice.ToString()).ToString("#,###")+ " "+ BookingOnlineModel.CurrencyName);
             sb.Append("</h1>");
             sb.Append("</td>");
             sb.Append("</tr>");
@@ -860,7 +861,7 @@ namespace EasyBL.WEBAPP.SYS
             //cost
             sb.Append("<h1 style =\"padding-bottom: 10px;font-family: 'arial','sans-serif';font-weight: 500;font-size: 14px;line-height: 18px;color: #f48800;margin: 0 0 0 0;\">");
             //sb.Append("$3,500 台幣");
-            sb.Append("$" + BookingOnlineModel.TotalPrice + " 台幣");
+            sb.Append("$" + int.Parse(BookingOnlineModel.TotalPrice.ToString()).ToString("#,###") + " " + BookingOnlineModel.CurrencyName);
             sb.Append("</h1>");
             sb.Append("</td>");
             sb.Append("</tr>");
@@ -994,7 +995,7 @@ namespace EasyBL.WEBAPP.SYS
             //cost
             sb.Append("<h1 style =\"padding-bottom: 15px;font-family: 'arial','sans-serif';font-weight: 500;font-size: 14px;line-height: 18px;color: #f48800;margin: 0 0 0 0;\">");
             //sb.Append("$3,500 台幣");
-            sb.Append("$" + BookingOnlineModel.TotalPrice + " 台幣");
+            sb.Append("$" + int.Parse(BookingOnlineModel.TotalPrice.ToString()).ToString("#,###") + " " + BookingOnlineModel.CurrencyName);
             sb.Append("</h1>");
             //前往付款按鈕 (連結要記得修改!)
             //sb.Append("<a class=\"s-btn s-btn__primary\" href=\"https://www.showeasy.com\" target=\"_parent\" style=\"width: 88px;background: #f48800;border: 1px solid #ee9546;font-family: arial, sans-serif;font-size: 14px;line-height: 16px;color: #ffffff;text-align: center;text-decoration: none;padding: 12px 20px;display: block;border-radius: 16px;white-space: nowrap;\">");
diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMaintain_UpdService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMaintain_UpdService.cs
index db6a31c..9e08ccd 100644
--- a/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMaintain_UpdService.cs
+++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMaintain_UpdService.cs
@@ -115,20 +115,22 @@ namespace EasyBL.WEBAPP.WSM
                         if (iRel > 0)
                         {
                             //確認 后給會員發信息講已確認
-                            var objBookingOnline = db.Queryable<SETB_SAL_BookingOnline, SETB_PDT_ONSiteBaseInfo, SETB_CMS_Member>
-                                ((t1, t2, t3) =>
+                            var objBookingOnline = db.Queryable<SETB_SAL_BookingOnline, SETB_PDT_ONSiteBaseInfo, SETB_CMS_Member, OTB_SYS_Arguments>
+                                ((t1, t2, t3,t4) =>
                                 new object[] {
                                                             JoinType.Left, t1.ServiceID == t2.ServiceID && t1.OrgID==t2.OrgID && t1.LangType==t2.LangID,
-                                                            JoinType.Left, t1.OrgID == t3.OrgID  && t1.BookingID == sBookingID && t1.Account == t3.Account
+                                                            JoinType.Left, t1.OrgID == t3.OrgID  && t1.BookingID == sBookingID && t1.Account == t3.Account,
+                                                            JoinType.Left, t1.OrgID == t4.OrgID && t1.CurrencyID == t4.ArgumentID && t4.ArgumentClassID=="Currency"
                                         }
                                 )
-                                .Where((t1, t2, t3) => t1.OrgID == i_crm.ORIGID && t1.BookingID == sBookingID)
-                                .Select((t1, t2, t3) => new View_SAL_BookingOnline
+                                .Where((t1, t2, t3, t4) => t1.OrgID == i_crm.ORIGID && t1.BookingID == sBookingID)
+                                .Select((t1, t2, t3, t4) => new View_SAL_BookingOnline
                                 {
                                     BookingID = SqlFunc.GetSelfAndAutoFill(t1.BookingID),
                                     ServiceName = t2.ServiceName,
                                     MemberName = t3.LastName+ t3.FirstName,
-                                    MemberEmail=t3.Email
+                                    MemberEmail=t3.Email,
+                                    CurrencyName = t4.ArgumentValue
                                 })
                                 .Single();
 
@@ -299,20 +301,22 @@ namespace EasyBL.WEBAPP.WSM
                         if (iRel > 0 && (sSupplierStatus=="03" || sSupplierStatus == "04"))
                         {
                             //供應商處理中
-                            var objBookingOnline = db.Queryable<SETB_SAL_BookingOnline, SETB_PDT_ONSiteBaseInfo, SETB_CMS_Member>
-                                ((t1, t2, t3) =>
+                            var objBookingOnline = db.Queryable<SETB_SAL_BookingOnline, SETB_PDT_ONSiteBaseInfo, SETB_CMS_Member, OTB_SYS_Arguments>
+                                ((t1, t2, t3,t4) =>
                                 new object[] {
                                                             JoinType.Left, t1.ServiceID == t2.ServiceID && t1.OrgID==t2.OrgID && t1.LangType==t2.LangID,
-                                                            JoinType.Left, t1.OrgID == t3.OrgID  && t1.BookingID == sBookingID && t1.Account == t3.Account
+                                                            JoinType.Left, t1.OrgID == t3.OrgID  && t1.BookingID == sBookingID && t1.Account == t3.Account,
+                                                              JoinType.Left, t1.OrgID == t4.OrgID && t1.CurrencyID == t4.ArgumentID && t4.ArgumentClassID=="Currency"
                                         }
                                 )
-                                .Where((t1, t2, t3) => t1.OrgID == i_crm.ORIGID && t1.BookingID == sBookingID)
-                                .Select((t1, t2, t3) => new View_SAL_BookingOnline
+                                .Where((t1, t2, t3,t4) => t1.OrgID == i_crm.ORIGID && t1.BookingID == sBookingID)
+                                .Select((t1, t2, t3,t4) => new View_SAL_BookingOnline
                                 {
                                     BookingID = SqlFunc.GetSelfAndAutoFill(t1.BookingID),
                                     ServiceName = t2.ServiceName,
                                     MemberName = t3.LastName + t3.FirstName,
-                                    MemberEmail = t3.Email
+                                    MemberEmail = t3.Email,
+                                    CurrencyName = t4.ArgumentValue
                                 })
                                 .Single();
 
@@ -472,20 +476,22 @@ namespace EasyBL.WEBAPP.WSM
                         //訂單狀態進行中 付款狀態已付款時
                         if (iRel > 0 && (oNewEntity.PaymentStatus == "03" && oNewEntity.BookingStatus=="02")) {
 
-                            var objBookingOnline = db.Queryable<SETB_SAL_BookingOnline, SETB_PDT_ONSiteBaseInfo, SETB_CMS_Member>
-                                   ((t1, t2, t3) =>
+                            var objBookingOnline = db.Queryable<SETB_SAL_BookingOnline, SETB_PDT_ONSiteBaseInfo, SETB_CMS_Member, OTB_SYS_Arguments>
+                                   ((t1, t2, t3,t4) =>
                                    new object[] {
                                                             JoinType.Left, t1.ServiceID == t2.ServiceID && t1.OrgID==t2.OrgID && t1.LangType==t2.LangID,
-                                                            JoinType.Left, t1.OrgID == t3.OrgID  && t1.BookingID == sBookingID && t1.Account == t3.Account
+                                                            JoinType.Left, t1.OrgID == t3.OrgID  && t1.BookingID == sBookingID && t1.Account == t3.Account,
+                                                            JoinType.Left, t1.OrgID == t4.OrgID && t1.CurrencyID == t4.ArgumentID && t4.ArgumentClassID=="Currency"
                                            }
                                    )
-                                   .Where((t1, t2, t3) => t1.OrgID == i_crm.ORIGID && t1.BookingID == sBookingID)
-                                   .Select((t1, t2, t3) => new View_SAL_BookingOnline
+                                   .Where((t1, t2, t3, t4) => t1.OrgID == i_crm.ORIGID && t1.BookingID == sBookingID)
+                                   .Select((t1, t2, t3, t4) => new View_SAL_BookingOnline
                                    {
                                        BookingID = SqlFunc.GetSelfAndAutoFill(t1.BookingID),
                                        ServiceName = t2.ServiceName,
                                        MemberName = t3.LastName + t3.FirstName,
-                                       MemberEmail = t3.Email
+                                       MemberEmail = t3.Email,
+                                       CurrencyName = t4.ArgumentValue
                                    })
                                    .Single();
                             if (objBookingOnline != null)