From e7084683aea960d988550830c5c15b09c822182c Mon Sep 17 00:00:00 2001
From: wet <1034391973@qq.com>
Date: Fri, 6 Jan 2023 17:23:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E8=A3=85=E6=98=A0=E5=B0=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/DataSync/DataSyncService.cs       | 19 +++++++++++++++++--
 .../Service/CommonDB/CommonDBService.cs       |  2 +-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Myshipping.Application/Service/DataSync/DataSyncService.cs b/Myshipping.Application/Service/DataSync/DataSyncService.cs
index 9b95b45c..7481d27e 100644
--- a/Myshipping.Application/Service/DataSync/DataSyncService.cs
+++ b/Myshipping.Application/Service/DataSync/DataSyncService.cs
@@ -60,14 +60,29 @@ namespace Myshipping.Application
 
 
         #region 上传数据
-
+        /// <summary>
+        /// 同步客户
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
         [HttpPost("/DataSync/SyncCustomer"), ApiUser]
         public async Task<long> SyncCustomer(DjyCustomerSyncDto model)
         {
-
+ 
             return 0;
         }
 
+
+
+
+
+
+
+
+
+
+
+
         #endregion
 
         #region 下载数据
diff --git a/Myshipping.Core/Service/CommonDB/CommonDBService.cs b/Myshipping.Core/Service/CommonDB/CommonDBService.cs
index e855a889..ec20a871 100644
--- a/Myshipping.Core/Service/CommonDB/CommonDBService.cs
+++ b/Myshipping.Core/Service/CommonDB/CommonDBService.cs
@@ -779,7 +779,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
     public async Task AddOrUpdateMappingPackage([FromBody] MappingPackageDto dto)
     {
         var list = await _sysCacheService.GetAllMappingPackage();
-        var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module && x.GID != dto.GID).Count();
+        var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module &&x.CarrierCode==dto.CarrierCode && x.GID != dto.GID).Count();
         if (count > 0)
         {
             throw Oops.Bah(ErrorCode.D1006);