排除赠品

BBWY.Server.Business/Statistics/StatisticsBusiness.cs

@@ -296,6 +296,7 @@ namespace BBWY.Server.Business
             var afterDt = DateTime.Parse("2022-10-01");
             var response = new OrderCountStatisticsResponse();
             response.WaitPurchaseCount = fsql.Select<Order>().Where(o => o.ShopId == shopId &&
+                                                                         o.IsGift == false &&
                                                                          o.OrderState == Enums.OrderState.等待采购 && o.StartTime >= dt).Count();
 
             response.ExceptionCount = fsql.Select<Order, OrderCost>().LeftJoin((o, oc) => o.Id == oc.OrderId)
@@ -306,7 +307,8 @@ namespace BBWY.Server.Business
                                                              (o.StorageType != Enums.StorageType.SD && oc.PurchaseAmount + oc.DeliveryExpressFreight > o.OrderSellerPrice + o.FreightPrice) ||
                                                              (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).Count();
+            response.WaitOutStoreCount = fsql.Select<Order>().Where(o => o.ShopId == shopId && o.OrderState == Enums.OrderState.待出库 && o.StartTime >= dt &&
+                                                                         o.IsGift == false).Count();
 
             response.AfterSaleOrderUnhandleCount = fsql.Select<AfterSaleOrder>().Where(aso => aso.ShopId == shopId && (aso.ProductHealth == null || aso.ProductResult == null) && aso.CreateTime >= afterDt).Count();
             return response;