diff --git a/Myshipping.Application/Entity/BookingCustomerOrder.cs b/Myshipping.Application/Entity/BookingCustomerOrder.cs index fe99187a..a4d1312b 100644 --- a/Myshipping.Application/Entity/BookingCustomerOrder.cs +++ b/Myshipping.Application/Entity/BookingCustomerOrder.cs @@ -283,6 +283,11 @@ namespace Myshipping.Application.Entity /// 目的地 /// public string DESTINATION { get; set; } + + /// + /// 附加数据 + /// + public string ExtendData { get; set; } } /// diff --git a/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs b/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs index d239e473..447886d6 100644 --- a/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs +++ b/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs @@ -386,6 +386,7 @@ namespace Myshipping.Application 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; } @@ -1908,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 c90bf365..0bf18f31 100644 --- a/Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs +++ b/Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs @@ -397,6 +397,11 @@ namespace Myshipping.Application /// public string UpdatedTime { get; set; } + /// + /// 附加数据 + /// + public string ExtendData { get; set; } + /// /// 文件列表 /// @@ -553,6 +558,11 @@ namespace Myshipping.Application /// 回推接口秘钥 /// public string FeedbackSecret { get; set; } + + /// + /// 附加数据 + /// + public string ExtendData { get; set; } } @@ -889,13 +899,15 @@ namespace Myshipping.Application /// 服务项目 /// public List ServiceItemList { get; set; } - ///// - ///// 订舱账号 - ///// - //public string BOOKINGACCOUNT { get; set; } - ///// - ///// 订舱密码 - ///// - //public string BOOKINGPASSWORD { get; set; } + + /// + /// 订舱账号 + /// + public string BOOKINGACCOUNT { get; set; } + + /// + /// 订舱密码 + /// + public string BOOKINGPASSWORD { get; set; } } } diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 92e85883..a8d87a51 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -1486,7 +1486,7 @@ namespace Myshipping.Application if (input.ctnInputs != null) { - var groupList = input.ctnInputs.Where(x => x.CTNNUM > 0).GroupBy(c => c.CTNALL).Select(g => $"{g.Key}*{g.Sum(gg => gg.CTNNUM)}"); + var groupList = input.ctnInputs.GroupBy(c => c.CTNALL).Select(g => $"{g.Key}*{g.Sum(gg => gg.CTNNUM)}"); input.CNTRTOTAL = string.Join(" / ", groupList); } //条件限制 重复限制