From 17cd1c43dd6a9e31b98f0cebdc1342d7daf9ad6e Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Fri, 11 Nov 2022 03:03:50 +0800
Subject: [PATCH] 10058

---
 BBWY.Client/Views/MainWindow.xaml                     |  2 +-
 BBWY.Client/Views/Order/OrderList.xaml                | 10 ++++++++--
 BBWY.Server.Business/Statistics/StatisticsBusiness.cs |  9 +++++----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/BBWY.Client/Views/MainWindow.xaml b/BBWY.Client/Views/MainWindow.xaml
index 96f66987..366d7947 100644
--- a/BBWY.Client/Views/MainWindow.xaml
+++ b/BBWY.Client/Views/MainWindow.xaml
@@ -26,7 +26,7 @@
                 <!--<TextBlock Text="{Binding GlobalContext.User.TeamName}" Margin="5,0,0,0"/>
                 <TextBlock Text="{Binding GlobalContext.User.Shop.Platform}" Margin="5,0,0,0"/>-->
                 <TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}"  Margin="5,0,0,0"/>
-                <TextBlock Text="v10057" Margin="5,0,0,0"/>
+                <TextBlock Text="v10058" Margin="5,0,0,0"/>
             </StackPanel>
         </Border>
         <Grid Grid.Row="1">
diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml
index 2f7fb8d7..da0c7778 100644
--- a/BBWY.Client/Views/Order/OrderList.xaml
+++ b/BBWY.Client/Views/Order/OrderList.xaml
@@ -207,11 +207,17 @@
                         </TextBlock>
                     </c:BButton.Content>
                 </c:BButton>
-                <c:BButton Content="售后单" Width="100"
+                <c:BButton Width="100"
                            Background="{Binding IncludeAfterOrder,Converter={StaticResource objConverter},ConverterParameter=true:#8080FF:#F2F2F2}"
                            Foreground="{Binding IncludeAfterOrder,Converter={StaticResource objConverter},ConverterParameter=true:White:#4A4A4A}"
                            Command="{Binding SetIncludeAfterOrderCommand}"
-                           Visibility="{Binding IsSDGroup,ConverterParameter=true:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
+                           Visibility="{Binding IsSDGroup,ConverterParameter=true:Collapsed:Visible,Converter={StaticResource objConverter}}">
+                    <TextBlock>
+                            <Run Text="售后单"/>
+                            <Run Text="{Binding AfterSaleOrderUnhandleCount,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
+                                 Foreground="{StaticResource Text.Pink}"/>
+                    </TextBlock>
+                </c:BButton>
             </StackPanel>
 
             <Border x:Name="bd_statistics" Grid.RowSpan="3" HorizontalAlignment="Right" Padding="15,0" TextBlock.Foreground="{StaticResource Text.Color}">
diff --git a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs
index b4378d03..d075c335 100644
--- a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs
+++ b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs
@@ -292,20 +292,21 @@ namespace BBWY.Server.Business
         {
             //startDate = startDate.Date;
             //endDate = endDate.Date.AddDays(1).AddSeconds(-1);
+            var dt = DateTime.Parse("2022-05-01");
             var response = new OrderCountStatisticsResponse();
             response.WaitPurchaseCount = fsql.Select<Order>().Where(o => o.ShopId == shopId &&
-                                                                         o.OrderState == Enums.OrderState.等待采购).Count();
+                                                                         o.OrderState == Enums.OrderState.等待采购 && o.StartTime >= dt).Count();
 
             response.ExceptionCount = fsql.Select<Order, OrderCost>().LeftJoin((o, oc) => o.Id == oc.OrderId)
-                                          .Where((o, oc) => o.ShopId == shopId && 
+                                          .Where((o, oc) => o.ShopId == shopId && o.StartTime >= dt &&
                                                             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 == null && o.OrderState != Enums.OrderState.等待采购))).Count();
 
-            response.WaitOutStoreCount = fsql.Select<Order>().Where(o => o.ShopId == shopId && o.OrderState == Enums.OrderState.待出库).Count();
+            response.WaitOutStoreCount = fsql.Select<Order>().Where(o => o.ShopId == shopId && o.OrderState == Enums.OrderState.待出库 && o.StartTime >= dt).Count();
 
-            response.AfterSaleOrderUnhandleCount = fsql.Select<AfterSaleOrder>().Where(aso => aso.ProductHealth == null || aso.ProductResult == null).Count();
+            response.AfterSaleOrderUnhandleCount = fsql.Select<AfterSaleOrder>().Where(aso => aso.ShopId == shopId && aso.ProductHealth == null || aso.ProductResult == null && aso.CreateTime >= dt).Count();
             return response;
         }