diff --git a/BBWY.Client/Models/APIModel/Response/Order/OrderCostDetailResponse.cs b/BBWY.Client/Models/APIModel/Response/Order/OrderCostDetailResponse.cs
index 85ae07ea..90db238b 100644
--- a/BBWY.Client/Models/APIModel/Response/Order/OrderCostDetailResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/Order/OrderCostDetailResponse.cs
@@ -76,8 +76,13 @@ namespace BBWY.Client.Models
public decimal StorageAmount { get; set; } = 0.00M;
///
- /// 总计
+ /// 总计(不含销售运费 历史遗留)
///
public decimal TotalCost { get; set; } = 0.00M;
+
+ ///
+ /// 总计 包含销售运费
+ ///
+ public decimal TotalCost2 { get; set; } = 0.00M;
}
}
diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml
index 2b2d5b10..3540fc99 100644
--- a/BBWY.Client/Views/Order/OrderList.xaml
+++ b/BBWY.Client/Views/Order/OrderList.xaml
@@ -795,7 +795,7 @@
Visibility="{Binding OutStorageAmount,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
-
+
diff --git a/BBWY.Server.Model/Db/Order/OrderCostDetail.cs b/BBWY.Server.Model/Db/Order/OrderCostDetail.cs
index 43b2859d..8e23704e 100644
--- a/BBWY.Server.Model/Db/Order/OrderCostDetail.cs
+++ b/BBWY.Server.Model/Db/Order/OrderCostDetail.cs
@@ -108,7 +108,7 @@ namespace BBWY.Server.Model.Db
{
get
{
- return SkuAmount + PurchaseFreight + FirstFreight + InStorageAmount + OutStorageAmount + StorageAmount + ConsumableAmount + DeliveryExpressFreight;
+ return SkuAmount + PurchaseFreight + FirstFreight + InStorageAmount + OutStorageAmount + StorageAmount + ConsumableAmount;
}
}
//[Column(DbType = "decimal(20,2)")]
diff --git a/BBWY.Server.Model/Dto/Response/Order/OrderCostDetailResponse.cs b/BBWY.Server.Model/Dto/Response/Order/OrderCostDetailResponse.cs
index 2c937b5f..2f24ee15 100644
--- a/BBWY.Server.Model/Dto/Response/Order/OrderCostDetailResponse.cs
+++ b/BBWY.Server.Model/Dto/Response/Order/OrderCostDetailResponse.cs
@@ -4,6 +4,12 @@ namespace BBWY.Server.Model.Dto
{
public class OrderCostDetailResponse : OrderCostDetail
{
-
+ ///
+ /// 总成本(包含销售运费)
+ ///
+ public decimal TotalCost2
+ {
+ get { return TotalCost + DeliveryExpressFreight; }
+ }
}
}