From da8c25815ac33e3121a35896cc8a98f71b40fc13 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Thu, 21 Jul 2022 18:31:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=E4=BF=A1=E6=81=AF=E5=AF=B9?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/Models/Order/Order.cs                | 15 +++++++++++++++
 .../ViewModels/Order/OrderListViewModel.cs       |  6 ++----
 BBWY.Client/Views/Order/OrderList.xaml           | 16 +++++++++++++---
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/BBWY.Client/Models/Order/Order.cs b/BBWY.Client/Models/Order/Order.cs
index 8deefd02..ecf735b9 100644
--- a/BBWY.Client/Models/Order/Order.cs
+++ b/BBWY.Client/Models/Order/Order.cs
@@ -201,6 +201,12 @@ namespace BBWY.Client.Models
         /// </summary>
         public IList<AfterSaleOrder> AfterSaleOrderList { get; set; }
 
+        public void LocalConvert()
+        {
+            ConvertAfterSaleOrderSku();
+            ConvertOrderCostDetailToGroup();
+        }
+
         public void ConvertOrderCostDetailToGroup()
         {
             if (OrderCostDetailList == null || OrderCostDetailList.Count() == 0)
@@ -216,6 +222,15 @@ namespace BBWY.Client.Models
                 group.Items.Add(detail);
             }
         }
+
+        /// <summary>
+        /// 处理售后集合，如果Sku没有售后，则赋值一个空对象进行占位，保持售后信息和Sku对位
+        /// </summary>
+        private void ConvertAfterSaleOrderSku()
+        {
+            if (!IsAfterSaleOrder)
+                return;
+        }
     }
 
     public class OrderList
diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
index 6decf4d0..097ef795 100644
--- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
+++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
@@ -232,8 +232,7 @@ namespace BBWY.Client.ViewModels
             }
 
             var newOrder = orderResponse.Data.Map<Order>();
-            if (newOrder.OrderCostDetailList.Count() > 0)
-                newOrder.ConvertOrderCostDetailToGroup();
+            newOrder.LocalConvert();
 
             Application.Current.Dispatcher.Invoke(() =>
             {
@@ -276,8 +275,7 @@ namespace BBWY.Client.ViewModels
                 OrderList.Clear();
                 foreach (var order in orderList)
                 {
-                    if (order.OrderCostDetailList.Count > 0)
-                        order.ConvertOrderCostDetailToGroup();
+                    order.LocalConvert();
                     OrderList.Add(order);
                 }
 
diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml
index 42899cfb..ca281f65 100644
--- a/BBWY.Client/Views/Order/OrderList.xaml
+++ b/BBWY.Client/Views/Order/OrderList.xaml
@@ -60,14 +60,14 @@
                            Command="{Binding SetOrderStateCommand}" CommandParameter="{x:Null}">
                     <c:BButton.Background>
                         <MultiBinding Converter="{StaticResource mobjConverter}"
-                                      ConverterParameter=";false:&amp;:#8080FF:#F2F2F2:6">
+                                      ConverterParameter=";:&amp;:#8080FF:#F2F2F2:6">
                             <Binding Path="OrderState"/>
                             <Binding Path="IncludeAfterOrder"/>
                         </MultiBinding>
                     </c:BButton.Background>
                     <c:BButton.Foreground>
                         <MultiBinding Converter="{StaticResource mobjConverter}"
-                                      ConverterParameter=";false:&amp;:#FFFFFF:#4A4A4A:6">
+                                      ConverterParameter=";:&amp;:#FFFFFF:#4A4A4A:6">
                             <Binding Path="OrderState"/>
                             <Binding Path="IncludeAfterOrder"/>
                         </MultiBinding>
@@ -850,7 +850,17 @@
 
                                 <TextBlock Text="{Binding OrderState}" Grid.Column="6"
                                            HorizontalAlignment="Center"
-                                           VerticalAlignment="Center"/>
+                                           VerticalAlignment="Center">
+                                    <TextBlock.Visibility>
+                                        <MultiBinding Converter="{StaticResource mobjConverter}"
+                                                      ConverterParameter=";true:&amp;:Collapsed:Visible:1">
+                                            <Binding Path="DataContext.IncludeAfterOrder" RelativeSource="{RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}"/>
+                                            <Binding Path="IsAfterSaleOrder"/>
+                                        </MultiBinding>
+                                    </TextBlock.Visibility>
+                                </TextBlock>
+                                
+                                
 
                                 <StackPanel Orientation="Vertical" Grid.Column="7" Margin="5,5,5,0">
                                     <StackPanel x:Name="sp_buyerRemark">