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; } } }