From b7e0b6d1d8e773637165bceaca9f3bc7d3423221 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Fri, 22 Jul 2022 03:09:53 +0800
Subject: [PATCH] 1

---
 BBWY.Client/Models/Order/AfterSaleOrder.cs |   5 +
 BBWY.Client/Models/Order/Order.cs          |  16 ++-
 BBWY.Client/Views/Order/OrderList.xaml     | 109 ++++++++++++++++-----
 BBWY.Test/Program.cs                       |  34 +++----
 4 files changed, 118 insertions(+), 46 deletions(-)

diff --git a/BBWY.Client/Models/Order/AfterSaleOrder.cs b/BBWY.Client/Models/Order/AfterSaleOrder.cs
index 6a7de108..466212ab 100644
--- a/BBWY.Client/Models/Order/AfterSaleOrder.cs
+++ b/BBWY.Client/Models/Order/AfterSaleOrder.cs
@@ -50,6 +50,11 @@ namespace BBWY.Client.Models
         /// </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();
diff --git a/BBWY.Client/Models/Order/Order.cs b/BBWY.Client/Models/Order/Order.cs
index ecf735b9..70a2c58a 100644
--- a/BBWY.Client/Models/Order/Order.cs
+++ b/BBWY.Client/Models/Order/Order.cs
@@ -199,7 +199,7 @@ namespace BBWY.Client.Models
         /// <summary>
         /// 售后信息
         /// </summary>
-        public IList<AfterSaleOrder> AfterSaleOrderList { get; set; }
+        public List<AfterSaleOrder> AfterSaleOrderList { get; set; }
 
         public void LocalConvert()
         {
@@ -228,8 +228,20 @@ namespace BBWY.Client.Models
         /// </summary>
         private void ConvertAfterSaleOrderSku()
         {
-            if (!IsAfterSaleOrder)
+            if (!IsAfterSaleOrder || AfterSaleOrderList == null || AfterSaleOrderList.Count() == 0 || (ItemList.Count() == AfterSaleOrderList.Count()))
                 return;
+            var asoList = new List<AfterSaleOrder>();
+            asoList.AddRange(AfterSaleOrderList);
+            AfterSaleOrderList.Clear();
+            foreach (var sku in ItemList)
+            {
+                var afterSaleOrderSku = asoList.FirstOrDefault(aso => aso.SkuId == sku.Id);
+                if (afterSaleOrderSku == null)
+                    afterSaleOrderSku = new AfterSaleOrder() { IsPlaceholder = true };
+                AfterSaleOrderList.Add(afterSaleOrderSku);
+            }
+            asoList.Clear();
+
         }
     }
 
diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml
index ca281f65..c97a221a 100644
--- a/BBWY.Client/Views/Order/OrderList.xaml
+++ b/BBWY.Client/Views/Order/OrderList.xaml
@@ -362,7 +362,12 @@
                                                                VerticalAlignment="Top" Margin="0,5,0,0"/>
 
                                                 <StackPanel Grid.Column="1" Orientation="Vertical" Margin="0,5,0,5">
-                                                    <TextBlock TextWrapping="Wrap">
+                                                    <TextBlock TextTrimming="CharacterEllipsis">
+                                                        <TextBlock.ToolTip>
+                                                            <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                                <TextBlock Text="{Binding Title}"/>
+                                                            </ToolTip>
+                                                        </TextBlock.ToolTip>
                                                          <Run Text="SKU名称:"/>
                                                          <Run Text="{Binding Title}"/>
                                                     </TextBlock>
@@ -407,7 +412,12 @@
                                                             <Run Text="{Binding ProductItemNum}"/>
                                                     </TextBlock>
                                                     <TextBlock DataContext="{Binding DataContext,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ListBox}}"
-                                                               TextWrapping="Wrap">
+                                                               TextTrimming="CharacterEllipsis">
+                                                        <TextBlock.ToolTip>
+                                                            <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                                <TextBlock Text="{Binding BuyerRemark}"/>
+                                                            </ToolTip>
+                                                        </TextBlock.ToolTip>
                                                            <Run Text="买家备注:" />
                                                            <Run Text="{Binding BuyerRemark}"/>
                                                     </TextBlock>
@@ -809,41 +819,49 @@
                                          Foreground="{StaticResource Text.Color}">
                                     <ListBox.ItemTemplate>
                                         <DataTemplate>
-                                            <StackPanel Grid.Column="2" VerticalAlignment="Center" 
-                                            HorizontalAlignment="Center" Margin="10,0,0,10">
-                                                <TextBlock>
+                                            <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="SKU"/>
                                                     <Run Text="{Binding SkuId}"/>
-                                                </TextBlock>
-                                                <TextBlock>
-                                                    <Run Text="服务单处理结果"/>
+                                                    </TextBlock>-->
+                                                    <TextBlock>
+                                                    <Run Text="服务单结果"/>
                                                     <Run Text="{Binding ServiceResult,ConverterParameter=#null:未处理:#source,Converter={StaticResource objConverter}}"/>
-                                                </TextBlock>
-                                                <TextBlock>
-                                                    <Run Text="商品处理结果"/>
+                                                    </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}}">
+                                                    </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 HH:mm:ss}"/>
-                                                </TextBlock>
-                                                <TextBlock Visibility="{Binding ReissueFreight,ConverterParameter=0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}">
+                                                    </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}}">
+                                                    </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}}">
+                                                    </TextBlock>
+                                                    <TextBlock Visibility="{Binding ReissueAfterSaleAmount,ConverterParameter=0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}">
                                                     <Run Text="售后补偿成本"/>
                                                     <Run Text="{Binding ReissueAfterSaleAmount}"/>
-                                                </TextBlock>
-                                            </StackPanel>
+                                                    </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>
@@ -859,8 +877,45 @@
                                         </MultiBinding>
                                     </TextBlock.Visibility>
                                 </TextBlock>
-                                
-                                
+
+                                <ListBox x:Name="listbox_afterSaleOrder1" 
+                                         Grid.Column="6"
+                                         ItemsSource="{Binding AfterSaleOrderList}"
+                                         Style="{StaticResource NoScrollViewListBoxStyle}"
+                                         ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
+                                         VerticalAlignment="Center"
+                                         Foreground="{StaticResource Text.Color}">
+                                    <ListBox.Visibility>
+                                        <MultiBinding Converter="{StaticResource mobjConverter}"
+                                                      ConverterParameter=";true:&amp;:Visible:Collapsed:1">
+                                            <Binding Path="DataContext.IncludeAfterOrder" RelativeSource="{RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}"/>
+                                            <Binding Path="IsAfterSaleOrder"/>
+                                        </MultiBinding>
+                                    </ListBox.Visibility>
+                                    <ListBox.ItemTemplate>
+                                        <DataTemplate>
+                                            <Grid Grid.Column="2" 
+                                                  Width="{Binding ActualWidth,ElementName=listbox_afterSaleOrder1}"
+                                                  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 DataContext.OrderState,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1}}"/>
+                                                    </TextBlock>
+                                                    <TextBlock>
+                                                    <Run Text="售后信息"/>
+                                                    <Run Text="{Binding ServiceResult,ConverterParameter=#null:未处理:#source,Converter={StaticResource objConverter}}"/>
+                                                    </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>
 
                                 <StackPanel Orientation="Vertical" Grid.Column="7" Margin="5,5,5,0">
                                     <StackPanel x:Name="sp_buyerRemark">
diff --git a/BBWY.Test/Program.cs b/BBWY.Test/Program.cs
index d096661a..f7b758b8 100644
--- a/BBWY.Test/Program.cs
+++ b/BBWY.Test/Program.cs
@@ -32,35 +32,35 @@ namespace BBWY.Test
 
             var appKey = "120EA9EC65AB017567D78CC1139EEEA5";
             var appSecret = "866a9877f5f24b03b537483b4defe75d";
-            var token = "940b1e24d84843ffbbee3833984a6f0bwyjf";
+            var token = "2ace3023200c4ea9aa682bbf8bffee18jztm";
             var jdClient = GetJdClient(appKey, appSecret);
 
-            //PopAfsSoaRefundapplyQueryPageListRequest req = new PopAfsSoaRefundapplyQueryPageListRequest();
-            ////req.ids = "1428310918";
-            ////req.orderId = "249207996365";
-            //req.checkTimeStart = DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd HH:mm:ss");
-            //req.checkTimeEnd = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-            //req.pageIndex =1;
-            //req.pageSize = 50;
+            PopAfsSoaRefundapplyQueryPageListRequest req = new PopAfsSoaRefundapplyQueryPageListRequest();
+            //req.ids = "1428310918";
+            req.orderId = "249263452032";
+            req.checkTimeStart = DateTime.Now.AddDays(-60).ToString("yyyy-MM-dd HH:mm:ss");
+            req.checkTimeEnd = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            req.pageIndex = 1;
+            req.pageSize = 50;
 
 
-            //PopAfsSoaRefundapplyQueryPageListResponse response = jdClient.Execute(req, token, DateTime.Now.ToLocalTime());
-            //Console.WriteLine(JsonConvert.SerializeObject(response));
-
+            PopAfsSoaRefundapplyQueryPageListResponse response = jdClient.Execute(req, token, DateTime.Now.ToLocalTime());
+            Console.WriteLine(JsonConvert.SerializeObject(response));
 
 
-            AscServiceAndRefundViewRequest req = new AscServiceAndRefundViewRequest();
+            Console.WriteLine("\r\n\r\n");
+            AscServiceAndRefundViewRequest req2 = new AscServiceAndRefundViewRequest();
 
 
-            //req.orderId = 249042075658;
+            req2.orderId = 249263452032;
 
             //req.applyTimeBegin = ;
 
             //req.applyTimeEnd = ;
 
-            req.approveTimeBegin = DateTime.Now.Date.AddDays(-1);
+            req2.approveTimeBegin = DateTime.Now.Date.AddDays(-1);
 
-            req.approveTimeEnd = DateTime.Now;
+            req2.approveTimeEnd = DateTime.Now;
 
             //req.pageNumber = ;
 
@@ -71,8 +71,8 @@ namespace BBWY.Test
             //req.buId = ;
 
 
-            AscServiceAndRefundViewResponse response = jdClient.Execute(req, token, DateTime.Now.ToLocalTime());
-            Console.WriteLine(JsonConvert.SerializeObject(response));
+            AscServiceAndRefundViewResponse response2 = jdClient.Execute(req2, token, DateTime.Now.ToLocalTime());
+            Console.WriteLine(JsonConvert.SerializeObject(response2));
             Console.ReadKey();
         }
     }