增加运通货运翻译

BBWYB.Server.Business/Vender/VenderBusiness.cs

@@ -51,9 +51,9 @@ namespace BBWYB.Server.Business
 
             if (string.IsNullOrEmpty(shopSettingRequest.PurchaseAccountId) || shopSettingRequest.PurchaseAccountId == "0")
             {
-                var isRepeat = fsqlManager.MDSfsql.Select<Purchaseaccount>().Where(pa => pa.AppKey == shopSettingRequest.AppKey &&
+                var isRepeat = fsqlManager.MDSfsql.Select<Purchaseaccount>().Where(pa => pa.ShopId == mdsShop.Id &&
-                                                                                         pa.AppToken == shopSettingRequest.AppToken &&
+                                                                                         pa.AppKey == shopSettingRequest.AppKey &&
-                                                                                         pa.ShopId == mdsShop.Id).Any();
+                                                                                         pa.AppToken == shopSettingRequest.AppToken).Any();
                 if (isRepeat)
                     throw new BusinessException($"采购账号重复");
                 shopSettingRequest.PurchaseAccountId = idGenerator.NewLong().ToString();

SDKAdapter/ExpressCompanyNameConverter.cs

@@ -128,6 +128,7 @@ namespace SDKAdapter
                 new LogisticsCompanyRelationship(){SourceName="京东物流",TargetName="京东物流",TargetCode="jd"},
                 new LogisticsCompanyRelationship(){SourceName="速腾快递",TargetName="速腾快递",TargetCode="suteng"},
                 new LogisticsCompanyRelationship(){SourceName="运通快运",TargetName="运通快运",TargetCode="ytky168"},
+                new LogisticsCompanyRelationship(){SourceName="运通货运",TargetName="运通快运",TargetCode="ytky168"},
                 new LogisticsCompanyRelationship(){SourceName="汇森速运",TargetName="汇森速运",TargetCode="huisenky"},
                 new LogisticsCompanyRelationship(){SourceName="丹鸟物流",TargetName="丹鸟物流",TargetCode="danniao"},
                 new LogisticsCompanyRelationship(){SourceName="丹鸟",TargetName="丹鸟物流",TargetCode="danniao"}