From cc79683fdfd753f5f6427a59ca85cab04320b673 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Thu, 2 Jun 2022 22:05:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E5=85=AC=E5=8F=B8=E7=BF=BB?=
 =?UTF-8?q?=E8=AF=91=E6=94=AF=E6=8C=81=E4=BA=8C=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformSDK/LogisticsCompanyConverter.cs                | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/BBWY.Server.Business/PlatformSDK/LogisticsCompanyConverter.cs b/BBWY.Server.Business/PlatformSDK/LogisticsCompanyConverter.cs
index 9d47c321..84bd6968 100644
--- a/BBWY.Server.Business/PlatformSDK/LogisticsCompanyConverter.cs
+++ b/BBWY.Server.Business/PlatformSDK/LogisticsCompanyConverter.cs
@@ -27,7 +27,7 @@ namespace BBWY.Server.Business
                 new LogisticsCompanyRelationship(){SourceName="其他",TargetName="厂家自送"},
                 new LogisticsCompanyRelationship(){SourceName="德邦",TargetName="德邦物流"},
                 new LogisticsCompanyRelationship(){SourceName="EMS",TargetName="邮政快递包裹"},
-                new LogisticsCompanyRelationship(){SourceName="德邦快递",TargetName="德邦快运"},
+                new LogisticsCompanyRelationship(){SourceName="德邦快递",TargetName="德邦快递",SecondTargetName="德邦快运"},
                 new LogisticsCompanyRelationship(){SourceName="其它",TargetName="厂家自送"},
                 new LogisticsCompanyRelationship(){SourceName="极兔速递",TargetName="厂家自送"},
                 new LogisticsCompanyRelationship(){SourceName="中通快运",TargetName="中通快运"},
@@ -66,7 +66,7 @@ namespace BBWY.Server.Business
             if (targetShip == null)
                 throw new BusinessException($"sourcePlatform:{sourcePlatform},targetPlatform:{targetPlatform},未找到{sourcePlatform}的物流公司{sourceName}");
 
-            var logisiticsCompany = targetPlatformUserLogisticsCompanyList.FirstOrDefault(c => c.Name.Equals(targetShip.TargetName));
+            var logisiticsCompany = targetPlatformUserLogisticsCompanyList.FirstOrDefault(c => c.Name.Equals(targetShip.TargetName) || c.Name.Equals(targetShip.SecondTargetName));
             if (logisiticsCompany == null)
                 throw new BusinessException($"sourcePlatform:{sourcePlatform},targetPlatform:{targetPlatform},targetShip:{targetShip.TargetName},在用户支持的物流公司中不存在");
 
@@ -79,5 +79,7 @@ namespace BBWY.Server.Business
         public string SourceName { get; set; }
 
         public string TargetName { get; set; }
+
+        public string SecondTargetName { get; set; }
     }
 }