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

订单数量查询接口条件对齐

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

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

@ -71,7 +71,7 @@ namespace BBWYB.Server.Business
.WhereIf(!string.IsNullOrEmpty(request.ProductId), osku => osku.ProductId == request.ProductId)
.WhereIf(request.IsWaitConfig && request.IsOnlyDisplayPackConfigEditState != 1, osku => waitConfigStateList.Contains(osku.PackConfigState) || osku.PackConfigState == null)
.WhereIf(request.IsWaitConfig && request.IsOnlyDisplayPackConfigEditState == 1, osku => osku.PackConfigState == Enums.PackConfigState.需修改);
select = select.WhereIf(request.IsWaitConfig, (o, ocs, oct) => o.OrderState != Enums.OrderState.已取消 &&
select = select.WhereIf(request.IsWaitConfig, (o, ocs, oct) => o.OrderState != Enums.OrderState.已取消 &&
o.OrderState != Enums.OrderState.已完成 &&
o.IntoStoreType == Enums.IntoStoreType.发回齐越 &&
o.IsPurchased == true)
@ -828,12 +828,12 @@ namespace BBWYB.Server.Business
return new OrderCountByStateResponse()
{
WaitPayCount = orderCountGroup.FirstOrDefault(o => o.OrderState == Enums.OrderState.待付款)?.OrderCount ?? 0,
WaitPurchaseCount = orderCountGroup.FirstOrDefault(o => o.OrderState == Enums.OrderState.等待采购 ||
o.OrderState == Enums.OrderState.部分采购)?.OrderCount ?? 0,
WaitShipmentCount = orderCountGroup.FirstOrDefault(o => o.OrderState == Enums.OrderState.待发货 ||
o.OrderState == Enums.OrderState.部分发货)?.OrderCount ?? 0,
WaitReceiveCount = orderCountGroup.FirstOrDefault(o => o.OrderState == Enums.OrderState.待收货 ||
o.OrderState == Enums.OrderState.部分收货)?.OrderCount ?? 0,
WaitPurchaseCount = orderCountGroup.Where(o => o.OrderState == Enums.OrderState.等待采购 ||
o.OrderState == Enums.OrderState.部分采购).Sum(o => o.OrderCount),
WaitShipmentCount = orderCountGroup.Where(o => o.OrderState == Enums.OrderState.待发货 ||
o.OrderState == Enums.OrderState.部分发货).Sum(o => o.OrderCount),
WaitReceiveCount = orderCountGroup.Where(o => o.OrderState == Enums.OrderState.待收货 ||
o.OrderState == Enums.OrderState.部分收货).Sum(o => o.OrderCount),
WaitCheckCount = orderCountGroup.FirstOrDefault(o => o.OrderState == Enums.OrderState.待验收)?.OrderCount ?? 0,
WaitComputationCount = orderCountGroup.FirstOrDefault(o => o.OrderState == Enums.OrderState.待核算)?.OrderCount ?? 0,
WaitConfigCount = waitConfigCount,

Write Preview
Loading…
Cancel
Save