From 7f4c1d65668d5cd9dfce6453d29f41c39734f563 Mon Sep 17 00:00:00 2001 From: shanji <18996038927@163.com> Date: Mon, 12 Jun 2023 13:05:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWYB.Server.Business/Order/OrderBusiness.cs | 29 ++++++++++++++++++-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/BBWYB.Server.Business/Order/OrderBusiness.cs b/BBWYB.Server.Business/Order/OrderBusiness.cs index 9bbe68d..b245336 100644 --- a/BBWYB.Server.Business/Order/OrderBusiness.cs +++ b/BBWYB.Server.Business/Order/OrderBusiness.cs @@ -53,8 +53,31 @@ namespace BBWYB.Server.Business .Where(opi => opi.PurchaseOrderId == request.PurchaseOrderId); select = select.Where((o, ocs, oct) => childSelect.Where(opi => opi.OrderId == o.Id).Any()); } - - select = select.WhereIf(request.OrderState != null, (o, ocs, oct) => o.OrderState == request.OrderState) + if (request.OrderState != null) + { + if (request.OrderState == Enums.OrderState.待付款 || + request.OrderState == Enums.OrderState.打包中 || + request.OrderState == Enums.OrderState.待完结 || + request.OrderState == Enums.OrderState.已完成 || + request.OrderState == Enums.OrderState.已取消) + { + select = select.Where((o, ocs, oct) => o.OrderState == request.OrderState); + } + else if (request.OrderState == Enums.OrderState.等待采购) + select = select.Where((o, ocs, oct) => o.OrderState == Enums.OrderState.等待采购 || o.OrderState == Enums.OrderState.部分采购); + } + select = select.WhereIf(request.OrderState == Enums.OrderState.待付款 || + request.OrderState == Enums.OrderState.打包中 || + request.OrderState == Enums.OrderState.待完结 || + request.OrderState == Enums.OrderState.已完成 || + request.OrderState == Enums.OrderState.已取消, + (o, ocs, oct) => o.OrderState == request.OrderState) + .WhereIf(request.OrderState == Enums.OrderState.等待采购, (o, ocs, oct) => o.OrderState == Enums.OrderState.等待采购 || + o.OrderState == Enums.OrderState.部分采购) + .WhereIf(request.OrderState == Enums.OrderState.待发货, (o, ocs, oct) => o.OrderState == Enums.OrderState.待发货 || + o.OrderState == Enums.OrderState.部分发货) + .WhereIf(request.OrderState == Enums.OrderState.待收货, (o, ocs, oct) => o.OrderState == Enums.OrderState.待收货 || + o.OrderState == Enums.OrderState.部分收货) .WhereIf(request.IsWaitConfig, (o, ocs, oct) => o.OrderState != Enums.OrderState.已取消 && o.IsPurchased == true) .WhereIf(request.StartDate != null, (o, ocs, oct) => o.StartTime >= request.StartDate) .WhereIf(request.EndDate != null, (o, ocs, oct) => o.StartTime <= request.EndDate) @@ -163,7 +186,7 @@ namespace BBWYB.Server.Business foreach (var orderPurchaseInfo in order.OrderPurchaseInfoList) { orderPurchaseInfo.OrderPurchaseSkuInfoList = orderPurchaseSkuInfoList.Where(opsi => opsi.PurchaseOrderId == orderPurchaseInfo.PurchaseOrderId).ToList(); - orderPurchaseInfo.PurchaseExpressOrderList = purchaseExpressOrderList.Where(peo=>peo.PurchaseOrderId == orderPurchaseInfo.PurchaseOrderId).ToList(); + orderPurchaseInfo.PurchaseExpressOrderList = purchaseExpressOrderList.Where(peo => peo.PurchaseOrderId == orderPurchaseInfo.PurchaseOrderId).ToList(); } } From 8d622f707f3f3eaa24f9ff98b602f277202f540e Mon Sep 17 00:00:00 2001 From: shanji <18996038927@163.com> Date: Mon, 12 Jun 2023 14:32:04 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=BF=AB=E9=80=92100=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E8=BF=90=E8=BE=93=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWYB.Server.Business/KuaiDi100Manager.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/BBWYB.Server.Business/KuaiDi100Manager.cs b/BBWYB.Server.Business/KuaiDi100Manager.cs index 6f9521e..d28b780 100644 --- a/BBWYB.Server.Business/KuaiDi100Manager.cs +++ b/BBWYB.Server.Business/KuaiDi100Manager.cs @@ -91,6 +91,8 @@ namespace BBWYB.Server.Business foreach (var line in lines) { var array = line.Split(',', StringSplitOptions.RemoveEmptyEntries); + if (!array[2].Contains("国内")) + continue; list.Add(new KuaiDi100ExpressCompany() { ExpressId = array[1], From 0978ddc6b9fb62dd0508bf76188583d067a69888 Mon Sep 17 00:00:00 2001 From: shanji <18996038927@163.com> Date: Mon, 12 Jun 2023 15:36:49 +0800 Subject: [PATCH 3/4] =?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=E5=A2=9E=E5=8A=A0=E6=A8=A1?= =?UTF-8?q?=E7=B3=8A=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWYB.Server.API/Controllers/VenderController.cs | 6 +++--- BBWYB.Server.Business/KuaiDi100Manager.cs | 9 ++++++++- BBWYB.Server.Business/Vender/VenderBusiness.cs | 4 ++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/BBWYB.Server.API/Controllers/VenderController.cs b/BBWYB.Server.API/Controllers/VenderController.cs index d28c970..9a75a5c 100644 --- a/BBWYB.Server.API/Controllers/VenderController.cs +++ b/BBWYB.Server.API/Controllers/VenderController.cs @@ -42,10 +42,10 @@ namespace BBWYB.Server.API.Controllers /// 获取快递100物流公司列表 /// /// - [HttpGet] - public IList GetKuaiDi100ExpressCompanyList() + [HttpPost] + public IList GetKuaiDi100ExpressCompanyList([FromBody]KuaiDi100ExpressSearchRequest request) { - return venderBusiness.GetKuaiDi100ExpressCompanyList(); + return venderBusiness.GetKuaiDi100ExpressCompanyList(request); } } } diff --git a/BBWYB.Server.Business/KuaiDi100Manager.cs b/BBWYB.Server.Business/KuaiDi100Manager.cs index d28b780..96815a8 100644 --- a/BBWYB.Server.Business/KuaiDi100Manager.cs +++ b/BBWYB.Server.Business/KuaiDi100Manager.cs @@ -84,7 +84,7 @@ namespace BBWYB.Server.Business return "Unknow"; } - public IList GetKuaiDi100ExpressCompanyList() + public IList GetKuaiDi100ExpressCompanyList(KuaiDi100ExpressSearchRequest request) { var lines = File.ReadAllLines(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "KuaiDi100ExpressCompany.txt"), System.Text.Encoding.UTF8); IList list = new List(); @@ -93,6 +93,8 @@ namespace BBWYB.Server.Business 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], @@ -121,4 +123,9 @@ namespace BBWYB.Server.Business public string Type { get; set; } } + + public class KuaiDi100ExpressSearchRequest + { + public string ExpressName { get; set; } + } } diff --git a/BBWYB.Server.Business/Vender/VenderBusiness.cs b/BBWYB.Server.Business/Vender/VenderBusiness.cs index 52c61bb..640bba9 100644 --- a/BBWYB.Server.Business/Vender/VenderBusiness.cs +++ b/BBWYB.Server.Business/Vender/VenderBusiness.cs @@ -85,9 +85,9 @@ namespace BBWYB.Server.Business }); } - public IList GetKuaiDi100ExpressCompanyList() + public IList GetKuaiDi100ExpressCompanyList(KuaiDi100ExpressSearchRequest request) { - return kuaiDi100Manager.GetKuaiDi100ExpressCompanyList(); + return kuaiDi100Manager.GetKuaiDi100ExpressCompanyList(request); } } } 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 4/4] =?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 KuaiDi100PushStateList_LanShou = new List() { 1, 101, 102, 103 }; public IList KuaiDi100PushStateList_QianShou = new List() { 3, 301, 302, 303, 304 }; public IList KuaiDi100PushStateList_PaiJian = new List() { 5, 501 }; + private IList kuaiDi100ExpressCompanyList; public KuaiDi100Manager(RestApiService restApiService, ExpressCompanyNameConverter expressCompanyNameConverter) { this.restApiService = restApiService; this.expressCompanyNameConverter = expressCompanyNameConverter; + + kuaiDi100ExpressCompanyList = new List(); + 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 GetKuaiDi100ExpressCompanyList(KuaiDi100ExpressSearchRequest request) { - var lines = File.ReadAllLines(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "KuaiDi100ExpressCompany.txt"), System.Text.Encoding.UTF8); - IList list = new List(); - 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(); } }