diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs index 436982dd..62419d7a 100644 --- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs +++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs @@ -205,7 +205,6 @@ namespace BBWY.Client.ViewModels EditAfterSaleOrderRefundPurchaseAmountCommand = new RelayCommand(EditAfterSaleOrderRefundPurchaseAmount); FindAfterSaleOrderCommand = new RelayCommand(FindAfterSaleOrder); SearchOrderCommand.Execute(null); - Task.Factory.StartNew(LoadOrderCount); } private void InitSearchParam() @@ -245,7 +244,6 @@ namespace BBWY.Client.ViewModels { InitSearchParam(); this.OrderState = orderState; - Task.Factory.StartNew(LoadOrderCount); Task.Factory.StartNew(() => LoadOrder(1)); //选择状态查询订单 } @@ -253,7 +251,6 @@ namespace BBWY.Client.ViewModels { InitSearchParam(); IncludeExceptionOrder = true; - Task.Factory.StartNew(LoadOrderCount); Task.Factory.StartNew(() => LoadOrder(1)); } @@ -261,7 +258,6 @@ namespace BBWY.Client.ViewModels { InitSearchParam(); IncludeAfterOrder = true; - Task.Factory.StartNew(LoadOrderCount); Task.Factory.StartNew(() => LoadOrder(1)); } @@ -338,6 +334,7 @@ namespace BBWY.Client.ViewModels LoadAfterSaleOrder(pageIndex); else LoadNormalOrder(pageIndex); + LoadOrderCount(); } private void LoadNormalOrder(int pageIndex) @@ -427,7 +424,7 @@ namespace BBWY.Client.ViewModels private void LoadOrderCount() { - var response = statisticsService.GetOrderCountStatistics(globalContext.User.Shop.ShopId, DateTime.Now.Date.AddMonths(-1), DateTime.Now.Date); + var response = statisticsService.GetOrderCountStatistics(globalContext.User.Shop.ShopId, StartDate, EndDate); if (!response.Success) return; WaitPurchaseOrderCount = response.Data.WaitPurchaseCount; diff --git a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs index 02b3b003..76abb29b 100644 --- a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs +++ b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs @@ -263,8 +263,8 @@ namespace BBWY.Server.Business o.OrderState == Enums.OrderState.等待采购).Count(); response.ExceptionCount = fsql.Select().LeftJoin((o, oc) => o.Id == oc.OrderId) - .Where((o, oc) => o.StartTime >= startDate && - o.StartTime <= endDate && + .Where((o, oc) => o.ShopId == shopId && o.StartTime >= startDate && + o.StartTime <= endDate && o.StorageType != null && o.StorageType != Enums.StorageType.SD && (oc.PurchaseAmount == 0M || oc.PurchaseAmount +