pengcong001
/
bbwyb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

订单状态查询条件调整

yijia
shanji 2 years ago
parent
1f065e7617
commit
7f4c1d6566
1 changed files with 26 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      BBWYB.Server.Business/Order/OrderBusiness.cs

29
BBWYB.Server.Business/Order/OrderBusiness.cs
View File

@ -53,8 +53,31 @@ namespace BBWYB.Server.Business
.Where(opi => opi.PurchaseOrderId == request.PurchaseOrderId); .Where(opi => opi.PurchaseOrderId == request.PurchaseOrderId);
select = select.Where((o, ocs, oct) => childSelect.Where(opi => opi.OrderId == o.Id).Any()); select = select.Where((o, ocs, oct) => childSelect.Where(opi => opi.OrderId == o.Id).Any());
} }
if (request.OrderState != null)
select = select.WhereIf(request.OrderState != null, (o, ocs, oct) => o.OrderState == request.OrderState) {
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.IsWaitConfig, (o, ocs, oct) => o.OrderState != Enums.OrderState.已取消 && o.IsPurchased == true)
.WhereIf(request.StartDate != null, (o, ocs, oct) => o.StartTime >= request.StartDate) .WhereIf(request.StartDate != null, (o, ocs, oct) => o.StartTime >= request.StartDate)
.WhereIf(request.EndDate != null, (o, ocs, oct) => o.StartTime <= request.EndDate) .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) foreach (var orderPurchaseInfo in order.OrderPurchaseInfoList)
{ {
orderPurchaseInfo.OrderPurchaseSkuInfoList = orderPurchaseSkuInfoList.Where(opsi => opsi.PurchaseOrderId == orderPurchaseInfo.PurchaseOrderId).ToList(); 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();
} }
} }

Write Preview
Loading…
Cancel
Save