From da0d572e48cc57842feda34002df365d28b98789 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Tue, 4 Jul 2023 15:13:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8C=B9=E9=85=8D=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs index 68aaf1a3..565cffb0 100644 --- a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs +++ b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs @@ -850,7 +850,7 @@ namespace BBWY.Server.Business po.OrderState == Enums.PurchaseOrderState.部分发货) .WhereIf(request.PurchaseOrderState == Enums.PurchaseOrderState.待收货, (po, pa) => po.OrderState == Enums.PurchaseOrderState.待收货 || po.OrderState == Enums.PurchaseOrderState.部分收货) - .WhereIf(request.PurchaserName != null, (po, pa) => po.PurchaserName == request.PurchaserName) + .WhereIf(!string.IsNullOrEmpty(request.PurchaserName), (po, pa) => po.PurchaserName == request.PurchaserName) .WhereIf(request.StartDate != null, (po, pa) => po.CreateTime >= request.StartDate) .WhereIf(request.EndDate != null, (po, pa) => po.CreateTime <= request.EndDate); } @@ -907,7 +907,7 @@ namespace BBWY.Server.Business var httpResult = restApiService.SendRequest("http://bbwyb.qiyue666.com", "api/order/BatchGetPurchaseExpressOrderList", purchaseOrderIdList, - new Dictionary() { { "Authorization", $"Bearer {token}" } }, + new Dictionary() { { "Authorization", $"{token}" } }, HttpMethod.Post); if (httpResult.StatusCode == System.Net.HttpStatusCode.OK) { @@ -919,7 +919,7 @@ namespace BBWY.Server.Business foreach (var purchaseOrderSku in purchaseOrder.ItemList) { purchaseOrderSku.PurchaseExpressOrderList = response.Data.Where(x => !string.IsNullOrEmpty(x.BelongSkuIds) && - x.PurchaseOrderId == purchaseOrder.Id && + x.OrderId == purchaseOrder.Id && x.BelongSkuIds.Contains(purchaseOrderSku.PurchaseSkuIds)) .ToList(); }