From 792f5d0e611a066d5700e1f924a66a03939f60e9 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Tue, 23 Aug 2022 14:12:41 +0800
Subject: [PATCH] 1

---
 .../APIModel/Response/Order/OrderCostDetailResponse.cs    | 7 ++++++-
 BBWY.Client/Views/Order/OrderList.xaml                    | 2 +-
 BBWY.Server.Model/Db/Order/OrderCostDetail.cs             | 2 +-
 .../Dto/Response/Order/OrderCostDetailResponse.cs         | 8 +++++++-
 4 files changed, 15 insertions(+), 4 deletions(-)

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;
 
         /// <summary>
-        /// 总计
+        /// 总计(不含销售运费 历史遗留)
         /// </summary>
         public decimal TotalCost { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 总计 包含销售运费
+        /// </summary>
+        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}}"/>
                                                                                         <TextBlock Text="{Binding StorageAmount}" Grid.Column="8" Style="{StaticResource middleTextBlock}"
                                                                                                    Visibility="{Binding StorageAmount,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
-                                                                                        <TextBlock Text="{Binding TotalCost,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
+                                                                                        <TextBlock Text="{Binding TotalCost2,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
                                                                                         <TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd}" Grid.Column="10" Style="{StaticResource middleTextBlock}"/>
                                                                                         <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
                                                                                         <Border Grid.Column="1" Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Margin="0,0,-1,0"/>
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
     {
-
+        /// <summary>
+        /// 总成本（包含销售运费）
+        /// </summary>
+        public decimal TotalCost2
+        {
+            get { return TotalCost + DeliveryExpressFreight; }
+        }
     }
 }