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] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=AE=A2=E8=88=B1=E8=B4=A6?=
 =?UTF-8?q?=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<List<BookingCustomerLogDto>>();
             outModel.ServiceItemList = _repServiceItem.AsQueryable().Where(x => x.BookingId == entity.Id).ToList().Adapt<List<BookingServiceItemCustomerDto>>();
-            
+
 
             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<List<BookingCtn>>();
             var servList = input.ServiceItemList.Adapt<List<BookingServiceItem>>();
 
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<BookingServiceItemCustomerDto> ServiceItemList { get; set; }
 
         /// <summary>
-        /// 附加数据
+        /// 订舱账号
         /// </summary>
-        public string ExtendData { get; set; }
+        public string BOOKINGACCOUNT { get; set; }
+
+        /// <summary>
+        /// 订舱密码
+        /// </summary>
+        public string BOOKINGPASSWORD { get; set; }
     }
 }