From 3b87cc78c19df4759753b4907304a89f0b8d39cd Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Tue, 16 Aug 2022 03:56:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Models/AfterSaleOrder/AfterSaleOrder.cs   | 52 ++++++++-----------
 .../Views/Order/EditAfterSaleOrderSku.xaml    |  2 +-
 .../Views/Order/EditAfterSaleOrderSku.xaml.cs |  3 +-
 3 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs b/BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs
index 0c9a3e96..18d36fe6 100644
--- a/BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs
+++ b/BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs
@@ -2,8 +2,15 @@
 
 namespace BBWY.Client.Models
 {
-    public class AfterSaleOrder : NotifyObject
+    public class AfterSaleOrder : NotifyObject, ICloneable
     {
+        private ProductResult? productResult;
+        private ServiceResult? serviceResult;
+        private ProductHealth? productHealth;
+
+        private decimal reissueAfterSaleAmount;
+        private decimal reissueFreight;
+        private decimal reissueProductAmount;
 
         public long Id { get; set; }
 
@@ -22,40 +29,16 @@ namespace BBWY.Client.Models
 
         public string ProductId { get; set; }
 
-        /// <summary>
-        /// 商品处理结果
-        /// </summary>
-        public ProductResult? ProductResult { get; set; }
-
         /// <summary>
         /// 退款金额
         /// </summary>
-        public decimal? RefundAmount { get; set; } = 0.00M;
+        public decimal RefundAmount { get; set; }
 
         /// <summary>
         /// 退款时间
         /// </summary>
         public DateTime? RefundTime { get; set; }
 
-        /// <summary>
-        /// 售后补发成本
-        /// </summary>
-        public decimal? ReissueAfterSaleAmount { get; set; } = 0.00M;
-
-        /// <summary>
-        /// 补发快递费
-        /// </summary>
-        public decimal? ReissueFreight { get; set; } = 0.00M;
-
-        /// <summary>
-        /// 补发货款成本
-        /// </summary>
-        public decimal? ReissueProductAmount { get; set; } = 0.00M;
-
-        /// <summary>
-        /// 服务单处理结果
-        /// </summary>
-        public ServiceResult? ServiceResult { get; set; }
 
         public long? ShopId { get; set; }
 
@@ -101,11 +84,6 @@ namespace BBWY.Client.Models
         /// </summary>
         public decimal? OutStorageAmount { get; set; } = 0.00M;
 
-        /// <summary>
-        /// 商品情况
-        /// </summary>
-        public ProductHealth? ProductHealth { get; set; }
-
         public string Logo { get; set; }
 
         public string Title { get; set; }
@@ -119,5 +97,17 @@ namespace BBWY.Client.Models
         public string Mobile { get; set; }
 
         public decimal AfterTotalCost { get; set; } = 0.0M;
+
+        public ProductResult? ProductResult { get => productResult; set { Set(ref productResult, value); } }
+        public ServiceResult? ServiceResult { get => serviceResult; set { Set(ref serviceResult, value); } }
+        public ProductHealth? ProductHealth { get => productHealth; set { Set(ref productHealth, value); } }
+        public decimal ReissueAfterSaleAmount { get => reissueAfterSaleAmount; set { Set(ref reissueAfterSaleAmount, value); } }
+        public decimal ReissueFreight { get => reissueFreight; set { Set(ref reissueFreight, value); } }
+        public decimal ReissueProductAmount { get => reissueProductAmount; set { Set(ref reissueProductAmount, value); } }
+
+        public object Clone()
+        {
+            return this.MemberwiseClone();
+        }
     }
 }
diff --git a/BBWY.Client/Views/Order/EditAfterSaleOrderSku.xaml b/BBWY.Client/Views/Order/EditAfterSaleOrderSku.xaml
index f30e0727..ec924e91 100644
--- a/BBWY.Client/Views/Order/EditAfterSaleOrderSku.xaml
+++ b/BBWY.Client/Views/Order/EditAfterSaleOrderSku.xaml
@@ -90,7 +90,7 @@
                         Text="{Binding SaleOrder.ReissueAfterSaleAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
 
             <TextBlock x:Name="txt_ReissueProductAmount" Text="补发货款" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="6"
-                       Visibility="{Binding SaleOrder.SerivceResult,ConverterParameter=维修|商品补发|线下换新:Visible:Collapsed}"/>
+                       Visibility="{Binding SaleOrder.ServiceResult,ConverterParameter=维修|商品补发|线下换新:Visible:Collapsed,Converter={StaticResource objConverter}}"/>
             <c:BTextBox Grid.Column="1" Grid.Row="6" Height="25" Margin="5,0"
                         Text="{Binding SaleOrder.ReissueProductAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                         Visibility="{Binding Visibility,ElementName=txt_ReissueProductAmount}"/>
diff --git a/BBWY.Client/Views/Order/EditAfterSaleOrderSku.xaml.cs b/BBWY.Client/Views/Order/EditAfterSaleOrderSku.xaml.cs
index b5894a07..2ee8b953 100644
--- a/BBWY.Client/Views/Order/EditAfterSaleOrderSku.xaml.cs
+++ b/BBWY.Client/Views/Order/EditAfterSaleOrderSku.xaml.cs
@@ -13,8 +13,7 @@ namespace BBWY.Client.Views.Order
         public EditAfterSaleOrderSku(AfterSaleOrder afterSaleOrder)
         {
             InitializeComponent();
-            //if (afterSaleOrder.Id != 0)
-            //    SaleOrder = (AfterSaleOrder)afterSaleOrder.Clone();
+            SaleOrder = afterSaleOrder.Clone() as AfterSaleOrder;
             this.DataContext = this;
         }