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

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -6657,6 +6657,15 @@ namespace Myshipping.Application
                     {
                         row.CreateCell(1).SetCellValue(edi.EmcNameAccount);
                     }
+                    ICell _cell = row.GetCell(4);
+                    if (_cell != null)
+                    {
+                        row.Cells[4].SetCellValue(edi.EmcNameAccount);
+                    }
+                    else
+                    {
+                        row.CreateCell(4).SetCellValue(edi.EmcNameAccount);
+                    }
                 }
                 if (i == 47)
                 {

Myshipping.Core/EventSubscriber/CompanyUserSyncSubscriber.cs

@@ -338,6 +338,14 @@ namespace Myshipping.Core
                     user.Password = DESCEncryption.Encrypt("123456", keyDES);
 
                     await repoUser.UpdateAsync(user);
+
+
+                    //客户端用户信息同步给运营端往来单位
+                    if (App.Configuration["RunType"] is CommonConst.RUN_TYPE_CUST)
+                    {
+                        var evtPub = App.GetService<IEventPublisher>();
+                        await evtPub.PublishAsync(new ChannelEventSource($"DjySync:TenantUserToCustomer", tenant.Id));
+                    }
                 }
             }
         }

Myshipping.Core/Service/DjyCustomer/DjyCustomerService.cs

@@ -17,6 +17,7 @@ using NPOI.Util;
 using StackExchange.Profiling.Internal;
 using Microsoft.AspNetCore.Authorization;
 using static NPOI.HSSF.Util.HSSFColor;
+using TinyPinyin;
 
 namespace Myshipping.Core.Service
 {
@@ -399,7 +400,7 @@ namespace Myshipping.Core.Service
                     FullName = dto.Name,
                     Email = dto.Email,
                     Tel = dto.Phone,
-                    CodeName = "",
+                    CodeName = PinyinHelper.GetPinyinInitials(shortName),
                     ShortName = shortName,
                     DjyGid = dto.DjyGid,
                     PropString = "[consignor]"