From 578e007985865ce97f39233c56d7c9c0a10a1f3f Mon Sep 17 00:00:00 2001 From: wanghaomei <86whm@163.com> Date: Tue, 26 Mar 2024 09:43:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=AE=B1=E9=87=8F0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/BookingOrder/BookingOrderService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index bd9f1bca..e1dabb3d 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); } //条件限制 重复限制 From bc12a3edea85727ea7713b2bf977a7b4fe432b0f Mon Sep 17 00:00:00 2001 From: wanghaomei <86whm@163.com> Date: Tue, 26 Mar 2024 13:56:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=AE=A2=E8=88=B1?= =?UTF-8?q?=E8=B4=A6=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entity/BookingCustomerOrder.cs | 5 ++++ .../BookingCustomerOrderService.cs | 1 + .../Service/BookingCustomerOrder/Dto/Dtos.cs | 23 ++++++++++++------- 3 files changed, 21 insertions(+), 8 deletions(-) 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..49027fb9 100644 --- a/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs +++ b/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs @@ -385,6 +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; } diff --git a/Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs b/Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs index c90bf365..b85c9f37 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,10 @@ namespace Myshipping.Application /// 服务项目 /// public List ServiceItemList { get; set; } - ///// - ///// 订舱账号 - ///// - //public string BOOKINGACCOUNT { get; set; } - ///// - ///// 订舱密码 - ///// - //public string BOOKINGPASSWORD { get; set; } + + /// + /// 附加数据 + /// + public string ExtendData { get; set; } } } From e2ea429cb4e9ba6266ed43690c016ba9ed5b4708 Mon Sep 17 00:00:00 2001 From: wanghaomei <86whm@163.com> Date: Tue, 26 Mar 2024 14:31:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=AE=A2=E8=88=B1?= =?UTF-8?q?=E8=B4=A6=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BookingCustomerOrderService.cs | 15 ++++++++++++++- .../Service/BookingCustomerOrder/Dto/Dtos.cs | 9 +++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) 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; } } }