From 2403b522a53a05bfc789860ce5f7a73f0e829a4d Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Thu, 18 Aug 2022 03:45:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AfterSaleOrder/AfterSaleOrderResponse.cs  | 20 +++++++++++++
 .../Models/AfterSaleOrder/AfterSaleOrder.cs   | 21 ++++++++++++++
 .../ViewModels/Order/OrderListViewModel.cs    |  7 +++++
 ...ditAfterSaleOrderRefundPurchaseAmount.xaml |  3 ++
 BBWY.Client/Views/Order/OrderList.xaml        | 29 +++++++++++++++++--
 .../Controllers/AfterSaleOrderController.cs   |  2 +-
 6 files changed, 79 insertions(+), 3 deletions(-)

diff --git a/BBWY.Client/Models/APIModel/Response/AfterSaleOrder/AfterSaleOrderResponse.cs b/BBWY.Client/Models/APIModel/Response/AfterSaleOrder/AfterSaleOrderResponse.cs
index be16181b..a2926417 100644
--- a/BBWY.Client/Models/APIModel/Response/AfterSaleOrder/AfterSaleOrderResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/AfterSaleOrder/AfterSaleOrderResponse.cs
@@ -131,5 +131,25 @@ namespace BBWY.Client.Models
         /// 退款支付宝订单号
         /// </summary>
         public string RefundAlipayOrderNo { get; set; }
+
+        /// <summary>
+        /// 采购方式
+        /// </summary>
+        public PurchaseMethod? PurchaseMethod { get; set; }
+
+        /// <summary>
+        /// 采购平台
+        /// </summary>
+        public Platform? PurchasePlatform { get; set; }
+
+        /// <summary>
+        /// 采购单号
+        /// </summary>
+        public string PurchaseOrderId { get; set; }
+
+        /// <summary>
+        /// 采购单主键
+        /// </summary>
+        public long? PurchaseOrderPKId { get; set; }
     }
 }
diff --git a/BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs b/BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs
index 6fce77ac..4ae88b17 100644
--- a/BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs
+++ b/BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs
@@ -117,6 +117,27 @@ namespace BBWY.Client.Models
         /// </summary>
         public string RefundAlipayOrderNo { get; set; }
 
+
+        /// <summary>
+        /// 采购方式
+        /// </summary>
+        public PurchaseMethod? PurchaseMethod { get; set; }
+
+        /// <summary>
+        /// 采购平台
+        /// </summary>
+        public Platform? PurchasePlatform { get; set; }
+
+        /// <summary>
+        /// 采购单号
+        /// </summary>
+        public string PurchaseOrderId { get; set; }
+
+        /// <summary>
+        /// 采购单主键
+        /// </summary>
+        public long? PurchaseOrderPKId { get; set; }
+
         public object Clone()
         {
             return this.MemberwiseClone();
diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
index eef18d6e..fcf308a5 100644
--- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
+++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
@@ -272,6 +272,13 @@ namespace BBWY.Client.ViewModels
                 return;
             }
             var afterSaleOrderResponse = afterOrderService.GetAfterSaleOrderById(afterSaleOrderId);
+            IsLoading = false;
+            if (!afterSaleOrderResponse.Success)
+            {
+                Application.Current.Dispatcher.Invoke(() => MessageBox.Show(afterSaleOrderResponse.Msg, "查询售后单"));
+                return;
+            }
+
             var newAfterSaleOrder = afterSaleOrderResponse.Data.Map<AfterSaleOrder>();
             App.Current.Dispatcher.Invoke(() =>
             {
diff --git a/BBWY.Client/Views/Order/EditAfterSaleOrderRefundPurchaseAmount.xaml b/BBWY.Client/Views/Order/EditAfterSaleOrderRefundPurchaseAmount.xaml
index fc53620a..67c41893 100644
--- a/BBWY.Client/Views/Order/EditAfterSaleOrderRefundPurchaseAmount.xaml
+++ b/BBWY.Client/Views/Order/EditAfterSaleOrderRefundPurchaseAmount.xaml
@@ -6,6 +6,9 @@
         xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
         xmlns:local="clr-namespace:BBWY.Client.Views.Order"
         mc:Ignorable="d"
+             Style="{StaticResource bwstyle}"
+         MinButtonVisibility="Collapsed"
+        MaxButtonVisibility="Collapsed"
         Title="EditAfterSaleOrderRefundPurchaseAmount" Height="300" Width="300">
     <Grid>
         <Grid.RowDefinitions>
diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml
index 800a5f20..b1cdb292 100644
--- a/BBWY.Client/Views/Order/OrderList.xaml
+++ b/BBWY.Client/Views/Order/OrderList.xaml
@@ -1179,7 +1179,7 @@
                                     </Path>
                                 </StackPanel>
 
-                                <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Column="2" VerticalAlignment="Bottom" Margin="0,0,0,30"/>
+                                <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Column="2" VerticalAlignment="Bottom" Margin="0,0,0,25"/>
                                 <c:BButton Content="修改" VerticalAlignment="Bottom" 
                                            HorizontalAlignment="Stretch"
                                            Background="Transparent"
@@ -1194,8 +1194,33 @@
 
                                 <TextBlock Text="{Binding ProductHealth}" Grid.Column="4" HorizontalAlignment="Center" VerticalAlignment="Center"/>
                                 <Border Width="1" Background="{StaticResource Border.Brush}" Grid.Column="4" HorizontalAlignment="Right"/>
-                            </Grid>
 
+                                <StackPanel x:Name="sp_refundPurchaseAmount" Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,0,0,20"
+                                            Visibility="{Binding ProductHealth,ConverterParameter=厂家退货退款:Visible:Collapsed,Converter={StaticResource objConverter}}">
+                                    <TextBlock>
+                                        <Run Text="{Binding PurchasePlatform}"/>
+                                        <Run Text="{Binding PurchaseMethod}"/>
+                                    </TextBlock>
+                                    <TextBlock>
+                                        <Run Text="采购单号"/>
+                                        <Run Text="{Binding PurchaseOrderId}"/>
+                                    </TextBlock>
+                                    <TextBlock>
+                                        <Run Text="退款到账金额"/>
+                                        <Run Text="{Binding RefundPurchaseAmount}"/>
+                                    </TextBlock>
+                                </StackPanel>
+                                <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Column="5" VerticalAlignment="Bottom" Margin="0,0,0,25"
+                                        Visibility="{Binding Visibility,ElementName=sp_refundPurchaseAmount}"/>
+                                <c:BButton Content="退款" VerticalAlignment="Bottom" 
+                                           HorizontalAlignment="Stretch"
+                                           Background="Transparent"
+                                           Foreground="{StaticResource Text.Color}"
+                                           Grid.Column="5"
+                                           Command="{Binding DataContext.EditAfterSaleOrderRefundPurchaseAmountCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
+                                           CommandParameter="{Binding }"
+                                           Visibility="{Binding Visibility,ElementName=sp_refundPurchaseAmount}"/>
+                            </Grid>
                             <Border Grid.Row="1" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
                         </Grid>
                     </DataTemplate>
diff --git a/BBWY.Server.API/Controllers/AfterSaleOrderController.cs b/BBWY.Server.API/Controllers/AfterSaleOrderController.cs
index e519fe12..3a8d7c9c 100644
--- a/BBWY.Server.API/Controllers/AfterSaleOrderController.cs
+++ b/BBWY.Server.API/Controllers/AfterSaleOrderController.cs
@@ -30,7 +30,7 @@ namespace BBWY.Server.API.Controllers
         /// </summary>
         /// <param name="afterSaleOrderId"></param>
         /// <returns></returns>
-        [HttpGet]
+        [HttpGet("{afterSaleOrderId}")]
         public AfterSaleOrderResponse GetAfterSaleOrderById([FromRoute] long afterSaleOrderId)
         {
             return afterSaleOrderBusiness.GetAfterSaleOrderById(afterSaleOrderId);