From 3ec93dc4b1efcf0f7ff9af825cab8ca06d692ecd Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Fri, 30 Sep 2022 01:25:05 +0800
Subject: [PATCH] 10048

---
 .../Response/Shop/ShopPopularizeResponse.cs   |  18 +
 .../ToDayOrderAchievementResponse.cs          |  33 +-
 .../Statistics/ToDayOrderAchievement.cs       |  25 +-
 .../ViewModels/Order/OrderListViewModel.cs    |   9 +-
 BBWY.Client/Views/MainWindow.xaml             |   2 +-
 BBWY.Client/Views/Order/OrderList.xaml        | 356 ++++++++++++------
 BBWY.Client/Views/Order/OrderList.xaml.cs     |   1 +
 BBWY.Client/Views/Order/OrderListControl.xaml |  13 +-
 8 files changed, 325 insertions(+), 132 deletions(-)
 create mode 100644 BBWY.Client/Models/APIModel/Response/Shop/ShopPopularizeResponse.cs

diff --git a/BBWY.Client/Models/APIModel/Response/Shop/ShopPopularizeResponse.cs b/BBWY.Client/Models/APIModel/Response/Shop/ShopPopularizeResponse.cs
new file mode 100644
index 00000000..cd9649a5
--- /dev/null
+++ b/BBWY.Client/Models/APIModel/Response/Shop/ShopPopularizeResponse.cs
@@ -0,0 +1,18 @@
+using System;
+
+namespace BBWY.Client.Models
+{
+
+    public class ShopPopularizeResponse
+    {
+        public decimal Cost { get; set; } = 0.0M;
+
+        //public DateTime? Date { get; set; }
+
+        public string ItemName { get; set; }
+
+        public long? ShopId { get; set; }
+
+    }
+
+}
diff --git a/BBWY.Client/Models/APIModel/Response/Statistics/ToDayOrderAchievementResponse.cs b/BBWY.Client/Models/APIModel/Response/Statistics/ToDayOrderAchievementResponse.cs
index e4d26363..63e9430c 100644
--- a/BBWY.Client/Models/APIModel/Response/Statistics/ToDayOrderAchievementResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/Statistics/ToDayOrderAchievementResponse.cs
@@ -1,4 +1,7 @@
-namespace BBWY.Client.Models
+using System;
+using System.Collections.Generic;
+
+namespace BBWY.Client.Models
 {
     public class ToDayOrderAchievementResponse
     {
@@ -44,8 +47,34 @@
         public decimal TotalCost { get; set; }
 
         /// <summary>
-        /// 广告统计(海投,快车)
+        /// 广告统计(海投,快车,包含SD)
         /// </summary>
         public decimal AdvCost { get; set; }
+
+
+        /// <summary>
+        /// 人工成本
+        /// </summary>
+        public decimal EmployeeCost { get; set; }
+
+        /// <summary>
+        /// 税务成本
+        /// </summary>
+        public decimal TaxCost { get; set; }
+
+        /// <summary>
+        /// SD成本
+        /// </summary>
+        public decimal SDCost { get; set; }
+
+        /// <summary>
+        /// 推广花费截至时间
+        /// </summary>
+        public DateTime? PularizeEndDate { get; set; }
+
+        /// <summary>
+        /// 推广成本明细
+        /// </summary>
+        public IList<ShopPopularizeResponse> ShoppopularizeList { get; set; }
     }
 }
diff --git a/BBWY.Client/Models/Statistics/ToDayOrderAchievement.cs b/BBWY.Client/Models/Statistics/ToDayOrderAchievement.cs
index ead5828c..13160a42 100644
--- a/BBWY.Client/Models/Statistics/ToDayOrderAchievement.cs
+++ b/BBWY.Client/Models/Statistics/ToDayOrderAchievement.cs
@@ -1,7 +1,16 @@
-namespace BBWY.Client.Models
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+namespace BBWY.Client.Models
 {
     public class ToDayOrderAchievement : NotifyObject
     {
+        public ToDayOrderAchievement()
+        {
+            ShoppopularizeList = new ObservableCollection<ShopPopularizeResponse>();
+        }
+
         private decimal saleAmount;
         private decimal profit;
         private decimal profitRaito;
@@ -11,6 +20,12 @@
         private decimal platformCommissionAmount;
         private decimal totalCost;
         private decimal advCost;
+        private decimal sdCost;
+        private decimal taxCost;
+        private decimal employereCost;
+        private DateTime? pularizeEndDate;
+
+        public IList<ShopPopularizeResponse> ShoppopularizeList { get; set; }
 
         /// <summary>
         /// 销售额
@@ -52,5 +67,13 @@
         /// 广告推广
         /// </summary>
         public decimal AdvCost { get => advCost; set { Set(ref advCost, value); } }
+
+        public decimal SdCost { get => sdCost; set { Set(ref sdCost, value); } }
+
+        public decimal TaxCost { get => taxCost; set { Set(ref taxCost, value); } }
+
+        public decimal EmployereCost { get => employereCost; set { Set(ref employereCost, value); } }
+
+        public DateTime? PularizeEndDate { get => pularizeEndDate; set { Set(ref pularizeEndDate, value); } }
     }
 }
diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
index 68b5541f..08462a8b 100644
--- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
+++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
@@ -252,6 +252,11 @@ namespace BBWY.Client.ViewModels
                 ToDayOrderAchievement.PurchaseAmount = 0;
                 ToDayOrderAchievement.SaleAmount = 0;
                 ToDayOrderAchievement.SaleAmount = 0M;
+                ToDayOrderAchievement.EmployereCost = 0M;
+                ToDayOrderAchievement.TaxCost = 0M;
+                ToDayOrderAchievement.SdCost = 0M;
+                ToDayOrderAchievement.PularizeEndDate = null;
+                ToDayOrderAchievement.ShoppopularizeList.Clear();
             }
             PageIndex = 1;
             OrderCount = 0;
@@ -359,7 +364,7 @@ namespace BBWY.Client.ViewModels
             }
             else
             {
-                Task.Factory.StartNew(()=> LoadSDGroupPersonStatistics());
+                Task.Factory.StartNew(() => LoadSDGroupPersonStatistics());
             }
         }
 
@@ -446,7 +451,7 @@ namespace BBWY.Client.ViewModels
             var response = statisticsService.GetTodayAchievementStatistics(startTime, endTime, shopId);
             if (!response.Success)
                 return;
-            _ = response.Data.Map(ToDayOrderAchievement);
+            App.Current.Dispatcher.Invoke(() => response.Data.Map(ToDayOrderAchievement));
         }
 
         private void LoadOrderCount(DateTime startDate, DateTime endDate, long shopId)
diff --git a/BBWY.Client/Views/MainWindow.xaml b/BBWY.Client/Views/MainWindow.xaml
index 387a2dd1..20392d3f 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="v10047" Margin="5,0,0,0"/>
+                <TextBlock Text="v10048" 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 b8c233a4..5fe95cdb 100644
--- a/BBWY.Client/Views/Order/OrderList.xaml
+++ b/BBWY.Client/Views/Order/OrderList.xaml
@@ -14,7 +14,7 @@
       d:DesignHeight="450" d:DesignWidth="2048"
       Title="OrderList">
     <Page.Resources>
-       
+
         <sys:Int32 x:Key="d0">0</sys:Int32>
         <sys:Int32 x:Key="d1">1</sys:Int32>
         <sys:Int32 x:Key="d3">2</sys:Int32>
@@ -27,19 +27,113 @@
         <c:RoundWaitProgress Play="{Binding IsLoading}" Panel.ZIndex="999"/>
         <Grid Margin="5,0">
             <Grid.RowDefinitions>
-                <RowDefinition Height="30"/>
-                <RowDefinition Height="5"/>
                 <RowDefinition Height="auto"/>
                 <RowDefinition Height="5"/>
                 <RowDefinition Height="30"/>
                 <RowDefinition Height="5"/>
                 <RowDefinition Height="30"/>
+                <RowDefinition Height="5"/>
+                <RowDefinition Height="30"/>
                 <RowDefinition/>
                 <RowDefinition Height="30"/>
             </Grid.RowDefinitions>
-            <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
-                <!--Background="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=#null:#8080FF:#F2F2F2}"
-                Foreground="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=#null:White:#4A4A4A}"-->
+
+            <Grid Background="{StaticResource Border.Background}" HorizontalAlignment="Left" Height="75" Panel.ZIndex="999">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition Width="auto"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="5"/>
+                    <RowDefinition Height="0.5*"/>
+                </Grid.RowDefinitions>
+                <StackPanel Orientation="Horizontal" Margin="0,5,0,0" Height="30">
+                    <StackPanel.Resources>
+                        <Style TargetType="DatePickerTextBox">
+                            <Setter Property="IsReadOnly" Value="True"/>
+                        </Style>
+                    </StackPanel.Resources>
+                    <TextBlock Text="下单时间" VerticalAlignment="Center" Margin="5,0,0,0"/>
+                    <DatePicker SelectedDate="{Binding StartDate}" Width="133.5" Height="30" VerticalContentAlignment="Center" FocusVisualStyle="{x:Null}" Margin="5,0,0,0"/>
+                    <DatePicker SelectedDate="{Binding EndDate}" Width="133.5" Height="30" VerticalContentAlignment="Center" FocusVisualStyle="{x:Null}" Margin="5,0,0,0"/>
+                    <TextBlock Text="订单号" VerticalAlignment="Center" Margin="5,0,0,0"/>
+                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchOrderId}" WaterRemark="精确匹配"/>
+                    <TextBlock Text="SPU" VerticalAlignment="Center" Margin="5,0,0,0"/>
+                    <c:BTextBox Width="150" Margin="5,0,0,0" WaterRemark="精确匹配" Text="{Binding SearchProductId}"/>
+                    <TextBlock Text="SKU" VerticalAlignment="Center" Margin="5,0,0,0"/>
+                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchSku}" WaterRemark="精确匹配"/>
+                    <!--<TextBlock Text="下单账号" VerticalAlignment="Center" Margin="5,0,0,0"/>
+                    <c:BTextBox Width="150" Margin="5,0,0,0" WaterRemark="暂不支持" IsEnabled="False"
+                                DisableBgColor="{StaticResource TextBox.Disable.BgColor}"/>-->
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" Grid.Row="2" Margin="0,0,0,5" Height="30">
+                    <c:BButton Content="今天" Width="50" Height="25" Margin="5,0,0,0"
+                               Command="{Binding SetSearchDateCommand}"
+                               CommandParameter="{StaticResource d0}"/>
+                    <c:BButton Content="昨天" Width="50" Height="25" Margin="5,0,0,0"
+                               Command="{Binding SetSearchDateCommand}"
+                               CommandParameter="{StaticResource d1}"/>
+                    <c:BButton Content="近3天" Width="50" Height="25" Margin="5,0,0,0"
+                               Command="{Binding SetSearchDateCommand}"
+                               CommandParameter="{StaticResource d3}"/>
+                    <c:BButton Content="近7天" Width="50" Height="24" Margin="5,0,0,0"
+                               Command="{Binding SetSearchDateCommand}"
+                               CommandParameter="{StaticResource d7}"/>
+                    <c:BButton Content="近15天" Width="50" Height="25" Margin="5,0,0,0"
+                               Command="{Binding SetSearchDateCommand}"
+                               CommandParameter="{StaticResource d15}"/>
+                    <c:BButton Content="近30天" Width="50" Height="25" Margin="5,0,0,0"
+                               Command="{Binding SetSearchDateCommand}"
+                               CommandParameter="{StaticResource d30}"/>
+                    <TextBlock Text="服务单" VerticalAlignment="Center" Margin="5,0,0,0"
+                               Visibility="{Binding IncludeAfterOrder,ConverterParameter=true:Visible:Collapsed,Converter={StaticResource objConverter}}"/>
+                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchServiceId}" WaterRemark="精确匹配"
+                               Visibility="{Binding IncludeAfterOrder,ConverterParameter=true:Visible:Collapsed,Converter={StaticResource objConverter}}"/>
+                    <TextBlock Text="快递单" VerticalAlignment="Center" Margin="5,0,0,0"
+                               Visibility="{Binding Visibility,ElementName=listbox_order}"/>
+                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchWaybill}" WaterRemark="前缀模糊匹配"
+                                Visibility="{Binding Visibility,ElementName=listbox_order}"/>
+                    <TextBlock Text="货号" VerticalAlignment="Center" Margin="5,0,0,0" Visibility="{Binding Visibility,ElementName=listbox_order}"/>
+                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchProductNo}" WaterRemark="精确匹配" Visibility="{Binding Visibility,ElementName=listbox_order}"/>
+                    <TextBlock VerticalAlignment="Center" Margin="5,0,0,0" Visibility="{Binding Visibility,ElementName=listbox_order}">
+                        <Run Text="客户"/>
+                        <LineBreak/>
+                        <Run Text="姓名"/>
+                    </TextBlock>
+                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchContactName}" WaterRemark="精确匹配" Visibility="{Binding Visibility,ElementName=listbox_order}"/>
+
+                    <c:BButton Content="同步" Width="50" Margin="5,0,0,0" Command="{Binding SyncOrderCommand}" ToolTipService.InitialShowDelay="0" ToolTipService.ShowDuration="10000"
+                               Visibility="Collapsed">
+                        <c:BButton.ToolTip>
+                            <StackPanel>
+                                <TextBlock Text="1.使用筛选条件中的开始时间和结束时间进行同步"/>
+                                <TextBlock Text="2.从开始时间起每次同步3小时时长的订单直到到达结束时间"/>
+                                <TextBlock Text="3.已存在未结束的同步任务将不会重复执行"/>
+                            </StackPanel>
+                        </c:BButton.ToolTip>
+                    </c:BButton>
+                </StackPanel>
+
+                <Grid Grid.Column="1" Grid.RowSpan="3">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition/>
+                        <RowDefinition/>
+                    </Grid.RowDefinitions>
+                    <Button Content="搜索" Width="50" VerticalAlignment="Stretch" Margin="5,0,0,0" Command="{Binding SearchOrderCommand}"
+                           Grid.RowSpan="2" Background="{StaticResource Button.Selected.Background}" BorderThickness="0" Foreground="White"/>
+                    <Button Content="导出" Command="{Binding ExportCommand}" Width="50" Grid.Column="1"
+                               Visibility="{Binding Visibility,ElementName=listbox_order}" Background="#1CC2A2" BorderThickness="0" Foreground="White"/>
+                    <Button Content="同步" Command="{Binding SyncOrderCommand}" Width="50" Grid.Column="1" Grid.Row="1"
+                               Visibility="{Binding Visibility,ElementName=listbox_order}" Background="#02A7F0" BorderThickness="0" Foreground="White"/>
+                </Grid>
+            </Grid>
+
+            <StackPanel Grid.Row="2" HorizontalAlignment="Left" Orientation="Horizontal">
                 <c:BButton Content="近一个月订单" Width="100"
                            Command="{Binding SetOrderStateCommand}" CommandParameter="{x:Null}"
                            Visibility="{Binding IsSDGroup,ConverterParameter=true:Collapsed:Visible,Converter={StaticResource objConverter}}">
@@ -120,112 +214,117 @@
                            Visibility="{Binding IsSDGroup,ConverterParameter=true:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
             </StackPanel>
 
-            <Grid Grid.Row="2" Background="{StaticResource Border.Background}">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="0.5*"/>
-                    <RowDefinition Height="5"/>
-                    <RowDefinition Height="0.5*"/>
-                </Grid.RowDefinitions>
-                <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
-                    <StackPanel.Resources>
-                        <Style TargetType="DatePickerTextBox">
-                            <Setter Property="IsReadOnly" Value="True"/>
-                        </Style>
-                    </StackPanel.Resources>
-                    <TextBlock Text="下单时间" VerticalAlignment="Center" Margin="5,0,0,0"/>
-                    <DatePicker SelectedDate="{Binding StartDate}" Width="133.5" Height="30" VerticalContentAlignment="Center" FocusVisualStyle="{x:Null}" Margin="5,0,0,0"/>
-                    <DatePicker SelectedDate="{Binding EndDate}" Width="133.5" Height="30" VerticalContentAlignment="Center" FocusVisualStyle="{x:Null}" Margin="5,0,0,0"/>
-                    <TextBlock Text="订单号" VerticalAlignment="Center" Margin="5,0,0,0"/>
-                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchOrderId}" WaterRemark="精确匹配"/>
-                    <TextBlock Text="SPU" VerticalAlignment="Center" Margin="5,0,0,0"/>
-                    <c:BTextBox Width="150" Margin="5,0,0,0" WaterRemark="精确匹配" Text="{Binding SearchProductId}"/>
-                    <TextBlock Text="SKU" VerticalAlignment="Center" Margin="5,0,0,0"/>
-                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchSku}" WaterRemark="精确匹配"/>
-                    <!--<TextBlock Text="下单账号" VerticalAlignment="Center" Margin="5,0,0,0"/>
-                    <c:BTextBox Width="150" Margin="5,0,0,0" WaterRemark="暂不支持" IsEnabled="False"
-                                DisableBgColor="{StaticResource TextBox.Disable.BgColor}"/>-->
-                    <c:BButton Content="搜索" Width="50" Margin="5,0,0,0" Command="{Binding SearchOrderCommand}"/>
-                </StackPanel>
-                <StackPanel Orientation="Horizontal" Grid.Row="2" Margin="0,0,0,5">
-                    <c:BButton Content="今天" Width="50" Height="25" Margin="5,0,0,0"
-                               Command="{Binding SetSearchDateCommand}"
-                               CommandParameter="{StaticResource d0}"/>
-                    <c:BButton Content="昨天" Width="50" Height="25" Margin="5,0,0,0"
-                               Command="{Binding SetSearchDateCommand}"
-                               CommandParameter="{StaticResource d1}"/>
-                    <c:BButton Content="近3天" Width="50" Height="25" Margin="5,0,0,0"
-                               Command="{Binding SetSearchDateCommand}"
-                               CommandParameter="{StaticResource d3}"/>
-                    <c:BButton Content="近7天" Width="50" Height="24" Margin="5,0,0,0"
-                               Command="{Binding SetSearchDateCommand}"
-                               CommandParameter="{StaticResource d7}"/>
-                    <c:BButton Content="近15天" Width="50" Height="25" Margin="5,0,0,0"
-                               Command="{Binding SetSearchDateCommand}"
-                               CommandParameter="{StaticResource d15}"/>
-                    <c:BButton Content="近30天" Width="50" Height="25" Margin="5,0,0,0"
-                               Command="{Binding SetSearchDateCommand}"
-                               CommandParameter="{StaticResource d30}"/>
-                    <TextBlock Text="服务单" VerticalAlignment="Center" Margin="5,0,0,0"
-                               Visibility="{Binding IncludeAfterOrder,ConverterParameter=true:Visible:Collapsed,Converter={StaticResource objConverter}}"/>
-                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchServiceId}" WaterRemark="精确匹配"
-                               Visibility="{Binding IncludeAfterOrder,ConverterParameter=true:Visible:Collapsed,Converter={StaticResource objConverter}}"/>
-                    <TextBlock Text="快递单" VerticalAlignment="Center" Margin="5,0,0,0"
-                               Visibility="{Binding Visibility,ElementName=listbox_order}"/>
-                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchWaybill}" WaterRemark="前缀模糊匹配"
-                                Visibility="{Binding Visibility,ElementName=listbox_order}"/>
-                    <TextBlock Text="货号" VerticalAlignment="Center" Margin="5,0,0,0" Visibility="{Binding Visibility,ElementName=listbox_order}"/>
-                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchProductNo}" WaterRemark="精确匹配" Visibility="{Binding Visibility,ElementName=listbox_order}"/>
-                    <TextBlock Text="客户姓名" VerticalAlignment="Center" Margin="5,0,0,0" Visibility="{Binding Visibility,ElementName=listbox_order}"/>
-                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchContactName}" WaterRemark="精确匹配" Visibility="{Binding Visibility,ElementName=listbox_order}"/>
-
-                    <c:BButton Content="同步" Width="50" Margin="5,0,0,0" Command="{Binding SyncOrderCommand}" ToolTipService.InitialShowDelay="0" ToolTipService.ShowDuration="10000"
-                               Visibility="Collapsed">
-                        <c:BButton.ToolTip>
-                            <StackPanel>
-                                <TextBlock Text="1.使用筛选条件中的开始时间和结束时间进行同步"/>
-                                <TextBlock Text="2.从开始时间起每次同步3小时时长的订单直到到达结束时间"/>
-                                <TextBlock Text="3.已存在未结束的同步任务将不会重复执行"/>
-                            </StackPanel>
-                        </c:BButton.ToolTip>
-                    </c:BButton>
-                    <c:BButton Content="导出" Command="{Binding ExportCommand}" Width="50" Margin="5,0,0,0"
-                               Visibility="{Binding Visibility,ElementName=listbox_order}"/>
-                    <c:BButton Content="同步" Command="{Binding SyncOrderCommand}" Width="50" Margin="5,0,0,0"
-                               Visibility="{Binding Visibility,ElementName=listbox_order}"/>
-                </StackPanel>
-            </Grid>
-
-            <Grid Grid.Row="2" HorizontalAlignment="Right" Width="370">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="80"/>
-                    <ColumnDefinition/>
-                    <ColumnDefinition Width="auto"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="0.5*"/>
-                    <RowDefinition Height="0.5*"/>
-                </Grid.RowDefinitions>
-                <TextBlock Style="{StaticResource middleTextBlock}" FontSize="25" Foreground="{StaticResource Text.Pink}" Grid.RowSpan="2">
-                    <Run Text="业绩"/>
+            <Border x:Name="bd_statistics" Grid.RowSpan="3" HorizontalAlignment="Right" Padding="15,0" TextBlock.Foreground="{StaticResource Text.Color}">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="0.4*"/>
+                        <ColumnDefinition Width="0.4*"/>
+                        <ColumnDefinition Width="0.2*"/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="0.5*"/>
+                        <RowDefinition Height="0.5*"/>
+                    </Grid.RowDefinitions>
+
+                    <Grid Grid.ColumnSpan="3" Grid.RowSpan="2" Margin="-10,0">
+                        <Grid.Effect>
+                            <DropShadowEffect BlurRadius="10" ShadowDepth="0" Direction="0" Color="#DCDCDC"/>
+                        </Grid.Effect>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="0.5*"/>
+                            <RowDefinition Height="0.5*"/>
+                        </Grid.RowDefinitions>
+                        <Border Background="{StaticResource Button.Selected.Background}">
+                          
+                        </Border>
+                        <Border Background="white" Grid.Row="1">
+                            
+                        </Border>
+                    </Grid>
+                    
+                    <TextBlock VerticalAlignment="Center"  Foreground="White">
+                    <Run Text="成交额"/>
                     <LineBreak/>
-                    <Run Text="统计"/>
-                </TextBlock>
+                    <Run Text="{Binding ToDayOrderAchievement.SaleAmount}" FontSize="24"/>
+                    </TextBlock>
 
-                <TextBlock Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left">
-                    <Run Text="销售额"/>
+                    <TextBlock Grid.Column="1" VerticalAlignment="Center" Foreground="White" Margin="10,0">
+                    <Run Text="利润至"/>
+                    <Run Text="{Binding ToDayOrderAchievement.PularizeEndDate,StringFormat=yyyy-MM-dd}"/>
                     <LineBreak/>
-                    <Run Text="{Binding ToDayOrderAchievement.SaleAmount}"/>
-                </TextBlock>
+                    <Run Text="{Binding ToDayOrderAchievement.Profit}" FontSize="24"/>
+                    <Run Text="{Binding ToDayOrderAchievement.ProfitRaito,StringFormat=({0}%)}"/>
+                    </TextBlock>
 
-                <TextBlock Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="0,0,5,0">
-                    <Run Text="利润"/>
+                    <TextBlock Grid.Column="2" VerticalAlignment="Center" Foreground="White">
+                    <Run Text="总单量"/>
                     <LineBreak/>
-                    <Run Text="{Binding ToDayOrderAchievement.Profit}"/>
-                    <Run Text="{Binding ToDayOrderAchievement.ProfitRaito,StringFormat=({0}%)}"/>
-                </TextBlock>
+                    <Run Text="{Binding ToDayOrderAchievement.OrderCount}" FontSize="24"/>
+                    </TextBlock>
 
-                <StackPanel Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Left"
+                    <StackPanel Grid.Row="1" VerticalAlignment="Center">
+                        <StackPanel Orientation="Horizontal" Margin="0,0,0,5">
+                            <TextBlock>
+                                <Run Text="货物成本"/>
+                                <Run Text="{Binding ToDayOrderAchievement.PurchaseAmount}"/>
+                            </TextBlock>
+                        </StackPanel>
+                        <TextBlock>
+                            <Run Text="平台扣点"/>
+                            <Run Text="{Binding ToDayOrderAchievement.PlatformCommissionAmount}"/>
+                        </TextBlock>
+                    </StackPanel>
+
+                    <StackPanel Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Margin="10,0">
+                        <StackPanel Orientation="Horizontal" Margin="0,0,0,5">
+                            <TextBlock>
+                                <Run Text="推广成本"/>
+                                <Run Text="{Binding ToDayOrderAchievement.AdvCost}"/>
+                            </TextBlock>
+                            <Path Style="{StaticResource path_question}" Fill="{StaticResource Text.Pink}" Width="14" Margin="5,0,0,0">
+                                <Path.ToolTip>
+                                    <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                        <StackPanel>
+                                            <ListBox ItemsSource="{Binding ToDayOrderAchievement.ShoppopularizeList}"
+                                                     ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
+                                                     Style="{StaticResource NoScrollViewListBoxStyle}"
+                                                     Foreground="{StaticResource Text.Color}">
+                                                <ListBox.ItemTemplate>
+                                                    <DataTemplate>
+                                                        <TextBlock>
+                                                            <Run Text="{Binding ItemName}"/>
+                                                            <Run Text="{Binding Cost}"/>
+                                                        </TextBlock>
+                                                    </DataTemplate>
+                                                </ListBox.ItemTemplate>
+                                            </ListBox>
+                                            <TextBlock>
+                                                <Run Text="SD成本"/>
+                                                <Run Text="{Binding ToDayOrderAchievement.SdCost}"/>
+                                            </TextBlock>
+                                        </StackPanel>
+                                    </ToolTip>
+                                </Path.ToolTip>
+                            </Path>
+                        </StackPanel>
+                        <TextBlock>
+                            <Run Text="人工成本"/>
+                            <Run Text="{Binding ToDayOrderAchievement.EmployereCost}"/>
+                        </TextBlock>
+                    </StackPanel>
+
+                    <StackPanel Grid.Row="1" Grid.Column="2" VerticalAlignment="Center">
+                        <TextBlock Margin="0,0,0,5">
+                            <Run Text="销售运费"/>
+                            <Run Text="{Binding ToDayOrderAchievement.DeliveryExpressFreight}"/>
+                        </TextBlock>
+                        <TextBlock>
+                            <Run Text="税务成本"/>
+                            <Run Text="{Binding ToDayOrderAchievement.TaxCost}"/>
+                        </TextBlock>
+                    </StackPanel>
+
+                    <!--<StackPanel Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Left"
                             Orientation="Horizontal">
                     <TextBlock>
                         <Run Text="成本总计"/>
@@ -252,10 +351,10 @@
                             </ToolTip>
                         </Path.ToolTip>
                     </Path>
-                </StackPanel>
+                </StackPanel>-->
 
 
-                <TextBlock Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left">
+                    <!--<TextBlock Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left">
                     <Run Text="订单数"/>
                     <LineBreak/>
                     <Run Text="{Binding ToDayOrderAchievement.OrderCount}"/>
@@ -271,8 +370,9 @@
                     <Run Text="平台扣点"/>
                     <LineBreak/>
                     <Run Text="{Binding ToDayOrderAchievement.PlatformCommissionAmount}"/>
-                </TextBlock>
-            </Grid>
+                </TextBlock>-->
+                </Grid>
+            </Border>
 
             <Border Grid.Row="4" Background="{StaticResource Border.Background}"
                     Visibility="{Binding Visibility,ElementName=listbox_order}">
@@ -282,7 +382,7 @@
                     <CheckBox Content="过滤已取消" Margin="5,0,0,0" IsChecked="{Binding ExcludeCanceled,Mode=OneWayToSource,UpdateSourceTrigger=PropertyChanged}"/>
                 </StackPanel>
             </Border>
-            
+
             <Border Grid.Row="4" Background="{StaticResource Border.Background}"
                     Visibility="{Binding Visibility,ElementName=listbox_afterSaleOrder}">
                 <StackPanel Orientation="Horizontal">
@@ -387,7 +487,9 @@
                                                     <ColumnDefinition/>
                                                 </Grid.ColumnDefinitions>
 
-                                                --><!--{Binding Logo}--><!--
+                                                -->
+            <!--{Binding Logo}-->
+            <!--
                                                 <c:BAsyncImage UrlSource="{Binding Logo}"
                                                                Width="80" DecodePixelWidth="80"
                                                                VerticalAlignment="Top" Margin="0,5,0,0"/>
@@ -484,13 +586,15 @@
                                     </ListBox.ItemContainerStyle>
                                     <ListBox.ItemTemplate>
                                         <DataTemplate>
-                                            --><!--<Grid x:Name="grid_storageType" 
+                                            -->
+            <!--<Grid x:Name="grid_storageType" 
                                                   Width="{Binding ActualWidth,ElementName=listbox_storageType}"
                                                   Margin="5" Height="25"
                                                   Background="{StaticResource Button.Normal.Background}">
                                                 <TextBlock x:Name="txt_storageType" Text="{Binding }" HorizontalAlignment="Center" VerticalAlignment="Center"
                                                            Margin="0,0,7,0"/>
-                                            </Grid>--><!--
+                                            </Grid>-->
+            <!--
                                             <c:BButton x:Name="btn_storageType" Content="{Binding }"
                                                        Width="{Binding ActualWidth,ElementName=listbox_storageType}"
                                                        Margin="5,5,5,0"  Height="25"
@@ -798,7 +902,8 @@
                                                                 </DataTemplate>
                                                             </ListBox.ItemTemplate>
                                                         </ListBox>
-                                                        --><!--<TextBlock Text="汇总" Grid.Row="2"/>
+                                                        -->
+            <!--<TextBlock Text="汇总" Grid.Row="2"/>
                                                         <Grid Grid.Row="3">
                                                             <Grid.RowDefinitions>
                                                                 <RowDefinition/>
@@ -806,7 +911,8 @@
                                                                 <RowDefinition/>
                                                             </Grid.RowDefinitions>
                                                             
-                                                        </Grid>--><!--
+                                                        </Grid>-->
+            <!--
                                                     </Grid>
                                                 </ToolTip>
                                             </Path.ToolTip>
@@ -1013,7 +1119,8 @@
                                                                 </DataTemplate>
                                                             </ListBox.ItemTemplate>
                                                         </ListBox>
-                                                        --><!--<TextBlock Text="汇总" Grid.Row="2"/>
+                                                        -->
+            <!--<TextBlock Text="汇总" Grid.Row="2"/>
                                                         <Grid Grid.Row="3">
                                                             <Grid.RowDefinitions>
                                                                 <RowDefinition/>
@@ -1021,7 +1128,8 @@
                                                                 <RowDefinition/>
                                                             </Grid.RowDefinitions>
                                                             
-                                                        </Grid>--><!--
+                                                        </Grid>-->
+            <!--
                                                     </Grid>
                                                 </ToolTip>
                                             </Path.ToolTip>
@@ -1140,9 +1248,11 @@
                             <DataTrigger Binding="{Binding WaybillNo}" Value="-10000">
                                 <Setter TargetName="btn_waybillCopy" Property="Visibility" Value="Collapsed"/>
                             </DataTrigger>
-                            --><!--<DataTrigger Binding="{Binding StoreName}" Value="">
+                            -->
+            <!--<DataTrigger Binding="{Binding StoreName}" Value="">
                                 <Setter TargetName="txt_storeName" Property="Visibility" Value="Collapsed"/>
-                            </DataTrigger>--><!--
+                            </DataTrigger>-->
+            <!--
                             <DataTrigger Binding="{Binding BuyerRemark}" Value="">
                                 <Setter TargetName="sp_buyerRemark" Property="Visibility" Value="Collapsed"/>
                             </DataTrigger>
@@ -1166,9 +1276,11 @@
                             <DataTrigger Binding="{Binding OrderCost.SDCommissionAmount}" Value="0">
                                 <Setter TargetName="txt_sdCommissionAmount" Property="Visibility" Value="Collapsed"/>
                             </DataTrigger>
-                            --><!--<DataTrigger Binding="{Binding StorageType}" Value="SD">
+                            -->
+            <!--<DataTrigger Binding="{Binding StorageType}" Value="SD">
                                 <Setter TargetName="sp_purchaseAmount" Property="Visibility" Value="Collapsed"/>
-                            </DataTrigger>--><!--
+                            </DataTrigger>-->
+            <!--
                             <DataTrigger Binding="{Binding StorageType}" Value="代发">
                                 <Setter TargetName="listbox_df" Property="Visibility" Value="Visible"/>
                             </DataTrigger>
diff --git a/BBWY.Client/Views/Order/OrderList.xaml.cs b/BBWY.Client/Views/Order/OrderList.xaml.cs
index 0895c90a..df75caa0 100644
--- a/BBWY.Client/Views/Order/OrderList.xaml.cs
+++ b/BBWY.Client/Views/Order/OrderList.xaml.cs
@@ -1,5 +1,6 @@
 using BBGWY.Controls.Extensions;
 using GalaSoft.MvvmLight.Messaging;
+using System.Windows;
 using System.Windows.Controls;
 
 namespace BBWY.Client.Views.Order
diff --git a/BBWY.Client/Views/Order/OrderListControl.xaml b/BBWY.Client/Views/Order/OrderListControl.xaml
index 13f446df..618bd81c 100644
--- a/BBWY.Client/Views/Order/OrderListControl.xaml
+++ b/BBWY.Client/Views/Order/OrderListControl.xaml
@@ -309,8 +309,8 @@
                                             <Run Text="实收金额"/>
                                             <Run Text="{Binding ActualAmount,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"/>
                                     </TextBlock>
-
-                                    <Path Style="{StaticResource path_question}" Width="14" Margin="5,0,0,0" Fill="{StaticResource Text.Pink}" ToolTipService.InitialShowDelay="0">
+                                    <Path Style="{StaticResource path_question}"
+                                          Width="14" Margin="5,0,0,0" Fill="{StaticResource Text.Pink}" ToolTipService.InitialShowDelay="0">
                                         <Path.ToolTip>
                                             <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
                                                 <StackPanel>
@@ -328,6 +328,11 @@
                                     </Path>
                                 </StackPanel>
 
+                                <TextBlock Visibility="{Binding StorageType,ConverterParameter=SD:Visible:Collapsed,Converter={StaticResource objConverter}}">
+                                         <Run Text="实付金额"/>
+                                         <Run Text="{Binding OrderPayment,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"/>
+                                </TextBlock>
+
                                 <TextBlock Visibility="{Binding OrderCost.RefundAmount,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"
                                                Foreground="Red">
                                             <Run Text="退款金额"/>
@@ -804,7 +809,7 @@
                                         <Run Text="{Binding OrderCost.ProfitRatio,StringFormat=\{0\}%}"/>
                                 </TextBlock>
                             </StackPanel>
-                            
+
                             <Border Background="{StaticResource Border.Background}" Margin="0,0,1,0"
                                     Grid.Column="4"
                                     Visibility="{Binding DataContext.IsSDGroup,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}},ConverterParameter=true:Visible:Collapsed,Converter={StaticResource objConverter}}"/>
@@ -908,7 +913,7 @@
                             <Setter TargetName="txt_sdCommissionAmount" Property="Visibility" Value="Collapsed"/>
                         </DataTrigger>
                         <DataTrigger Binding="{Binding StorageType}" Value="SD">
-                                <Setter TargetName="sp_purchaseAmount" Property="Visibility" Value="Collapsed"/>
+                            <Setter TargetName="sp_purchaseAmount" Property="Visibility" Value="Collapsed"/>
                         </DataTrigger>
                         <DataTrigger Binding="{Binding StorageType}" Value="代发">
                             <Setter TargetName="listbox_df" Property="Visibility" Value="Visible"/>