|
|
@ -80,7 +80,7 @@ namespace BBWY.Server.Business |
|
|
|
.WhereIf(searchOrderRequest.IncludeExceptionOrder, |
|
|
|
(o, ocs, oct, sh) => o.OrderState != Enums.OrderState.已取消 && |
|
|
|
((o.StorageType != Enums.StorageType.SD && o.StorageType != null && oct.PurchaseAmount == 0M) || |
|
|
|
(o.StorageType != Enums.StorageType.SD && oct.PurchaseAmount + oct.DeliveryExpressFreight > o.OrderSellerPrice + o.FreightPrice) || |
|
|
|
(o.StorageType != Enums.StorageType.SD && oct.PurchaseAmount + oct.DeliveryExpressFreight > o.OrderSellerPrice + o.FreightPrice + o.PingTaiChengDanYouHuiQuan) || |
|
|
|
(o.StorageType == null && o.OrderState != Enums.OrderState.等待采购))) |
|
|
|
.WhereIf(searchOrderRequest.OnlyDF, (o, ocs, oct, sh) => o.StorageType == Enums.StorageType.代发) |
|
|
|
.WhereIf(searchOrderRequest.ExcludeCanceled, (o, ocs, oct, sh) => o.OrderState != Enums.OrderState.已取消) |
|
|
|