From 7286eeb567f4c523f726d305ba51647e6e57a00a Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Mon, 15 Aug 2022 03:59:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=E5=8D=95=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=95=E4=BB=B7=E5=92=8C=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AfterSaleOrder/AfterSaleOrderResponse.cs  |  8 +++
 .../Models/AfterSaleOrder/AfterSaleOrder.cs   |  8 +++
 BBWY.Client/Views/Order/OrderList.xaml        | 71 +++++++++++++++++--
 .../AfterSaleOrder/AfterSaleOrderBusiness.cs  |  4 +-
 .../AfterSaleOrder/AfterSaleOrderResponse.cs  |  4 ++
 5 files changed, 89 insertions(+), 6 deletions(-)

diff --git a/BBWY.Client/Models/APIModel/Response/AfterSaleOrder/AfterSaleOrderResponse.cs b/BBWY.Client/Models/APIModel/Response/AfterSaleOrder/AfterSaleOrderResponse.cs
index 5781c2e9..4d10386b 100644
--- a/BBWY.Client/Models/APIModel/Response/AfterSaleOrder/AfterSaleOrderResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/AfterSaleOrder/AfterSaleOrderResponse.cs
@@ -109,5 +109,13 @@ namespace BBWY.Client.Models
         public string Logo { get; set; }
 
         public string Title { get; set; }
+
+        public int ItemTotal { get; set; }
+
+        public decimal Price { get; set; }
+
+        public string ContactName { get; set; }
+
+        public string Mobile { get; set; }
     }
 }
diff --git a/BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs b/BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs
index c9f0492c..e92bd4e3 100644
--- a/BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs
+++ b/BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs
@@ -109,5 +109,13 @@ namespace BBWY.Client.Models
         public string Logo { get; set; }
 
         public string Title { get; set; }
+
+        public int ItemTotal { get; set; }
+
+        public decimal Price { get; set; }
+
+        public string ContactName { get; set; }
+
+        public string Mobile { get; set; }
     }
 }
diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml
index a37b08d7..fc51f57c 100644
--- a/BBWY.Client/Views/Order/OrderList.xaml
+++ b/BBWY.Client/Views/Order/OrderList.xaml
@@ -313,7 +313,7 @@
                     Visibility="{Binding Visibility,ElementName=listbox_afterSaleOrder}">
                 <Grid>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="351"/>
+                        <ColumnDefinition Width="360"/>
                         <ColumnDefinition/>
                         <ColumnDefinition/>
                         <ColumnDefinition/>
@@ -961,7 +961,7 @@
                         <Grid Width="{Binding ActualWidth,ElementName=listbox_afterSaleOrder,Converter={StaticResource widthConverter},ConverterParameter=-0}">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="30"/>
-                                <RowDefinition/>
+                                <RowDefinition />
                             </Grid.RowDefinitions>
 
                             <Grid Background="#F2F2F2">
@@ -969,13 +969,16 @@
                                     <Border BorderBrush="{StaticResource Text.Pink}" BorderThickness="1"
                                             Background="White"
                                             Padding="5,0"
-                                            Height="25">
+                                            Height="25"
+                                            Margin="5,0,0,0">
                                         <TextBlock Text="{Binding ServiceResult,Converter={StaticResource objConverter},ConverterParameter=#null:服务单未结束:#source}"
                                                    Foreground="{StaticResource Text.Pink}"
                                                    VerticalAlignment="Center"/>
                                     </Border>
                                    
                                     <TextBlock Text="{Binding ApplyTime,StringFormat=yyyy-MM-dd HH:mm:ss}" VerticalAlignment="Center" Margin="5,0,0,0"/>
+                                    <Border Width="1" Margin="5,5,0,5" Background="{StaticResource Border.Brush}"/>
+
                                     <TextBlock VerticalAlignment="Center" Text="服务单号:" Margin="5,0,0,0" />
                                     <c:BButton Content="{Binding ServiceId}" Style="{StaticResource LinkButton}"
                                                Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
@@ -989,15 +992,73 @@
                                     <Border Width="1" Margin="5,5,0,5" Background="{StaticResource Border.Brush}"/>
                                     <StackPanel x:Name="txt_consignee" Margin="5,0,0,0" Orientation="Horizontal" VerticalAlignment="Center">
                                         <TextBlock Text="收货人:"/>
-                                        <TextBox Text="{Binding Consignee.ContactName}" Foreground="{StaticResource Text.Color}" 
+                                        <TextBox Text="{Binding ContactName}" Foreground="{StaticResource Text.Color}" 
                                                  IsReadOnly="True" Background="Transparent" BorderThickness="0"/>
                                         <TextBlock Text="联系电话:" Margin="5,0,0,0"/>
-                                        <TextBox Text="{Binding Consignee.Mobile}" Foreground="{StaticResource Text.Color}"
+                                        <TextBox Text="{Binding Mobile}" Foreground="{StaticResource Text.Color}"
                                                  IsReadOnly="True" Background="Transparent" BorderThickness="0"/>
                                     </StackPanel>
                                 </StackPanel>
                                 <Border VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
                             </Grid>
+
+                            <Grid Grid.Row="1">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="360"/>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                </Grid.ColumnDefinitions>
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="90"/>
+                                        <ColumnDefinition/>
+                                    </Grid.ColumnDefinitions>
+                                    <c:BAsyncImage UrlSource="{Binding Logo}"
+                                                               Width="80" DecodePixelWidth="80"
+                                                               VerticalAlignment="Top" Margin="0,5"/>
+                                    <StackPanel Grid.Column="1" Orientation="Vertical" Margin="0,5,0,5">
+                                        <TextBlock TextTrimming="CharacterEllipsis">
+                                            <TextBlock.ToolTip>
+                                                <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                    <TextBlock Text="{Binding Title}"/>
+                                                </ToolTip>
+                                            </TextBlock.ToolTip>
+                                                         <Run Text="SKU名称:"/>
+                                                         <Run Text="{Binding Title}"/>
+                                                    </TextBlock>
+                                        <StackPanel Orientation="Horizontal">
+                                            <StackPanel Orientation="Horizontal">
+                                                <TextBlock Text="SPU:"/>
+                                                <c:BButton Content="{Binding ProductId}" Style="{StaticResource LinkButton}"
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                                                   CommandParameter="{Binding ProductId}"
+                                                                   Margin=" 5,0,0,0"/>
+
+                                                <TextBlock Text="SKU:" Margin="5,0,0,0"/>
+                                                <c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}"
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                                                   CommandParameter="{Binding ProductId}"
+                                                                   Margin=" 5,0,0,0"/>
+                                            </StackPanel>
+                                        </StackPanel>
+                                        <StackPanel Orientation="Horizontal">
+                                            <TextBlock TextWrapping="Wrap">
+                                                            <Run Text="单价:"/>
+                                                            <Run Text="{Binding Price}"/>
+                                            </TextBlock>
+                                            <TextBlock TextWrapping="Wrap">
+                                                            <Run Text="数量:"/>
+                                                            <Run Text="{Binding ItemTotal}"/>
+                                            </TextBlock>
+                                        </StackPanel>
+                                     
+                                    </StackPanel>
+                                </Grid>
+                            </Grid>
                         </Grid>
                     </DataTemplate>
                 </ListBox.ItemTemplate>
diff --git a/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs b/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs
index 0ffc51a9..c7fedcd0 100644
--- a/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs
+++ b/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs
@@ -61,7 +61,9 @@ namespace BBWY.Server.Business
                 SkuId = aso.SkuId,
                 Title = osku.Title,
                 ContactName = oc.ContactName,
-                Mobile = oc.Mobile
+                Mobile = oc.Mobile,
+                ItemTotal = osku.ItemTotal.Value,
+                Price = osku.Price.Value
             });
             return new AfterSaleOrderListResponse()
             {
diff --git a/BBWY.Server.Model/Dto/Response/AfterSaleOrder/AfterSaleOrderResponse.cs b/BBWY.Server.Model/Dto/Response/AfterSaleOrder/AfterSaleOrderResponse.cs
index afcd8ac6..5e03bb81 100644
--- a/BBWY.Server.Model/Dto/Response/AfterSaleOrder/AfterSaleOrderResponse.cs
+++ b/BBWY.Server.Model/Dto/Response/AfterSaleOrder/AfterSaleOrderResponse.cs
@@ -11,5 +11,9 @@ namespace BBWY.Server.Model.Dto
         public string ContactName { get; set; }
 
         public string Mobile { get; set; }
+
+        public int ItemTotal { get; set; }
+
+        public decimal Price { get; set; }
     }
 }