1

BBWY.Server.Business/Order/OrderBusiness.cs

@@ -61,9 +61,9 @@ namespace BBWY.Server.Business
                                .WhereIf(searchOrderRequest.StartDate != null, (o, ocs, oct) => o.StartTime >= searchOrderRequest.StartDate)
                                .WhereIf(searchOrderRequest.EndDate != null, (o, ocs, oct) => o.StartTime <= searchOrderRequest.EndDate)
                                .WhereIf(searchOrderRequest.IncludeExceptionOrder,
-                                        (o, ocs, oct) => o.OrderState != Enums.OrderState.已取消 && o.StorageType != Enums.StorageType.SD &&
-                                                         ((o.StorageType != null && oct.PurchaseAmount == 0M) ||
-                                                         (oct.PurchaseAmount + oct.DeliveryExpressFreight > o.OrderSellerPrice + o.FreightPrice) ||
+                                        (o, ocs, oct) => 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 == null && o.OrderState != Enums.OrderState.等待采购)))
                                .WhereIf(searchOrderRequest.OnlyDF, (o, ocs, oct) => o.StorageType == Enums.StorageType.代发)
                                .WhereIf(searchOrderRequest.ExcludeCanceled, (o, ocs, oct) => o.OrderState != Enums.OrderState.已取消)