From eb8df8f3baf98fb8f7fa1d07e1359002580086a0 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Sun, 17 Jul 2022 14:49:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/Models/Order/OrderCost.cs  | 10 ++++++
 BBWY.Client/Views/Order/OrderList.xaml | 43 ++++++++++++++++++++++++--
 2 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/BBWY.Client/Models/Order/OrderCost.cs b/BBWY.Client/Models/Order/OrderCost.cs
index 78d1a1df..f3eb7c5a 100644
--- a/BBWY.Client/Models/Order/OrderCost.cs
+++ b/BBWY.Client/Models/Order/OrderCost.cs
@@ -54,6 +54,11 @@
         /// </summary>
         public decimal RefundAmount { get; set; } = 0.00M;
 
+        /// <summary>
+        /// 退款采购金额
+        /// </summary>
+        public decimal RefundPurchaseAmount { get; set; } = 0.0M;
+
         /// <summary>
         /// 补发快递费
         /// </summary>
@@ -69,6 +74,11 @@
         /// </summary>
         public decimal ReissueAfterSaleAmount { get; set; } = 0.00M;
 
+        /// <summary>
+        /// 补发总计
+        /// </summary>
+        public decimal TotalReissue { get { return ReissueFreight + ReissueProductAmount + ReissueAfterSaleAmount; } }
+
         /// <summary>
         /// 成本总计
         /// </summary>
diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml
index 94f17206..f358b39a 100644
--- a/BBWY.Client/Views/Order/OrderList.xaml
+++ b/BBWY.Client/Views/Order/OrderList.xaml
@@ -552,6 +552,11 @@
                                         </Path>
                                     </StackPanel>
 
+                                    <TextBlock Visibility="{Binding OrderCost.RefundAmount,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"
+                                               Foreground="Red">
+                                            <Run Text="退款金额"/>
+                                            <Run Text="{Binding OrderCost.RefundAmount}"/>
+                                    </TextBlock>
 
                                     <StackPanel x:Name="sp_orderCoupon" Orientation="Horizontal">
                                         <TextBlock>
@@ -686,6 +691,12 @@
                                         </Path>
                                     </StackPanel>
 
+                                    <TextBlock Visibility="{Binding OrderCost.RefundPurchaseAmount,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"
+                                               Foreground="Red">
+                                            <Run Text="退采金额"/>
+                                            <Run Text="{Binding OrderCost.RefundPurchaseAmount}"/>
+                                    </TextBlock>
+
                                     <TextBlock>
                                         <Run Text="快递费用"/>
                                         <Run Text="{Binding OrderCost.DeliveryExpressFreight}"/>
@@ -702,13 +713,41 @@
                                         <Run Text="{Binding OrderCost.SDCommissionAmount}"/>
                                     </TextBlock>
 
+                                    <StackPanel Orientation="Horizontal"
+                                                Visibility="{Binding OrderCost.TotalReissue,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}">
+                                        <TextBlock>
+                                            <Run Text="补发总计"/>
+                                            <Run Text="{Binding OrderCost.TotalReissue,Mode=OneWay}"/>
+                                        </TextBlock>
+
+                                        <Path Style="{StaticResource path_question}" Width="14" Margin="5,0,0,0" Fill="#EC808D" ToolTipService.InitialShowDelay="0">
+                                            <Path.ToolTip>
+                                                <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                    <StackPanel>
+                                                        <TextBlock>
+                                                        <Run Text="补发快递成本"/>
+                                                        <Run Text="{Binding OrderCost.ReissueFreight}"/>
+                                                        </TextBlock>
+                                                        <TextBlock>
+                                                        <Run Text="补发货款成本"/>
+                                                        <Run Text="{Binding OrderCost.ReissueProductAmount}"/>
+                                                        </TextBlock>
+                                                        <TextBlock>
+                                                        <Run Text="售后补偿成本"/>
+                                                        <Run Text="{Binding OrderCost.ReissueAfterSaleAmount}"/>
+                                                        </TextBlock>
+                                                    </StackPanel>
+                                                </ToolTip>
+                                            </Path.ToolTip>
+                                        </Path>
+                                    </StackPanel>
                                     <TextBlock>
                                             <Run Text="成本总计"/>
                                             <Run Text="{Binding OrderCost.TotalCost,Mode=OneWay}"/>
                                     </TextBlock>
                                 </StackPanel>
 
-                                <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Column="3" VerticalAlignment="Bottom" Margin="0,0,0,25"
+                                <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Column="3" VerticalAlignment="Bottom" Margin="0,0,0,23"
                                         Visibility="{Binding Visibility,ElementName=btn_editCost}"/>
                                 <c:BButton x:Name="btn_editCost" Content="修改" Grid.Column="3" VerticalAlignment="Bottom"
                                            Foreground="{StaticResource Text.Color}"
@@ -718,7 +757,7 @@
                                            Command="{Binding DataContext.EditCostCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
                                            CommandParameter="{Binding }"
                                            Visibility="{Binding StorageType,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
-                                           Height="25"/>
+                                           Height="23"/>
 
                                 <StackPanel Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Center">
                                     <TextBlock>