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