Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan

Myshipping.Application/Entity/BookingCustomerOrder.cs

@@ -283,6 +283,11 @@ namespace Myshipping.Application.Entity
         /// 目的地
         /// </summary>
         public string DESTINATION { get; set; }
+
+        /// <summary>
+        /// 附加数据
+        /// </summary>
+        public string ExtendData { get; set; }
     }
 
     /// <summary>

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<List<BookingCustomerLogDto>>();
             outModel.ServiceItemList = _repServiceItem.AsQueryable().Where(x => x.BookingId == entity.Id).ToList().Adapt<List<BookingServiceItemCustomerDto>>();
 
+
             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<List<BookingCtn>>();
             var servList = input.ServiceItemList.Adapt<List<BookingServiceItem>>();
 

Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs

@@ -397,6 +397,11 @@ namespace Myshipping.Application
         /// </summary>
         public string UpdatedTime { get; set; }
 
+        /// <summary>
+        /// 附加数据
+        /// </summary>
+        public string ExtendData { get; set; }
+
         /// <summary>
         /// 文件列表
         /// </summary>
@@ -553,6 +558,11 @@ namespace Myshipping.Application
         /// 回推接口秘钥
         /// </summary>
         public string FeedbackSecret { get; set; }
+
+        /// <summary>
+        /// 附加数据
+        /// </summary>
+        public string ExtendData { get; set; }
     }
 
 
@@ -889,13 +899,15 @@ namespace Myshipping.Application
         /// 服务项目
         /// </summary>
         public List<BookingServiceItemCustomerDto> ServiceItemList { get; set; }
-        ///// <summary>
-        ///// 订舱账号
-        ///// </summary>
-        //public string BOOKINGACCOUNT { get;  set; }
-        ///// <summary>
-        ///// 订舱密码
-        ///// </summary>
-        //public string BOOKINGPASSWORD { get;  set; }
+
+        /// <summary>
+        /// 订舱账号
+        /// </summary>
+        public string BOOKINGACCOUNT { get; set; }
+
+        /// <summary>
+        /// 订舱密码
+        /// </summary>
+        public string BOOKINGPASSWORD { get; set; }
     }
 }

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);
             }
             //条件限制   重复限制