From 2e2099d00116c5c78a88926f1c9fd1d279b1c8e0 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Mon, 12 Jun 2023 15:42:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E9=80=92100=E7=89=A9=E6=B5=81?=
 =?UTF-8?q?=E5=85=AC=E5=8F=B8=E5=88=97=E8=A1=A8=E6=94=AF=E6=8C=81=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWYB.Server.Business/KuaiDi100Manager.cs | 38 +++++++++++++----------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/BBWYB.Server.Business/KuaiDi100Manager.cs b/BBWYB.Server.Business/KuaiDi100Manager.cs
index 96815a8..56df7e0 100644
--- a/BBWYB.Server.Business/KuaiDi100Manager.cs
+++ b/BBWYB.Server.Business/KuaiDi100Manager.cs
@@ -2,6 +2,7 @@
 using BBWYB.Common.Models;
 using Newtonsoft.Json;
 using SDKAdapter;
+using System.Collections.Generic;
 using System.Reflection;
 
 namespace BBWYB.Server.Business
@@ -15,11 +16,27 @@ namespace BBWYB.Server.Business
         public IList<int> KuaiDi100PushStateList_LanShou = new List<int>() { 1, 101, 102, 103 };
         public IList<int> KuaiDi100PushStateList_QianShou = new List<int>() { 3, 301, 302, 303, 304 };
         public IList<int> KuaiDi100PushStateList_PaiJian = new List<int>() { 5, 501 };
+        private IList<KuaiDi100ExpressCompany> kuaiDi100ExpressCompanyList;
 
         public KuaiDi100Manager(RestApiService restApiService, ExpressCompanyNameConverter expressCompanyNameConverter)
         {
             this.restApiService = restApiService;
             this.expressCompanyNameConverter = expressCompanyNameConverter;
+
+            kuaiDi100ExpressCompanyList = new List<KuaiDi100ExpressCompany>();
+            var lines = File.ReadAllLines(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "KuaiDi100ExpressCompany.txt"), System.Text.Encoding.UTF8);
+            foreach (var line in lines)
+            {
+                var array = line.Split(',', StringSplitOptions.RemoveEmptyEntries);
+                if (!array[2].Contains("国内"))
+                    continue;
+                kuaiDi100ExpressCompanyList.Add(new KuaiDi100ExpressCompany()
+                {
+                    ExpressId = array[1],
+                    ExpressName = array[0],
+                    Type = array[2]
+                });
+            }
         }
 
         private void ThrowSubscribeError(string waybillno, string sourceExpressName, string kuaidi100CompanyCode, string error)
@@ -86,23 +103,10 @@ namespace BBWYB.Server.Business
 
         public IList<KuaiDi100ExpressCompany> GetKuaiDi100ExpressCompanyList(KuaiDi100ExpressSearchRequest request)
         {
-            var lines = File.ReadAllLines(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "KuaiDi100ExpressCompany.txt"), System.Text.Encoding.UTF8);
-            IList<KuaiDi100ExpressCompany> list = new List<KuaiDi100ExpressCompany>();
-            foreach (var line in lines)
-            {
-                var array = line.Split(',', StringSplitOptions.RemoveEmptyEntries);
-                if (!array[2].Contains("国内"))
-                    continue;
-                if (!string.IsNullOrEmpty(request.ExpressName) && !array[0].Contains(request.ExpressName))
-                    continue;
-                list.Add(new KuaiDi100ExpressCompany()
-                {
-                    ExpressId = array[1],
-                    ExpressName = array[0],
-                    Type = array[2]
-                });
-            }
-            return list;
+            if (string.IsNullOrEmpty(request.ExpressName))
+                return kuaiDi100ExpressCompanyList;
+            else
+                return kuaiDi100ExpressCompanyList.Where(x => x.ExpressName.Contains(request.ExpressName)).ToList();
         }
     }