diff --git a/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs b/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs index 49027fb9..447886d6 100644 --- a/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs +++ b/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs @@ -385,7 +385,7 @@ namespace Myshipping.Application outModel.Files = dicFile; outModel.LogList = _repStatuslog.AsQueryable().Where(x => x.BookingId == entity.Id && x.Category == StaLogCateAudit).OrderByDescending(x => x.OpTime).ToList().Adapt>(); outModel.ServiceItemList = _repServiceItem.AsQueryable().Where(x => x.BookingId == entity.Id).ToList().Adapt>(); - + return outModel; } @@ -1909,6 +1909,19 @@ namespace Myshipping.Application ins = true; } + //订舱账号、密码 + var jobj = new JObject(); + if (!string.IsNullOrEmpty(custOrder.ExtendData)) + { + jobj = JObject.Parse(custOrder.ExtendData); + } + + var jobjBookAcc=new JObject(); + jobjBookAcc["Account"] = input.BOOKINGACCOUNT; + jobjBookAcc["Password"] = input.BOOKINGPASSWORD; + jobj["BookingAccount"] = jobjBookAcc; + custOrder.ExtendData = jobjBookAcc.ToJsonString(); + var ctns = input.CtnList.Adapt>(); var servList = input.ServiceItemList.Adapt>(); diff --git a/Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs b/Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs index b85c9f37..0bf18f31 100644 --- a/Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs +++ b/Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs @@ -901,8 +901,13 @@ namespace Myshipping.Application public List ServiceItemList { get; set; } /// - /// 附加数据 + /// 订舱账号 /// - public string ExtendData { get; set; } + public string BOOKINGACCOUNT { get; set; } + + /// + /// 订舱密码 + /// + public string BOOKINGPASSWORD { get; set; } } }