From d0f0a969252f6e95bc7b8aec789389ef8724be04 Mon Sep 17 00:00:00 2001 From: Janie <109517022+Janie06@users.noreply.github.com> Date: Tue, 7 Mar 2023 11:06:34 +0800 Subject: [PATCH] =?UTF-8?q?[WHAT]=20=E6=9C=83=E5=93=A1My=20Booking=20?= =?UTF-8?q?=E8=A8=82=E5=96=AE=E5=85=A7=E5=AE=B9=E9=A0=81=E9=96=8B=E7=99=BC?= =?UTF-8?q?=E5=AE=8C=E6=88=90=20[WHY]=20=E9=96=8B=E7=99=BC=20ShowEasy=20?= =?UTF-8?q?=E5=89=8D=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EasyBL.WEBAPP/ShowEasy/BookingMaintain_QryService.cs | 6 ++++-- EuroTran/EasyBL.WEBAPP/ShowEasy/BookingService.cs | 2 +- EuroTran/Entity/ShowEasyDtos/BookingDTO.cs | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMaintain_QryService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMaintain_QryService.cs index ea62b5b..a92b5c5 100644 --- a/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMaintain_QryService.cs +++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMaintain_QryService.cs @@ -819,11 +819,13 @@ namespace EasyBL.WEBAPP.SYS rsBooking.CancellationPolicy = Service.CancelPolicy; } - rsBooking.OnSiteService = rsService; + if (!string.IsNullOrEmpty(Booking.OrderQuestion)) + { + rsBooking.OtherDetail = JsonConvert.DeserializeObject>(Booking.OrderQuestion); + } rsBooking.NoticeDetail = Booking.Message; - rsBooking.OtherDetail = ""; rsBooking.InvoiceID = ""; // set Member diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingService.cs index 4766d54..e4b558f 100644 --- a/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingService.cs +++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingService.cs @@ -346,7 +346,7 @@ namespace EasyBL.WEBAPP.SYS rsBookingDTO.OnSiteService = rsOnSiteService; rsBookingDTO.NoticeDetail = entityBooking.NoticeDetail; - rsBookingDTO.OtherDetail = entityBooking.OtherDetail; + //rsBookingDTO.OtherDetail = entityBooking.OtherDetail; rsBookingDTO.InvoiceID = entityBooking.InvoiceID; MemberDTO rsMember = new MemberDTO(); diff --git a/EuroTran/Entity/ShowEasyDtos/BookingDTO.cs b/EuroTran/Entity/ShowEasyDtos/BookingDTO.cs index 1e9291f..218774d 100644 --- a/EuroTran/Entity/ShowEasyDtos/BookingDTO.cs +++ b/EuroTran/Entity/ShowEasyDtos/BookingDTO.cs @@ -17,7 +17,7 @@ namespace Entity.ShowEasyDtos public OnSiteServiceDTO OnSiteService = new OnSiteServiceDTO(); public string NoticeDetail { get; set; } - public string OtherDetail { get; set; } + public List OtherDetail = new List(); public string InvoiceID { get; set; } public string MemberID { get; set; } public string Account { get; set; }