|
|
@ -71,9 +71,10 @@ 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.已取消) |
|
|
|
.WhereIf(request.IsWaitConfig, (o, ocs, oct) => o.IntoStoreType == Enums.IntoStoreType.发回齐越) |
|
|
|
.WhereIf(request.IsWaitConfig, (o, ocs, oct) => o.IsPurchased == true) |
|
|
|
select = select.WhereIf(request.IsWaitConfig, (o, ocs, oct) => o.OrderState != Enums.OrderState.已取消 && |
|
|
|
o.OrderState != Enums.OrderState.已完成 && |
|
|
|
o.IntoStoreType == Enums.IntoStoreType.发回齐越 && |
|
|
|
o.IsPurchased == true) |
|
|
|
.Where((o, ocs, oct) => childSelect.Where(osku => osku.OrderId == o.Id).Any()); |
|
|
|
|
|
|
|
if (request.IsWaitConfig && request.IsOnlyDisplayCerConfigTimeOut == 1) |
|
|
|