diff --git a/BBWY.Client/Models/APIModel/Response/Order/OrderCostResponse.cs b/BBWY.Client/Models/APIModel/Response/Order/OrderCostResponse.cs
index 13e6777c..a5aa6e4e 100644
--- a/BBWY.Client/Models/APIModel/Response/Order/OrderCostResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/Order/OrderCostResponse.cs
@@ -58,6 +58,26 @@ namespace BBWY.Client.Models
///
public decimal SDCommissionAmount { get; set; } = 0.00M;
+ ///
+ /// 退款金额
+ ///
+ public decimal RefundAmount { get; set; } = 0.00M;
+
+ ///
+ /// 补发快递费
+ ///
+ public decimal ReissueFreight { get; set; } = 0.00M;
+
+ ///
+ /// 补发货款成本
+ ///
+ public decimal ReissueProductAmount { get; set; } = 0.00M;
+
+ ///
+ /// 售后补偿成本
+ ///
+ public decimal ReissueAfterSaleAmount { get; set; } = 0.00M;
+
///
/// 成本总计
///
@@ -65,7 +85,7 @@ namespace BBWY.Client.Models
{
get
{
- return SDCommissionAmount + PlatformCommissionAmount + PurchaseAmount + DeliveryExpressFreight;
+ return SDCommissionAmount + PlatformCommissionAmount + PurchaseAmount + DeliveryExpressFreight + ReissueFreight + ReissueProductAmount + ReissueAfterSaleAmount;
}
}
}
diff --git a/BBWY.Client/Models/Order/OrderCost.cs b/BBWY.Client/Models/Order/OrderCost.cs
index ca687bf6..78d1a1df 100644
--- a/BBWY.Client/Models/Order/OrderCost.cs
+++ b/BBWY.Client/Models/Order/OrderCost.cs
@@ -49,6 +49,26 @@
///
public bool IsManualEdited { get; set; }
+ ///
+ /// 退款金额
+ ///
+ public decimal RefundAmount { get; set; } = 0.00M;
+
+ ///
+ /// 补发快递费
+ ///
+ public decimal ReissueFreight { get; set; } = 0.00M;
+
+ ///
+ /// 补发货款成本
+ ///
+ public decimal ReissueProductAmount { get; set; } = 0.00M;
+
+ ///
+ /// 售后补偿成本
+ ///
+ public decimal ReissueAfterSaleAmount { get; set; } = 0.00M;
+
///
/// 成本总计
///
diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml
index c371946a..301fe020 100644
--- a/BBWY.Client/Views/Order/OrderList.xaml
+++ b/BBWY.Client/Views/Order/OrderList.xaml
@@ -11,7 +11,7 @@
xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
DataContext="{Binding OrderList,Source={StaticResource Locator}}"
mc:Ignorable="d"
- d:DesignHeight="450" d:DesignWidth="800"
+ d:DesignHeight="450" d:DesignWidth="2048"
Title="OrderList">
@@ -277,7 +277,8 @@
-
+
+
@@ -710,23 +711,25 @@
-
+
-
-
-
-
+
+
+
-
-
-
+
[Column(IsIgnore = true)]
public bool IsManualEdited { get; set; } = false;
+
+ ///
+ /// 退款金额
+ ///
+ [Column(IsIgnore = true)]
+ public decimal RefundAmount { get; set; } = 0.00M;
+
+ ///
+ /// 补发快递费
+ ///
+ [Column(IsIgnore = true)]
+ public decimal ReissueFreight { get; set; } = 0.00M;
+
+ ///
+ /// 补发货款成本
+ ///
+ [Column(IsIgnore = true)]
+ public decimal ReissueProductAmount { get; set; } = 0.00M;
+
+ ///
+ /// 售后补偿成本
+ ///
+ [Column(IsIgnore = true)]
+ public decimal ReissueAfterSaleAmount { get; set; } = 0.00M;
#endregion
#region 收货人信息
diff --git a/BBWY.Server.Model/MappingProfiles.cs b/BBWY.Server.Model/MappingProfiles.cs
index d5228790..f3fd80aa 100644
--- a/BBWY.Server.Model/MappingProfiles.cs
+++ b/BBWY.Server.Model/MappingProfiles.cs
@@ -52,7 +52,11 @@ namespace BBWY.Server.Model
.ForPath(t => t.OrderCost.PlatformCommissionRatio, opt => opt.MapFrom(f => f.PlatformCommissionRatio ?? 0))
.ForPath(t => t.OrderCost.PreferentialAmount, opt => opt.MapFrom(f => f.PreferentialAmount))
.ForPath(t => t.OrderCost.IsManualEdited, opt => opt.MapFrom(f => f.IsManualEdited))
- .ForPath(t => t.OrderCost.SDCommissionAmount, opt => opt.MapFrom(f => f.SDCommissionAmount));
+ .ForPath(t => t.OrderCost.SDCommissionAmount, opt => opt.MapFrom(f => f.SDCommissionAmount))
+ .ForPath(t => t.OrderCost.RefundAmount, opt => opt.MapFrom(f => f.RefundAmount))
+ .ForPath(t => t.OrderCost.ReissueAfterSaleAmount, opt => opt.MapFrom(f => f.ReissueAfterSaleAmount))
+ .ForPath(t => t.OrderCost.ReissueFreight, opt => opt.MapFrom(f => f.ReissueFreight))
+ .ForPath(t => t.OrderCost.ReissueProductAmount, opt => opt.MapFrom(f => f.ReissueProductAmount));
//.ForPath(t => t.OrderDropShipping.PurchaseAmount, opt => opt.MapFrom(f => f.PurchaseAmount))
//.ForPath(t => t.OrderDropShipping.PurchaseOrderId, opt => opt.MapFrom(f => f.PurchaseOrderId))
//.ForPath(t => t.OrderDropShipping.OrderId, opt => opt.MapFrom(f => f.Id))