From 31140163be1e57bcf62f739e464d3b3ed29520cd Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Wed, 13 Jul 2022 03:03:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=E4=BF=A1=E6=81=AF=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Response/Order/AfterSaleOrderResponse.cs  |  55 ++++++++
 .../APIModel/Response/Order/OrderResponse.cs  |   5 +
 BBWY.Client/Models/Enums.cs                   |  22 +++
 BBWY.Client/Models/MappingProfile.cs          |   1 +
 BBWY.Client/Models/Order/AfterSaleOrder.cs    |  54 ++++++++
 BBWY.Client/Models/Order/Order.cs             |   5 +
 BBWY.Client/Views/Order/OrderList.xaml        |  50 ++++++-
 BBWY.Server.Model/Db/Order/AfterSaleOrder.cs  | 125 +++++++++---------
 BBWY.Server.Model/Enums.cs                    |  23 +++-
 9 files changed, 274 insertions(+), 66 deletions(-)
 create mode 100644 BBWY.Client/Models/APIModel/Response/Order/AfterSaleOrderResponse.cs
 create mode 100644 BBWY.Client/Models/Order/AfterSaleOrder.cs

diff --git a/BBWY.Client/Models/APIModel/Response/Order/AfterSaleOrderResponse.cs b/BBWY.Client/Models/APIModel/Response/Order/AfterSaleOrderResponse.cs
new file mode 100644
index 00000000..33f4face
--- /dev/null
+++ b/BBWY.Client/Models/APIModel/Response/Order/AfterSaleOrderResponse.cs
@@ -0,0 +1,55 @@
+using BBWY.Client.Models;
+using System;
+
+namespace BBWY.Client.Models
+{
+    public class AfterSaleOrderResponse 
+    {
+	
+		public long Id { get; set; }
+		public DateTime? CreateTime { get; set; }
+
+		public string OrderId { get; set; }
+
+		public string ProductId { get; set; }
+
+		/// <summary>
+		/// 商品处理结果
+		/// </summary>
+		public ProductResult? ProductResult { get; set; }
+
+		/// <summary>
+		/// 退款金额
+		/// </summary>
+		public decimal? RefundAmount { get; set; } = 0.00M;
+
+		/// <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; }
+
+		public string SkuId { get; set; }
+	}
+}
diff --git a/BBWY.Client/Models/APIModel/Response/Order/OrderResponse.cs b/BBWY.Client/Models/APIModel/Response/Order/OrderResponse.cs
index 958b0b58..d0d363d0 100644
--- a/BBWY.Client/Models/APIModel/Response/Order/OrderResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/Order/OrderResponse.cs
@@ -169,6 +169,11 @@ namespace BBWY.Client.Models
         /// 代发信息
         /// </summary>
         public IList<OrderDropShippingResponse> OrderDropShippingList { get; set; }
+
+        /// <summary>
+        /// 售后信息
+        /// </summary>
+        public IList<AfterSaleOrderResponse> AfterSaleOrderList { get; set; }
     }
 
     public class OrderListResponse
diff --git a/BBWY.Client/Models/Enums.cs b/BBWY.Client/Models/Enums.cs
index a21ed807..e599dd2e 100644
--- a/BBWY.Client/Models/Enums.cs
+++ b/BBWY.Client/Models/Enums.cs
@@ -150,4 +150,26 @@
         刷单 = 11,
         质检报告 = 12
     }
+
+    /// <summary>
+    /// 服务单处理方式
+    /// </summary>
+    public enum ServiceResult
+    {
+        退货 = 0,
+        换新 = 1,
+        原返 = 2,
+        线下换新 = 3
+    }
+
+    /// <summary>
+    /// 商品处理方式
+    /// </summary>
+    public enum ProductResult
+    {
+        退款退货 = 0,
+        商品入库 = 1,
+        报损 = 2,
+        换新 = 3
+    }
 }
diff --git a/BBWY.Client/Models/MappingProfile.cs b/BBWY.Client/Models/MappingProfile.cs
index a93b0001..d1d9da35 100644
--- a/BBWY.Client/Models/MappingProfile.cs
+++ b/BBWY.Client/Models/MappingProfile.cs
@@ -11,6 +11,7 @@ namespace BBWY.Client.Models
             CreateMap<OrderCouponResponse, OrderCoupon>();
             CreateMap<OrderCostResponse, OrderCost>();
             CreateMap<ConsigneeResponse, Consignee>();
+            CreateMap<AfterSaleOrderResponse, AfterSaleOrder>();
             CreateMap<OrderResponse, Order>();
             CreateMap<OrderSkuResponse, OrderSku>().ForMember(t => t.ProductItemNum, opt => opt.MapFrom(f => f.ProductNo));
 
diff --git a/BBWY.Client/Models/Order/AfterSaleOrder.cs b/BBWY.Client/Models/Order/AfterSaleOrder.cs
new file mode 100644
index 00000000..2ac9de4d
--- /dev/null
+++ b/BBWY.Client/Models/Order/AfterSaleOrder.cs
@@ -0,0 +1,54 @@
+using System;
+
+namespace BBWY.Client.Models
+{
+    public class AfterSaleOrder
+    {
+	
+		public long Id { get; set; }
+		public DateTime? CreateTime { get; set; }
+
+		public string OrderId { get; set; }
+
+		public string ProductId { get; set; }
+
+		/// <summary>
+		/// 商品处理结果
+		/// </summary>
+		public ProductResult? ProductResult { get; set; }
+
+		/// <summary>
+		/// 退款金额
+		/// </summary>
+		public decimal? RefundAmount { get; set; } = 0.00M;
+
+		/// <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; }
+
+		public string SkuId { get; set; }
+	}
+}
diff --git a/BBWY.Client/Models/Order/Order.cs b/BBWY.Client/Models/Order/Order.cs
index eb85f5b9..a1d5b9a6 100644
--- a/BBWY.Client/Models/Order/Order.cs
+++ b/BBWY.Client/Models/Order/Order.cs
@@ -196,6 +196,11 @@ namespace BBWY.Client.Models
         /// </summary>
         public IList<OrderDropShipping> OrderDropShippingList { get; set; }
 
+        /// <summary>
+        /// 售后信息
+        /// </summary>
+        public IList<AfterSaleOrderResponse> AfterSaleOrderList { get; set; }
+
         public void ConvertOrderCostDetailToGroup()
         {
             if (OrderCostDetailList == null || OrderCostDetailList.Count() == 0)
diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml
index deee12a4..c43c400d 100644
--- a/BBWY.Client/Views/Order/OrderList.xaml
+++ b/BBWY.Client/Views/Order/OrderList.xaml
@@ -752,9 +752,53 @@
                                         Visibility="{Binding Visibility,ElementName=btn_outStore}"/>
                                 </Grid>
 
-                                <ListBox x:Name="listbox_afterSaleOrder" Grid.Column="5"
-                                         Visibility="Collapsed">
-                                        
+                                <ListBox x:Name="listbox_afterSaleOrder" 
+                                         Grid.Column="5"
+                                         Visibility="Collapsed"
+                                         ItemsSource="{Binding AfterSaleOrderList}"
+                                         Style="{StaticResource NoScrollViewListBoxStyle}"
+                                         ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
+                                         VerticalAlignment="Center"
+                                         Foreground="{StaticResource Text.Color}">
+                                    <ListBox.ItemTemplate>
+                                        <DataTemplate>
+                                            <StackPanel Grid.Column="2" VerticalAlignment="Center" 
+                                            HorizontalAlignment="Center" Margin="10,0,0,10">
+                                                <TextBlock>
+                                                    <Run Text="SKU"/>
+                                                    <Run Text="{Binding SkuId}"/>
+                                                </TextBlock>
+                                                <TextBlock>
+                                                    <Run Text="服务端处理结果"/>
+                                                    <Run Text="{Binding ServiceResult,ConverterParameter=#null:未处理:#source,Converter={StaticResource objConverter}}"/>
+                                                </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}}">
+                                                    <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}}">
+                                                    <Run Text="补发快递成本"/>
+                                                    <Run Text="{Binding ReissueFreight}"/>
+                                                </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}}">
+                                                    <Run Text="售后补偿成本"/>
+                                                    <Run Text="{Binding ReissueAfterSaleAmount}"/>
+                                                </TextBlock>
+                                            </StackPanel>
+                                        </DataTemplate>
+                                    </ListBox.ItemTemplate>
                                 </ListBox>
 
                                 <TextBlock Text="{Binding OrderState}" Grid.Column="6"
diff --git a/BBWY.Server.Model/Db/Order/AfterSaleOrder.cs b/BBWY.Server.Model/Db/Order/AfterSaleOrder.cs
index 9849f25c..4d398b58 100644
--- a/BBWY.Server.Model/Db/Order/AfterSaleOrder.cs
+++ b/BBWY.Server.Model/Db/Order/AfterSaleOrder.cs
@@ -5,67 +5,68 @@ namespace BBWY.Server.Model.Db
 {
 
     [Table(Name = "aftersaleorder", DisableSyncStructure = true)]
-	public partial class AfterSaleOrder {
-
-		[Column(IsPrimary = true)]
-		public long Id { get; set; }
-
-		[Column(DbType = "datetime")]
-		public DateTime? CreateTime { get; set; }
-
-		[Column(StringLength = 50)]
-		public string OrderId { get; set; }
-
-		[Column(StringLength = 50)]
-		public string ProductId { get; set; }
-
-		/// <summary>
-		/// 商品处理结果
-		/// </summary>
-		[Column(DbType = "int(255)")]
-		public int? ProductResult { get; set; }
-
-		/// <summary>
-		/// 退款金额
-		/// </summary>
-		[Column(DbType = "decimal(20,2)")]
-		public decimal? RefundAmount { get; set; } = 0.00M;
-
-		/// <summary>
-		/// 退款时间
-		/// </summary>
-		[Column(DbType = "datetime")]
-		public DateTime? RefundTime { get; set; }
-
-		/// <summary>
-		/// 售后补发成本
-		/// </summary>
-		[Column(DbType = "decimal(20,2)")]
-		public decimal? ReissueAfterSaleAmount { get; set; } = 0.00M;
-
-		/// <summary>
-		/// 补发快递费
-		/// </summary>
-		[Column(DbType = "decimal(20,2)")]
-		public decimal? ReissueFreight { get; set; } = 0.00M;
-
-		/// <summary>
-		/// 补发货款成本
-		/// </summary>
-		[Column(DbType = "decimal(20,2)")]
-		public decimal? ReissueProductAmount { get; set; } = 0.00M;
-
-		/// <summary>
-		/// 服务单处理结果
-		/// </summary>
-		[Column(DbType = "int(1)")]
-		public int? ServiceResult { get; set; }
-
-		public long? ShopId { get; set; }
-
-		[Column(StringLength = 50)]
-		public string SkuId { get; set; }
-
-	}
+    public partial class AfterSaleOrder
+    {
+
+        [Column(IsPrimary = true)]
+        public long Id { get; set; }
+
+        [Column(DbType = "datetime")]
+        public DateTime? CreateTime { get; set; }
+
+        [Column(StringLength = 50)]
+        public string OrderId { get; set; }
+
+        [Column(StringLength = 50)]
+        public string ProductId { get; set; }
+
+        /// <summary>
+        /// 商品处理结果
+        /// </summary>
+        [Column(DbType = "int(255)", MapType = typeof(int?))]
+        public Enums.ProductResult? ProductResult { get; set; }
+
+        /// <summary>
+        /// 退款金额
+        /// </summary>
+        [Column(DbType = "decimal(20,2)")]
+        public decimal? RefundAmount { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 退款时间
+        /// </summary>
+        [Column(DbType = "datetime")]
+        public DateTime? RefundTime { get; set; }
+
+        /// <summary>
+        /// 售后补发成本
+        /// </summary>
+        [Column(DbType = "decimal(20,2)")]
+        public decimal? ReissueAfterSaleAmount { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 补发快递费
+        /// </summary>
+        [Column(DbType = "decimal(20,2)")]
+        public decimal? ReissueFreight { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 补发货款成本
+        /// </summary>
+        [Column(DbType = "decimal(20,2)")]
+        public decimal? ReissueProductAmount { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 服务单处理结果
+        /// </summary>
+        [Column(DbType = "int(1)", MapType = typeof(int?))]
+        public Enums.ServiceResult? ServiceResult { get; set; }
+
+        public long? ShopId { get; set; }
+
+        [Column(StringLength = 50)]
+        public string SkuId { get; set; }
+
+    }
 
 }
diff --git a/BBWY.Server.Model/Enums.cs b/BBWY.Server.Model/Enums.cs
index 7c01242f..0025c007 100644
--- a/BBWY.Server.Model/Enums.cs
+++ b/BBWY.Server.Model/Enums.cs
@@ -104,12 +104,33 @@
             End = 1
         }
 
-
         public enum PayChannelType
         {
             支付宝 = 0,
             微信 = 1,
             银行卡 = 2
         }
+
+        /// <summary>
+        /// 服务单处理方式
+        /// </summary>
+        public enum ServiceResult
+        {
+            退货 = 0,
+            换新 = 1,
+            原返 = 2,
+            线下换新 = 3
+        }
+
+        /// <summary>
+        /// 商品处理方式
+        /// </summary>
+        public enum ProductResult
+        {
+            退款退货 = 0,
+            商品入库 = 1,
+            报损 = 2,
+            换新 = 3
+        }
     }
 }