修复服务单查询接口错误

BBWY.Client/APIServices/AfterOrderService.cs

@@ -1,8 +1,8 @@
-using BBWY.Common.Http;
+using BBWY.Client.Models;
+using BBWY.Common.Http;
 using BBWY.Common.Models;
 using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Net.Http;
 
 namespace BBWY.Client.APIServices
 {
@@ -12,5 +12,29 @@ namespace BBWY.Client.APIServices
         {
 
         }
+
+        public ApiResponse<AfterSaleOrderListResponse> GetAfterSaleOrderList(long shopId,
+                                                                             string orderId,
+                                                                             DateTime? startDate,
+                                                                             DateTime? endDate,
+                                                                             string spu,
+                                                                             string sku,
+                                                                             string serviceId,
+                                                                             int pageIndex,
+                                                                             int pageSize)
+        {
+            return SendRequest<AfterSaleOrderListResponse>(globalContext.BBYWApiHost, "/Api/AfterSaleOrder/GetAfterSaleOrderList", new
+            {
+                shopId,
+                orderId,
+                startDate,
+                endDate,
+                spu,
+                sku,
+                serviceId,
+                pageIndex,
+                pageSize
+            }, null, HttpMethod.Post);
+        }
     }
-}
+}

BBWY.Client/Models/APIModel/Response/AfterSaleOrder/AfterSaleOrderListResponse.cs

@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+
+namespace BBWY.Client.Models
+{
+    public class AfterSaleOrderListResponse
+    {
+        public int Count { get; set; }
+
+        public IList<AfterSaleOrderResponse> Items { get; set; }
+    }
+}

BBWY.Client/Models/APIModel/Response/AfterSaleOrder/AfterSaleOrderResponse.cs

@@ -0,0 +1,113 @@
+using System;
+
+namespace BBWY.Client.Models
+{
+    public class AfterSaleOrderResponse
+    {
+      
+        public long Id { get; set; }
+
+       
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// 申请时间
+        /// </summary>
+    
+        public DateTime? ApplyTime { get; set; }
+
+  
+        public string OrderId { get; set; }
+
+       
+        public string ProductId { get; set; }
+
+        /// <summary>
+        /// 商品处理结果
+        /// </summary>
+        public ProductResult? ProductResult { get; set; }
+
+        /// <summary>
+        /// 退款金额
+        /// </summary>
+        public decimal? RefundAmount { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 退款时间
+        /// </summary>
+        public DateTime? RefundTime { get; set; }
+
+        /// <summary>
+        /// 售后补发成本
+        /// </summary>
+        public decimal? ReissueAfterSaleAmount { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 补发快递费
+        /// </summary>
+        public decimal? ReissueFreight { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 补发货款成本
+        /// </summary>
+        public decimal? ReissueProductAmount { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 服务单处理结果
+        /// </summary>
+        public ServiceResult? ServiceResult { get; set; }
+
+        public long? ShopId { get; set; }
+
+        public string SkuId { get; set; }
+
+        /// <summary>
+        /// 服务单号
+        /// </summary>
+        public string ServiceId { get; set; }
+
+        /// <summary>
+		/// 退货入仓操作费
+		/// </summary>
+        public decimal? RefundInStorageAmount { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 退款采购成本
+        /// </summary>
+        public decimal? RefundPurchaseAmount { get; set; } = 0.00M;
+
+        /// <summary>
+		/// 耗材费
+		/// </summary>
+        public decimal? ConsumableAmount { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 发货快递费
+        /// </summary>
+        public decimal? DeliveryExpressFreight { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 头程费
+        /// </summary>
+        public decimal? FirstFreight { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 入仓操作费
+        /// </summary>
+        public decimal? InStorageAmount { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 出仓操作费
+        /// </summary>
+        public decimal? OutStorageAmount { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 商品情况
+        /// </summary>
+        public ProductHealth? ProductHealth { get; set; }
+
+        public string Logo { get; set; }
+
+        public string Title { get; set; }
+    }
+}

BBWY.Client/Models/APIModel/Response/Order/AfterSaleOrderResponse.cs

@@ -1,55 +0,0 @@
-using BBWY.Client.Models;
-using System;
-
-namespace BBWY.Client.Models
-{
-    public class AfterSaleOrderResponse 
-    {
-	
-		public long Id { get; set; }
-		public DateTime? CreateTime { get; set; }
-
-		public string OrderId { get; set; }
-
-		public string ProductId { get; set; }
-
-		/// <summary>
-		/// 商品处理结果
-		/// </summary>
-		public ProductResult? ProductResult { get; set; }
-
-		/// <summary>
-		/// 退款金额
-		/// </summary>
-		public decimal? RefundAmount { get; set; } = 0.00M;
-
-		/// <summary>
-		/// 退款时间
-		/// </summary>
-		public DateTime? RefundTime { get; set; }
-
-		/// <summary>
-		/// 售后补发成本
-		/// </summary>
-		public decimal? ReissueAfterSaleAmount { get; set; } = 0.00M;
-
-		/// <summary>
-		/// 补发快递费
-		/// </summary>
-		public decimal? ReissueFreight { get; set; } = 0.00M;
-
-		/// <summary>
-		/// 补发货款成本
-		/// </summary>
-		public decimal? ReissueProductAmount { get; set; } = 0.00M;
-
-		/// <summary>
-		/// 服务单处理结果
-		/// </summary>
-		public ServiceResult? ServiceResult { get; set; }
-
-		public long? ShopId { get; set; }
-
-		public string SkuId { get; set; }
-	}
-}

BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs

@@ -0,0 +1,113 @@
+using System;
+
+namespace BBWY.Client.Models
+{
+    public class AfterSaleOrder : NotifyObject
+    {
+
+        public long Id { get; set; }
+
+
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// 申请时间
+        /// </summary>
+
+        public DateTime? ApplyTime { get; set; }
+
+
+        public string OrderId { get; set; }
+
+
+        public string ProductId { get; set; }
+
+        /// <summary>
+        /// 商品处理结果
+        /// </summary>
+        public ProductResult? ProductResult { get; set; }
+
+        /// <summary>
+        /// 退款金额
+        /// </summary>
+        public decimal? RefundAmount { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 退款时间
+        /// </summary>
+        public DateTime? RefundTime { get; set; }
+
+        /// <summary>
+        /// 售后补发成本
+        /// </summary>
+        public decimal? ReissueAfterSaleAmount { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 补发快递费
+        /// </summary>
+        public decimal? ReissueFreight { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 补发货款成本
+        /// </summary>
+        public decimal? ReissueProductAmount { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 服务单处理结果
+        /// </summary>
+        public ServiceResult? ServiceResult { get; set; }
+
+        public long? ShopId { get; set; }
+
+        public string SkuId { get; set; }
+
+        /// <summary>
+        /// 服务单号
+        /// </summary>
+        public string ServiceId { get; set; }
+
+        /// <summary>
+		/// 退货入仓操作费
+		/// </summary>
+        public decimal? RefundInStorageAmount { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 退款采购成本
+        /// </summary>
+        public decimal? RefundPurchaseAmount { get; set; } = 0.00M;
+
+        /// <summary>
+		/// 耗材费
+		/// </summary>
+        public decimal? ConsumableAmount { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 发货快递费
+        /// </summary>
+        public decimal? DeliveryExpressFreight { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 头程费
+        /// </summary>
+        public decimal? FirstFreight { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 入仓操作费
+        /// </summary>
+        public decimal? InStorageAmount { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 出仓操作费
+        /// </summary>
+        public decimal? OutStorageAmount { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 商品情况
+        /// </summary>
+        public ProductHealth? ProductHealth { get; set; }
+
+        public string Logo { get; set; }
+
+        public string Title { get; set; }
+    }
+}

BBWY.Client/Models/Order/AfterSaleOrder.cs

@@ -1,63 +0,0 @@
-using System;
-
-namespace BBWY.Client.Models
-{
-    public class AfterSaleOrder : NotifyObject, ICloneable
-    {
-        private ProductResult? productResult;
-        private ServiceResult? serviceResult;
-        private decimal? reissueAfterSaleAmount = 0.00M;
-        private decimal? reissueFreight = 0.00M;
-        private decimal? reissueProductAmount = 0.00M;
-
-        public long Id { get; set; }
-        public DateTime? CreateTime { get; set; }
-
-        public string OrderId { get; set; }
-
-        public string ProductId { get; set; }
-
-
-        /// <summary>
-        /// 退款金额
-        /// </summary>
-        public decimal? RefundAmount { get; set; } = 0.00M;
-
-        /// <summary>
-        /// 退款时间
-        /// </summary>
-        public DateTime? RefundTime { get; set; }
-
-
-        public long? ShopId { get; set; }
-
-        public string SkuId { get; set; }
-        public ProductResult? ProductResult { get => productResult; set { Set(ref productResult, value); } }
-        /// <summary>
-        /// 售后补偿成本
-        /// </summary>
-        public decimal? ReissueAfterSaleAmount { get => reissueAfterSaleAmount; set { Set(ref reissueAfterSaleAmount, value); } }
-        /// <summary>
-        /// 补发快递费
-        /// </summary>
-        public decimal? ReissueFreight { get => reissueFreight; set { Set(ref reissueFreight, value); } }
-        /// <summary>
-        /// 补发货款成本
-        /// </summary>
-        public decimal? ReissueProductAmount { get => reissueProductAmount; set { Set(ref reissueProductAmount, value); } }
-        /// <summary>
-        /// 服务单处理结果
-        /// </summary>
-        public ServiceResult? ServiceResult { get => serviceResult; set { Set(ref serviceResult, value); } }
-
-        /// <summary>
-        /// 是否位占位数据
-        /// </summary>
-        public bool IsPlaceholder { get; set; } = false;
-
-        public object Clone()
-        {
-            return this.MemberwiseClone();
-        }
-    }
-}

BBWY.Client/ViewModels/Order/OrderListViewModel.cs

@@ -23,6 +23,7 @@ namespace BBWY.Client.ViewModels
     {
         private OrderService orderService;
         private StatisticsService statisticsService;
+        private AfterOrderService afterOrderService;
         private ChoosePurchaseSchemeViewModel choosePurchaseSchemeViewModel;
 
         private bool isLoading;
@@ -46,9 +47,12 @@ namespace BBWY.Client.ViewModels
         private GlobalContext globalContext;
         private bool? includeAfterOrder;
         private decimal currentConditionsTotalProfit;
+        private string searchServiceId;
 
         public IList<Order> OrderList { get; set; }
 
+        public IList<AfterSaleOrder> AfterSaleOrderList { get; set; }
+
         public bool IsLoading { get => isLoading; set { Set(ref isLoading, value); } }
 
         public string SearchOrderId { get => searchOrderId; set { Set(ref searchOrderId, value); } }
@@ -76,6 +80,7 @@ namespace BBWY.Client.ViewModels
         public bool ExcludeCanceled { get => excludeCanceled; set { Set(ref excludeCanceled, value); } }
 
         public bool? IncludeAfterOrder { get => includeAfterOrder; set { Set(ref includeAfterOrder, value); } }
+        public string SearchServiceId { get => searchServiceId; set { Set(ref searchServiceId, value); } }
 
         public ToDayOrderAchievement ToDayOrderAchievement { get; set; }
 
@@ -114,14 +119,18 @@ namespace BBWY.Client.ViewModels
         /// </summary>
         public decimal CurrentConditionsTotalProfit { get => currentConditionsTotalProfit; set { Set(ref currentConditionsTotalProfit, value); } }
 
-        public OrderListViewModel(OrderService orderService, StatisticsService statisticsService, GlobalContext globalContext, ChoosePurchaseSchemeViewModel choosePurchaseSchemeViewModel)
+
+
+        public OrderListViewModel(OrderService orderService, StatisticsService statisticsService, AfterOrderService afterOrderService, GlobalContext globalContext, ChoosePurchaseSchemeViewModel choosePurchaseSchemeViewModel)
         {
             random = new Random();
             this.globalContext = globalContext;
             this.orderService = orderService;
             this.statisticsService = statisticsService;
+            this.afterOrderService = afterOrderService;
             this.choosePurchaseSchemeViewModel = choosePurchaseSchemeViewModel;
             OrderList = new ObservableCollection<Order>();
+            AfterSaleOrderList = new ObservableCollection<AfterSaleOrder>();
             //EndDate = DateTime.Now;
             //StartDate = DateTime.Now.Date.AddDays(-6);
             ToDayOrderAchievement = new ToDayOrderAchievement();
@@ -219,7 +228,7 @@ namespace BBWY.Client.ViewModels
         {
             InitSearchParam();
             IncludeAfterOrder = true;
-            //Task.Factory.StartNew(() => LoadOrder(1));
+            Task.Factory.StartNew(() => LoadOrder(1));
         }
 
         public void RefreshOrder(string orderId)
@@ -253,6 +262,15 @@ namespace BBWY.Client.ViewModels
         }
 
         private void LoadOrder(int pageIndex)
+        {
+            if (IncludeAfterOrder == true)
+                LoadAfterSaleOrder(pageIndex);
+            else
+                LoadNormalOrder(pageIndex);
+        }
+
+
+        private void LoadNormalOrder(int pageIndex)
         {
             IsLoading = true;
             Thread.Sleep(random.Next(0, 1000));
@@ -290,7 +308,40 @@ namespace BBWY.Client.ViewModels
                     OrderList.Add(order);
                 }
 
-                Messenger.Default.Send(string.Empty, "OrderList_OrderListScrollToTop");
+                Messenger.Default.Send(string.Empty, "OrderList_ScrollToTop");
+            });
+            IsLoading = false;
+        }
+
+        private void LoadAfterSaleOrder(int pageIndex)
+        {
+            IsLoading = true;
+            Thread.Sleep(random.Next(0, 1000));
+            var response = afterOrderService.GetAfterSaleOrderList(globalContext.User.Shop.ShopId,
+                                                                   SearchOrderId,
+                                                                   StartDate,
+                                                                   EndDate,
+                                                                   SearchProductId,
+                                                                   SearchSku,
+                                                                   SearchServiceId,
+                                                                   pageIndex,
+                                                                   pageSize);
+
+            if (!response.Success)
+            {
+                IsLoading = false;
+                App.Current.Dispatcher.Invoke(() => MessageBox.Show(response.Msg, "提示"));
+                return;
+            }
+
+            OrderCount = response.Data.Count;
+            var afterOrderList = response.Data.Items.Map<IList<AfterSaleOrder>>();
+            App.Current.Dispatcher.Invoke(() =>
+            {
+                AfterSaleOrderList.Clear();
+                foreach (var aso in afterOrderList)
+                    AfterSaleOrderList.Add(aso);
+                Messenger.Default.Send(string.Empty, "AfterSaleOrderList_ScrollToTop");
             });
             IsLoading = false;
         }

BBWY.Client/Views/Order/EditAfterSaleOrderSku.xaml.cs

@@ -13,8 +13,8 @@ namespace BBWY.Client.Views.Order
         public EditAfterSaleOrderSku(AfterSaleOrder afterSaleOrder)
         {
             InitializeComponent();
-            if (afterSaleOrder.Id != 0)
-                SaleOrder = (AfterSaleOrder)afterSaleOrder.Clone();
+            //if (afterSaleOrder.Id != 0)
+            //    SaleOrder = (AfterSaleOrder)afterSaleOrder.Clone();
             this.DataContext = this;
         }
 

BBWY.Client/Views/Order/OrderList.xaml

@@ -154,7 +154,7 @@
                                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 AfterOrderServiceId}" WaterRemark="精确匹配"
+                    <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}"/>
@@ -267,6 +267,12 @@
                     <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" >
+                    <CheckBox Content="仅显示未处理" Margin="5,0,0,0" IsChecked="{Binding OnlyDF,Mode=OneWayToSource,UpdateSourceTrigger=PropertyChanged}"/>
+                </StackPanel>
+            </Border>
 
             <Border Grid.Row="6" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1,1,1,0"
                     Background="#F2F2F2"
@@ -302,6 +308,37 @@
                 </Grid>
             </Border>
 
+            <Border Grid.Row="6" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1,1,1,0"
+                    Background="#F2F2F2"
+                    Visibility="{Binding Visibility,ElementName=listbox_afterSaleOrder}">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="351"/>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Text="商品信息" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="退款/赔付" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="售后成本" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="成本信息" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="商品处理" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock  Text="商品情况" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="采购状态" Grid.Column="6"  Style="{StaticResource middleTextBlock}"/>
+
+                    <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
+                    <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
+                    <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="2"/>
+                    <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3"/>
+                    <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="4"/>
+                    <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>
+                    <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="6"/>
+                </Grid>
+            </Border>
+
             <ListBox x:Name="listbox_order"
                      Grid.Row="7" 
                      ItemsSource="{Binding OrderList}"
@@ -817,58 +854,7 @@
                                         Visibility="{Binding Visibility,ElementName=btn_outStore}"/>
                                 </Grid>
 
-                                <!--<ListBox x:Name="listbox_afterSaleOrder" 
-                                         Grid.Column="5"
-                                         Visibility="Collapsed"
-                                         ItemsSource="{Binding AfterSaleOrderList}"
-                                         Style="{StaticResource NoScrollViewListBoxStyle}"
-                                         ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
-                                         VerticalAlignment="Center"
-                                         Foreground="{StaticResource Text.Color}">
-                                    <ListBox.ItemTemplate>
-                                        <DataTemplate>
-                                            <Grid Grid.Column="2" 
-                                                  Width="{Binding ActualWidth,ElementName=listbox_afterSaleOrder}"
-                                                  Height="{Binding RefundAmount,Converter={StaticResource objConverter},ConverterParameter=0|0.0|0.00:115:136}">
-                                                <StackPanel VerticalAlignment="Center" 
-                                                            HorizontalAlignment="Center"
-                                                            Visibility="{Binding IsPlaceholder,ConverterParameter=true:Collapsed:Visible,Converter={StaticResource objConverter}}">
-                                                    <TextBlock>
-                                                    <Run Text="服务单结果"/>
-                                                    <Run Text="{Binding ServiceResult,ConverterParameter=#null:未处理:#source,Converter={StaticResource objConverter}}"/>
-                                                    </TextBlock>
-                                                    <TextBlock>
-                                                    <Run Text="商品结果"/>
-                                                    <Run Text="{Binding ProductResult,ConverterParameter=#null:未处理:#source,Converter={StaticResource objConverter}}"/>
-                                                    </TextBlock>
-                                                    <TextBlock Visibility="{Binding RefundAmount,ConverterParameter=0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}">
-                                                    <Run Text="退款金额"/>
-                                                    <Run Text="{Binding RefundAmount}"/>
-                                                    </TextBlock>
-                                                    <TextBlock Visibility="{Binding RefundAmount,ConverterParameter=0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}">
-                                                    <Run Text="退款日期"/>
-                                                    <Run Text="{Binding RefundTime,StringFormat=yyyy-MM-dd}"/>
-                                                    </TextBlock>
-                                                    <TextBlock Visibility="{Binding ReissueFreight,ConverterParameter=0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}">
-                                                    <Run Text="补发快递成本"/>
-                                                    <Run Text="{Binding ReissueFreight}"/>
-                                                    </TextBlock>
-                                                    <TextBlock Visibility="{Binding ReissueProductAmount,ConverterParameter=0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}">
-                                                    <Run Text="补发货款成本"/>
-                                                    <Run Text="{Binding ReissueProductAmount}"/>
-                                                    </TextBlock>
-                                                    <TextBlock Visibility="{Binding ReissueAfterSaleAmount,ConverterParameter=0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}">
-                                                    <Run Text="售后补偿成本"/>
-                                                    <Run Text="{Binding ReissueAfterSaleAmount}"/>
-                                                    </TextBlock>
-                                                </StackPanel>
-                                                <Border VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"
-                                                        DataContext="{Binding DataContext,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
-                                                        Visibility="{Binding ItemList.Count,Converter={StaticResource objConverter},ConverterParameter=1:Collapsed:Visible}"/>
-                                            </Grid>
-                                        </DataTemplate>
-                                    </ListBox.ItemTemplate>
-                                </ListBox>-->
+                               
 
                                 <TextBlock Text="{Binding OrderState}" Grid.Column="6"
                                            HorizontalAlignment="Center"
@@ -1010,6 +996,23 @@
                 </ListBox.ItemTemplate>
             </ListBox>
 
+            <ListBox x:Name="listbox_afterSaleOrder"
+                     Grid.Row="7"
+                     ItemsSource="{Binding AfterSaleOrderList}"
+                     ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
+                     BorderBrush="{StaticResource Border.Brush}"
+                     BorderThickness="1,1,1,0"
+                     Foreground="{StaticResource Text.Color}"
+                     Visibility="{Binding IncludeAfterOrder,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}">
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <Grid Width="{Binding ActualWidth,ElementName=listbox_afterSaleOrder,Converter={StaticResource widthConverter},ConverterParameter=-0}">
+
+                        </Grid>
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
+
             <c:PageControl PageIndex="{Binding PageIndex}"
                            PageSize="{Binding PageSize}"
                            RecordCount="{Binding OrderCount}"
@@ -1024,7 +1027,8 @@
 
             <TextBlock Grid.Row="8" 
                        HorizontalAlignment="Right" VerticalAlignment="Center" 
-                       Margin="0,0,5,0">
+                       Margin="0,0,5,0"
+                       Visibility="{Binding Visibility,ElementName=listbox_order}">
                 <Run Text="当前条件利润汇总"/>
                 <Run Text="{Binding CurrentConditionsTotalProfit,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
             </TextBlock>

BBWY.Client/Views/Order/OrderList.xaml.cs

@@ -10,6 +10,7 @@ namespace BBWY.Client.Views.Order
     public partial class OrderList : Page
     {
         private ScrollViewer scrollviewer_OrderList;
+        private ScrollViewer scrollveewer_AfterSaleOrderList;
 
         public OrderList()
         {
@@ -17,10 +18,17 @@ namespace BBWY.Client.Views.Order
             this.Loaded += OrderList_Loaded;
             this.Unloaded += OrderList_Unloaded;
 
-            Messenger.Default.Register<string>(this, "OrderList_OrderListScrollToTop", (x) =>
+            Messenger.Default.Register<string>(this, "OrderList_ScrollToTop", (x) =>
             {
                 scrollviewer_OrderList.Dispatcher.Invoke(() => scrollviewer_OrderList.ScrollToTop());
             });
+
+            Messenger.Default.Register<string>(this, "AfterSaleOrderList_ScrollToTop", (x) =>
+            {
+                if (scrollveewer_AfterSaleOrderList == null)
+                    scrollveewer_AfterSaleOrderList = listbox_afterSaleOrder.FindFirstVisualChild<ScrollViewer>();
+                scrollviewer_OrderList.Dispatcher.Invoke(() => scrollveewer_AfterSaleOrderList.ScrollToTop());
+            });
         }
 
         private void OrderList_Unloaded(object sender, System.Windows.RoutedEventArgs e)
@@ -31,6 +39,7 @@ namespace BBWY.Client.Views.Order
         private void OrderList_Loaded(object sender, System.Windows.RoutedEventArgs e)
         {
             scrollviewer_OrderList = listbox_order.FindFirstVisualChild<ScrollViewer>();
+            //scrollveewer_AfterSaleOrderList = listbox_afterSaleOrder.FindFirstVisualChild<ScrollViewer>();
         }
     }
 }

BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs

@@ -14,7 +14,7 @@ namespace BBWY.Server.Business
 
         public AfterSaleOrderListResponse GetAfterSaleOrderList(SearchAfterSaleOrderRequest request)
         {
-            var select = fsql.Select<AfterSaleOrder, OrderSku>().InnerJoin((aso, osku) => aso.SkuId == osku.SkuId);
+            var select = fsql.Select<AfterSaleOrder, OrderSku>().InnerJoin((aso, osku) => aso.OrderId == osku.OrderId && aso.SkuId == osku.SkuId);
             if (!string.IsNullOrEmpty(request.ServiceId))
             {
                 select = select.Where((aso, osku) => aso.ServiceId == request.ServiceId);
@@ -28,7 +28,7 @@ namespace BBWY.Server.Business
                                .WhereIf(!string.IsNullOrEmpty(request.OrderId), (aso, osku) => aso.OrderId == request.OrderId);
             }
             select = select.Where((aso, osku) => aso.ShopId == request.ShopId)
-                           .OrderByDescending((aso, osku) => aso.CreateTime)
+                           .OrderByDescending((aso, osku) => aso.ApplyTime)
                            .Count(out var total)
                            .Page(request.PageIndex, request.PageSize);