From dbd29557e8df9291695b6a6af5fc42bc0e78d1c6 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Sun, 17 Jul 2022 14:02:11 +0800
Subject: [PATCH] 1

---
 .../APIModel/Response/Order/OrderCostResponse.cs     | 12 +++++++++++-
 BBWY.Server.Business/Order/OrderBusiness.cs          |  6 ++++--
 BBWY.Server.Model/Db/Order/Order.cs                  |  6 ++++++
 BBWY.Server.Model/Db/Order/OrderCost.cs              |  6 ++++++
 BBWY.Server.Model/MappingProfiles.cs                 |  3 ++-
 5 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/BBWY.Client/Models/APIModel/Response/Order/OrderCostResponse.cs b/BBWY.Client/Models/APIModel/Response/Order/OrderCostResponse.cs
index a5aa6e4e..bd401030 100644
--- a/BBWY.Client/Models/APIModel/Response/Order/OrderCostResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/Order/OrderCostResponse.cs
@@ -63,6 +63,11 @@ namespace BBWY.Client.Models
         /// </summary>
         public decimal RefundAmount { get; set; } = 0.00M;
 
+        /// <summary>
+        /// 退款采购金额
+        /// </summary>
+        public decimal RefundPurchaseAmount { get; set; } = 0.0M;
+
         /// <summary>
         /// 补发快递费
         /// </summary>
@@ -85,7 +90,12 @@ namespace BBWY.Client.Models
         {
             get
             {
-                return SDCommissionAmount + PlatformCommissionAmount + PurchaseAmount + DeliveryExpressFreight + ReissueFreight + ReissueProductAmount + ReissueAfterSaleAmount;
+                return SDCommissionAmount +  
+                       PlatformCommissionAmount + (PurchaseAmount - RefundPurchaseAmount) +
+                       DeliveryExpressFreight + 
+                       ReissueFreight + 
+                       ReissueProductAmount + 
+                       ReissueAfterSaleAmount;
             }
         }
     }
diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs
index 83d943f0..4523ac79 100644
--- a/BBWY.Server.Business/Order/OrderBusiness.cs
+++ b/BBWY.Server.Business/Order/OrderBusiness.cs
@@ -149,6 +149,7 @@ namespace BBWY.Server.Business
                 IsManualEdited = oct.IsManualEdited,
                 SDCommissionAmount = oct.SDCommissionAmount,
                 RefundAmount = oct.RefundAmount,
+                RefundPurchaseAmount = oct.RefundPurchaseAmount,
                 ReissueAfterSaleAmount = oct.ReissueAfterSaleAmount,
                 ReissueFreight = oct.ReissueFreight,
                 ReissueProductAmount = oct.ReissueProductAmount
@@ -362,6 +363,7 @@ namespace BBWY.Server.Business
                                                                            IsManualEdited = oct.IsManualEdited,
                                                                            SDCommissionAmount = oct.SDCommissionAmount,
                                                                            RefundAmount = oct.RefundAmount,
+                                                                           RefundPurchaseAmount = oct.RefundPurchaseAmount,
                                                                            ReissueAfterSaleAmount = oct.ReissueAfterSaleAmount,
                                                                            ReissueFreight = oct.ReissueFreight,
                                                                            ReissueProductAmount = oct.ReissueProductAmount
@@ -1045,7 +1047,7 @@ namespace BBWY.Server.Business
             dbOrderCost.ReissueAfterSaleAmount = afterSaleOrderSkuList.Sum(aso => aso.ReissueAfterSaleAmount ?? 0);
 
             //退款采购货款
-            var refundPurchaseAmount = fsql.Select<OrderCostDetail>().Where(ocd => ocd.OrderId == editAfterSaleOrderSkuRequest.OrderId &&
+            dbOrderCost.RefundPurchaseAmount = fsql.Select<OrderCostDetail>().Where(ocd => ocd.OrderId == editAfterSaleOrderSkuRequest.OrderId &&
                                                                             refundAfterSaleOrderSkuIds.Contains(ocd.SkuId))
                                                                      .Sum(ocd => ocd.TotalCost);
 
@@ -1054,7 +1056,7 @@ namespace BBWY.Server.Business
 
             //订单利润
             dbOrderCost.Profit = dbOrder.OrderSellerPrice + dbOrder.FreightPrice - dbOrderCost.RefundAmount -
-                                 (dbOrderCost.PurchaseAmount - refundPurchaseAmount) -
+                                 (dbOrderCost.PurchaseAmount - dbOrderCost.RefundPurchaseAmount) -
                                  dbOrderCost.DeliveryExpressFreight -
                                  dbOrderCost.PlatformCommissionAmount -
                                  dbOrderCost.ReissueProductAmount -
diff --git a/BBWY.Server.Model/Db/Order/Order.cs b/BBWY.Server.Model/Db/Order/Order.cs
index 20ae80b7..c2bc3e5b 100644
--- a/BBWY.Server.Model/Db/Order/Order.cs
+++ b/BBWY.Server.Model/Db/Order/Order.cs
@@ -239,6 +239,12 @@ namespace BBWY.Server.Model.Db
         /// </summary>
         [Column(IsIgnore = true)]
         public decimal ReissueAfterSaleAmount { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 退款采购金额
+        /// </summary>
+        [Column(IsIgnore = true)]
+        public decimal RefundPurchaseAmount { get; set; } = 0.0M;
         #endregion
 
         #region 收货人信息
diff --git a/BBWY.Server.Model/Db/Order/OrderCost.cs b/BBWY.Server.Model/Db/Order/OrderCost.cs
index 495c4ebb..b0472db7 100644
--- a/BBWY.Server.Model/Db/Order/OrderCost.cs
+++ b/BBWY.Server.Model/Db/Order/OrderCost.cs
@@ -67,6 +67,12 @@ namespace BBWY.Server.Model.Db
         [Column(DbType = "decimal(20,2)")]
         public decimal RefundAmount { get; set; } = 0.00M;
 
+        /// <summary>
+        /// 退款采购金额
+        /// </summary>
+        [Column(DbType = "decimal(20,2)")]
+        public decimal RefundPurchaseAmount { get; set; } = 0.0M;
+
         /// <summary>
         /// 补发快递费
         /// </summary>
diff --git a/BBWY.Server.Model/MappingProfiles.cs b/BBWY.Server.Model/MappingProfiles.cs
index 0a121f2b..1e20d8cb 100644
--- a/BBWY.Server.Model/MappingProfiles.cs
+++ b/BBWY.Server.Model/MappingProfiles.cs
@@ -56,10 +56,11 @@ namespace BBWY.Server.Model
                                              .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.RefundAmount, opt => opt.MapFrom(f => f.RefundAmount))
+                                             .ForPath(t => t.OrderCost.RefundPurchaseAmount, opt => opt.MapFrom(f => f.RefundPurchaseAmount))
                                              .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));
-          
+
         }
     }
 }