更新异常单规则

BBWY.Client/Models/Order/Order.cs

@@ -237,11 +237,19 @@ namespace BBWY.Client.Models
         {
             get
             {
+                //var beforeTotalCost = OrderCost?.BeforeTotalCost ?? 0M;
+                //return OrderState != OrderState.已取消 && StorageType != Models.StorageType.SD &&
+                //       ((StorageType != null && beforeTotalCost == 0M) ||
+                //        (beforeTotalCost > OrderSellerPrice + FreightPrice + PingTaiChengDanYouHuiQuan) ||
+                //        (StorageType == null && OrderState != OrderState.等待采购 && OrderState != OrderState.待付款));
+
                 var beforeTotalCost = OrderCost?.BeforeTotalCost ?? 0M;
-                return OrderState != OrderState.已取消 && StorageType != Models.StorageType.SD &&
-                       ((StorageType != null && beforeTotalCost == 0M) ||
-                        (beforeTotalCost > OrderSellerPrice + FreightPrice + PingTaiChengDanYouHuiQuan) ||
-                        (StorageType == null && OrderState != OrderState.等待采购 && OrderState != OrderState.待付款));
+                var profit = OrderCost?.Profit ?? 0M;
+                return (OrderState != OrderState.已取消 && 
+                        StorageType != Models.StorageType.SD &&
+                        StorageType != null &&
+                       (beforeTotalCost == 0M || profit < 0M)) ||
+                        (StorageType == null && OrderState != OrderState.等待采购 && OrderState != OrderState.待付款);
             }
         }
 

BBWY.Server.Business/Order/OrderBusiness.cs

@@ -78,10 +78,13 @@ namespace BBWY.Server.Business
                                .WhereIf(searchOrderRequest.StartDate != null, (o, ocs, oct, sh) => o.StartTime >= searchOrderRequest.StartDate)
                                .WhereIf(searchOrderRequest.EndDate != null, (o, ocs, oct, sh) => o.StartTime <= searchOrderRequest.EndDate)
                                .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.PingTaiChengDanYouHuiQuan) ||
-                                                         (o.StorageType == null && o.OrderState != Enums.OrderState.等待采购)))
+                                        (o, ocs, oct, sh) => (o.OrderState != Enums.OrderState.已取消 &&
+                                                              o.StorageType != Enums.StorageType.SD &&
+                                                              o.StorageType != null &&
+                                                                (oct.PurchaseAmount == 0M || oct.Profit < 0)) ||
+                                                             (o.StorageType == null && 
+                                                              o.OrderState != Enums.OrderState.等待采购 && 
+                                                              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.已取消)
                                .WhereIf(searchOrderRequest.ExcludeSD && !searchOrderRequest.OnlyDF, (o, ocs, oct, sh) => o.StorageType == null || o.StorageType != Enums.StorageType.SD)