Browse Source

修复匹配条件问题

AddValidOverTime
shanji 2 years ago
parent
commit
da0d572e48
  1. 6
      BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs

6
BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs

@ -850,7 +850,7 @@ namespace BBWY.Server.Business
po.OrderState == Enums.PurchaseOrderState.) po.OrderState == Enums.PurchaseOrderState.)
.WhereIf(request.PurchaseOrderState == Enums.PurchaseOrderState., (po, pa) => po.OrderState == Enums.PurchaseOrderState. || .WhereIf(request.PurchaseOrderState == Enums.PurchaseOrderState., (po, pa) => po.OrderState == Enums.PurchaseOrderState. ||
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.StartDate != null, (po, pa) => po.CreateTime >= request.StartDate)
.WhereIf(request.EndDate != null, (po, pa) => po.CreateTime <= request.EndDate); .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", var httpResult = restApiService.SendRequest("http://bbwyb.qiyue666.com",
"api/order/BatchGetPurchaseExpressOrderList", "api/order/BatchGetPurchaseExpressOrderList",
purchaseOrderIdList, purchaseOrderIdList,
new Dictionary<string, string>() { { "Authorization", $"Bearer {token}" } }, new Dictionary<string, string>() { { "Authorization", $"{token}" } },
HttpMethod.Post); HttpMethod.Post);
if (httpResult.StatusCode == System.Net.HttpStatusCode.OK) if (httpResult.StatusCode == System.Net.HttpStatusCode.OK)
{ {
@ -919,7 +919,7 @@ namespace BBWY.Server.Business
foreach (var purchaseOrderSku in purchaseOrder.ItemList) foreach (var purchaseOrderSku in purchaseOrder.ItemList)
{ {
purchaseOrderSku.PurchaseExpressOrderList = response.Data.Where(x => !string.IsNullOrEmpty(x.BelongSkuIds) && purchaseOrderSku.PurchaseExpressOrderList = response.Data.Where(x => !string.IsNullOrEmpty(x.BelongSkuIds) &&
x.PurchaseOrderId == purchaseOrder.Id && x.OrderId == purchaseOrder.Id &&
x.BelongSkuIds.Contains(purchaseOrderSku.PurchaseSkuIds)) x.BelongSkuIds.Contains(purchaseOrderSku.PurchaseSkuIds))
.ToList(); .ToList();
} }

Loading…
Cancel
Save