From d2d34b05d81d6f54aef61ff58b5554ade7c2cb4f Mon Sep 17 00:00:00 2001 From: alina <1449359159@qq.com> Date: Wed, 8 Mar 2023 14:40:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E5=96=AE=E6=99=82=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=B9=A3=E5=88=A5=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EuroTran/EasyBL.WEBAPP/ShowEasy/OnsiteService.cs | 14 ++++++++------ .../Entity/ViewModels/View_SAL_BookingOnline.cs | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/OnsiteService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/OnsiteService.cs index c38e19e..6348e38 100644 --- a/EuroTran/EasyBL.WEBAPP/ShowEasy/OnsiteService.cs +++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/OnsiteService.cs @@ -1122,19 +1122,21 @@ namespace EasyBL.WEBAPP.ShowEasy if (iRel > 0) { #region 下單后返回前臺的訂單内容 - objBookingOnline = db.Queryable - ((t1, t2, t3) => + objBookingOnline = db.Queryable + ((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.ExhibitionID == t3.ExhibitionID && t1.LangType == t3.LanguageID + JoinType.Left, t1.OrgID == t3.OrgID && t1.ExhibitionID == t3.ExhibitionID && t1.LangType == t3.LanguageID, + JoinType.Left, t1.OrgID == t4.OrgID && t1.CurrencyID == t4.ArgumentID && t4.ArgumentClassID=="Currency" } ) - .Where((t1, t2, t3) => t1.OrgID == sORIGID && t1.BookingID == strBookingID) - .Select((t1, t2, t3) => new View_SAL_BookingOnline + .Where((t1, t2, t3,t4) => t1.OrgID == sORIGID && t1.BookingID == strBookingID) + .Select((t1, t2, t3,t4) => new View_SAL_BookingOnline { BookingID = SqlFunc.GetSelfAndAutoFill(t1.BookingID), ServiceName = t2.ServiceName, - ExhibitionName = t3.ExhibitionName + ExhibitionName = t3.ExhibitionName, + CurrencyName=t4.ArgumentValue }) .Single(); diff --git a/EuroTran/Entity/ViewModels/View_SAL_BookingOnline.cs b/EuroTran/Entity/ViewModels/View_SAL_BookingOnline.cs index c84a0c7..02567dc 100644 --- a/EuroTran/Entity/ViewModels/View_SAL_BookingOnline.cs +++ b/EuroTran/Entity/ViewModels/View_SAL_BookingOnline.cs @@ -22,6 +22,6 @@ namespace Entity.ViewModels public string ExhibitionName { get; set; } - //public string MemberName { get; set; } + public string CurrencyName { get; set; } } } \ No newline at end of file