调整异常订单判定条件

BBWY.Server.Business/Statistics/StatisticsBusiness.cs

@@ -375,7 +375,7 @@ namespace BBWY.Server.Business
                                                             o.IsGift == false &&
                                                             o.OrderState != Enums.OrderState.已取消 &&
                                                             ((o.StorageType != Enums.StorageType.SD && o.StorageType != null && oc.PurchaseAmount == 0M) ||
-                                                             (o.StorageType != Enums.StorageType.SD && oc.PurchaseAmount + oc.DeliveryExpressFreight > o.OrderSellerPrice + o.FreightPrice) ||
+                                                             (o.StorageType != Enums.StorageType.SD && oc.PurchaseAmount + oc.DeliveryExpressFreight > o.OrderSellerPrice + o.FreightPrice + o.PingTaiChengDanYouHuiQuan) ||
                                                              (o.StorageType == null && o.OrderState != Enums.OrderState.等待采购))).Count();
 
             response.WaitOutStoreCount = fsql.Select<Order>().Where(o => o.ShopId == shopId && o.OrderState == Enums.OrderState.待出库 && o.StartTime >= dt &&

BBWY.Server.Business/TestBusiness.cs

@@ -189,6 +189,7 @@ namespace BBWY.Server.Business
                                                       o.StartTime >= request.StartTime &&
                                                       o.StartTime <= request.EndTime)
                                           .WhereIf(!string.IsNullOrEmpty(request.OrderId), o => o.Id == request.OrderId)
+                                          .WhereIf(request.OrderIdList != null && request.OrderIdList.Count() > 0, o => request.OrderIdList.Contains(o.Id))
                                           .OrderByDescending(o => o.StartTime)
                                           .ToList(o => o.Id);
 

BBWY.Server.Model/Dto/Request/Test/RepairSkuDetailAndSkuGriooProfit.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace BBWY.Server.Model.Dto
 {
@@ -11,5 +12,7 @@ namespace BBWY.Server.Model.Dto
         public long? ShopId { get; set; }
 
         public string OrderId { get; set; }
+
+        public List<string> OrderIdList { get; set; }
     }
 }