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

Myshipping.Application/Event/BookingFeeSubscriber.cs

@@ -73,7 +73,7 @@ namespace Myshipping.Application.Event
                 .AsQueryable()
                 .Filter(null, true)
                 .Where(x => idList.Contains(x.Id))
-                .Select(x => new { x.Id, x.MBLNO, x.OPID, x.CreatedUserId, x.TenantId })
+                .Select(x => new { x.Id, x.MBLNO, x.HBLNO, x.OPID, x.CreatedUserId, x.TenantId, x.VESSEL, x.VOYNO, x.ETD, x.CARRIER, x.ATD })
                 .ToListAsync();
 
             var typeStr = $"{bsType}_{sendType}";
@@ -137,11 +137,16 @@ namespace Myshipping.Application.Event
                     {
                         BSNO = order.Id.ToString(),
                         MBLNO = order.MBLNO,
+                        HBLNO = order.HBLNO,
                         CtnrInfo = "",
                         CtnrCount = 1,
                         IsCredit = 1,//是否是信用支付 1 信用支付 0不允许信用支付默认值为0,
                         LURURENID = user.DjyUserId,
-                        SENDUSERID = user.DjyUserId
+                        SENDUSERID = user.DjyUserId,
+                        VESSEL = order.VESSEL,
+                        VOYNO = order.VOYNO,
+                        ETD = order.ATD,
+                        CARRIER = order.CARRIER
                     }
                 };