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

Myshipping.Application/Event/BookingSyncSubscriber.cs

@@ -518,11 +518,14 @@ namespace Myshipping.Application.Event
                     _logger.LogInformation($"根据客户订舱反馈数据 {custOrder.BSNO} 生成了相同的数据 {custOrder.Id}");
 
                     //插入订舱台账
-                    var ordId = await servCustOrder.CustomerToOrder(custOrder);
+                    var ord = await servCustOrder.CustomerToOrder(custOrder);
-                    custOrder.BookingId = ordId;
+                    custOrder.BookingId = ord.Id;
                     await repoCutomerOrder.AsUpdateable(custOrder).UpdateColumns(x => new { x.BookingId }).ExecuteCommandAsync();
 
-                    _logger.LogInformation($"生成了订舱台账数据 {ordId}");
+                    ord.BSNO = item.GetStringValue("OrderId");
+                    await repoOrder.AsUpdateable(ord).UpdateColumns(x => new { x.BSNO }).ExecuteCommandAsync();
+
+                    _logger.LogInformation($"生成了订舱台账数据 {ord.Id}");
 
                 }
             }

Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs

@@ -1180,7 +1180,8 @@ namespace Myshipping.Application
                 //进入客户订舱系统的订舱台账
                 if (recModel.Accept)
                 {
-                    bookingId = await CustomerToOrder(model);
+                    var ord = await CustomerToOrder(model);
+                    bookingId = ord.Id;
 
                     model.BookingId = bookingId; //客户订舱数据与订舱台账数据关联
                     await _rep.UpdateAsync(model);
@@ -1674,10 +1675,13 @@ namespace Myshipping.Application
                     _logger.LogInformation($"根据客户订舱 {recModel.Id} 生成了相同的数据 {model.Id}");
 
                     //插入订舱台账
-                    var ordId = await CustomerToOrder(model);
+                    var ord = await CustomerToOrder(model);
-                    respDtO.OrderId = ordId;
+                    model.BookingId = ord.Id;
+                    await _rep.AsUpdateable(model).UpdateColumns(x => new { x.BookingId }).ExecuteCommandAsync();
 
-                    _logger.LogInformation($"生成了订舱台账数据 {ordId}");
+                    respDtO.OrderId = ord.Id;
+
+                    _logger.LogInformation($"生成了订舱台账数据 {ord.Id}");
 
                 }
 
@@ -1694,7 +1698,7 @@ namespace Myshipping.Application
         /// </summary>
         /// <returns></returns>
         [NonAction]
-        public async Task<long> CustomerToOrder(BookingCustomerOrder custOrd)
+        public async Task<BookingOrder> CustomerToOrder(BookingCustomerOrder custOrd)
         {
             var bkOrder = custOrd.Adapt<BookingOrder>();
             bkOrder.Id = YitIdHelper.NextId();
@@ -1739,7 +1743,7 @@ namespace Myshipping.Application
                 await _repFile.InsertAsync(file);
             }
 
-            return bkOrder.Id;
+            return bkOrder;
         }
 
         /// <summary>

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

@@ -534,6 +534,7 @@ namespace Myshipping.Application
         /// <summary>
         /// 通知人联系人姓
         /// </summary>
+        public string NotifypartLastName { get; set; }
 
         /// <summary>
         /// 通知人电话国家代码