From f60f9aacc9671eacc63d4b10cbd2526d47fed047 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Sun, 11 Sep 2022 15:59:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/ViewModels/Order/OrderListViewModel.cs    | 7 ++-----
 BBWY.Server.Business/Statistics/StatisticsBusiness.cs | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

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<AfterSaleOrder>(EditAfterSaleOrderRefundPurchaseAmount);
             FindAfterSaleOrderCommand = new RelayCommand<object>(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<Order, OrderCost>().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 +