From f349f10980e81deb42c98fdfb86bdcbc42aea537 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Wed, 24 Jan 2024 14:16:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=90=E9=80=9A=E8=B4=A7?= =?UTF-8?q?=E8=BF=90=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWYB.Server.Business/Vender/VenderBusiness.cs | 6 +++--- SDKAdapter/ExpressCompanyNameConverter.cs | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/BBWYB.Server.Business/Vender/VenderBusiness.cs b/BBWYB.Server.Business/Vender/VenderBusiness.cs index 942d3bb..e2ff359 100644 --- a/BBWYB.Server.Business/Vender/VenderBusiness.cs +++ b/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().Where(pa => pa.AppKey == shopSettingRequest.AppKey && - pa.AppToken == shopSettingRequest.AppToken && - pa.ShopId == mdsShop.Id).Any(); + var isRepeat = fsqlManager.MDSfsql.Select().Where(pa => pa.ShopId == mdsShop.Id && + pa.AppKey == shopSettingRequest.AppKey && + pa.AppToken == shopSettingRequest.AppToken).Any(); if (isRepeat) throw new BusinessException($"采购账号重复"); shopSettingRequest.PurchaseAccountId = idGenerator.NewLong().ToString(); diff --git a/SDKAdapter/ExpressCompanyNameConverter.cs b/SDKAdapter/ExpressCompanyNameConverter.cs index 0800251..45d5567 100644 --- a/SDKAdapter/ExpressCompanyNameConverter.cs +++ b/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"}