From eaefb6a55b9f87568f49b4f728a23ff0b97d594c Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Sun, 11 Jun 2023 21:32:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BF=AB=E9=80=92100?=
 =?UTF-8?q?=E7=89=A9=E6=B5=81=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/VenderController.cs           | 10 +++++++
 .../Vender/VenderBusiness.cs                  | 28 +++++++++++++++++++
 SDKAdapter/ExpressCompanyNameConverter.cs     |  2 +-
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/BBWYB.Server.API/Controllers/VenderController.cs b/BBWYB.Server.API/Controllers/VenderController.cs
index 42b492c..9e29fa5 100644
--- a/BBWYB.Server.API/Controllers/VenderController.cs
+++ b/BBWYB.Server.API/Controllers/VenderController.cs
@@ -37,5 +37,15 @@ namespace BBWYB.Server.API.Controllers
         {
             return venderBusiness.GetExpressCompanyList(request);
         }
+
+        /// <summary>
+        /// 获取快递100物流公司列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public IList<OP_QueryExpressCompanyResponse> GetKuaiDi100ExpressCompanyList()
+        {
+            return venderBusiness.GetKuaiDi100ExpressCompanyList();
+        }
     }
 }
diff --git a/BBWYB.Server.Business/Vender/VenderBusiness.cs b/BBWYB.Server.Business/Vender/VenderBusiness.cs
index 3cc46b7..df39ada 100644
--- a/BBWYB.Server.Business/Vender/VenderBusiness.cs
+++ b/BBWYB.Server.Business/Vender/VenderBusiness.cs
@@ -82,5 +82,33 @@ namespace BBWYB.Server.Business
                                               Platform = (SDKAdapter.AdapterEnums.PlatformType)request.Platform
                                           });
         }
+
+        public IList<OP_QueryExpressCompanyResponse> GetKuaiDi100ExpressCompanyList()
+        {
+            return new List<OP_QueryExpressCompanyResponse>()
+            {
+               new OP_QueryExpressCompanyResponse(){ ExpressName = "中通快递",ExpressId="zhongtong"},
+               new OP_QueryExpressCompanyResponse(){ ExpressName = "中通快运",ExpressId="zhongtongkuaiyun"},
+               new OP_QueryExpressCompanyResponse(){ ExpressName = "圆通速递",ExpressId="yuantong"},
+               new OP_QueryExpressCompanyResponse(){ ExpressName = "邮政快递包裹",ExpressId="youzhengguonei"},
+               new OP_QueryExpressCompanyResponse(){ ExpressName = "韵达快递",ExpressId="yunda"},
+               new OP_QueryExpressCompanyResponse(){ ExpressName = "申通快递",ExpressId="shentong"},
+               new OP_QueryExpressCompanyResponse(){ ExpressName = "顺丰快递",ExpressId="shunfeng"},
+               new OP_QueryExpressCompanyResponse(){ ExpressName = "顺丰快运",ExpressId="shunfengkuaiyun"},
+               new OP_QueryExpressCompanyResponse(){ ExpressName = "百世快递",ExpressId="huitongkuaidi"},
+               new OP_QueryExpressCompanyResponse(){ ExpressName = "德邦物流",ExpressId="debangwuliu"},
+               new OP_QueryExpressCompanyResponse(){ ExpressName = "德邦快递",ExpressId="debangkuaidi"},
+               new OP_QueryExpressCompanyResponse(){ ExpressName = "EMS",ExpressId="ems"},
+               new OP_QueryExpressCompanyResponse(){ ExpressName = "极兔速递",ExpressId="jtexpress"},
+               new OP_QueryExpressCompanyResponse(){ ExpressName = "安能物流",ExpressId="annengwuliu"},
+               new OP_QueryExpressCompanyResponse(){ ExpressName = "德坤物流",ExpressId="dekuncn"},
+               new OP_QueryExpressCompanyResponse(){ ExpressName = "壹米滴答",ExpressId="yimidida"},
+               new OP_QueryExpressCompanyResponse(){ ExpressName = "优速快递",ExpressId="youshuwuliu"},
+               new OP_QueryExpressCompanyResponse(){ ExpressName = "京广速递",ExpressId="jinguangsudikuaijian"},
+               new OP_QueryExpressCompanyResponse(){ ExpressName = "丰网速运",ExpressId="fengwang"},
+               new OP_QueryExpressCompanyResponse(){ ExpressName = "顺心捷达",ExpressId="sxjdfreight"},
+               new OP_QueryExpressCompanyResponse(){ ExpressName = "快捷速递",ExpressId="kuaijiesudi"}
+            };
+        }
     }
 }
diff --git a/SDKAdapter/ExpressCompanyNameConverter.cs b/SDKAdapter/ExpressCompanyNameConverter.cs
index ddb767a..91e169f 100644
--- a/SDKAdapter/ExpressCompanyNameConverter.cs
+++ b/SDKAdapter/ExpressCompanyNameConverter.cs
@@ -100,7 +100,7 @@ namespace SDKAdapter
                 new LogisticsCompanyRelationship(){SourceName="百世快递",TargetName="百世快递",TargetCode="huitongkuaidi"},
                 new LogisticsCompanyRelationship(){SourceName="德邦",TargetName="德邦物流",TargetCode="debangwuliu"},
                 new LogisticsCompanyRelationship(){SourceName="德邦快递",TargetName="德邦快递",TargetCode="debangkuaidi"},
-                new LogisticsCompanyRelationship(){SourceName="EMS",TargetName="邮政快递包裹",TargetCode="ems"},
+                new LogisticsCompanyRelationship(){SourceName="EMS",TargetName="EMS",TargetCode="ems"},
                 new LogisticsCompanyRelationship(){SourceName="极兔速递",TargetName="极兔速递",TargetCode="jtexpress"},
                 new LogisticsCompanyRelationship(){SourceName="极兔快递（原百世快递）",TargetName="极兔速递",TargetCode="jtexpress"},
                 new LogisticsCompanyRelationship(){SourceName="极兔速递-原百世快递",TargetName="极兔速递",TargetCode="jtexpress"},