From 28ce35fc576215191e3704356f85669baed7fed7 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Sat, 27 May 2023 22:34:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=AE=B6=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=20=E4=BF=AE=E5=A4=8D=E6=94=B9=E4=BB=B7=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E9=81=97=E6=BC=8F=E8=AE=A2=E5=8D=95=E6=88=90=E6=9C=AC?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWYB.Server.API/Controllers/OrderController.cs    | 14 +++++++++++---
 BBWYB.Server.Business/Order/OrderBusiness.cs       |  7 ++++++-
 .../PurchaseOrder/PurchaseOrderBusiness.cs         | 10 +++++-----
 .../Dto/Request/Order/EditVenderRemarkRequest.cs   |  9 +++++++++
 4 files changed, 31 insertions(+), 9 deletions(-)
 create mode 100644 BBWYB.Server.Model/Dto/Request/Order/EditVenderRemarkRequest.cs

diff --git a/BBWYB.Server.API/Controllers/OrderController.cs b/BBWYB.Server.API/Controllers/OrderController.cs
index c6e38d2..3f6e849 100644
--- a/BBWYB.Server.API/Controllers/OrderController.cs
+++ b/BBWYB.Server.API/Controllers/OrderController.cs
@@ -58,11 +58,19 @@ namespace BBWYB.Server.API.Controllers
         /// </summary>
         /// <param name="request"></param>
         [HttpPost]
-        public void EditPrice([FromBody]OP_EditPriceRequest request)
-        { 
+        public void EditPrice([FromBody] OP_EditPriceRequest request)
+        {
             orderBusiness.EditPrice(request);
         }
 
-
+        /// <summary>
+        /// 修改商家备注
+        /// </summary>
+        /// <param name="request"></param>
+        [HttpPost]
+        public void EditVenderRemark([FromBody] EditVenderRemarkRequest request)
+        {
+            orderBusiness.EditVenderRemark(request);
+        }
     }
 }
diff --git a/BBWYB.Server.Business/Order/OrderBusiness.cs b/BBWYB.Server.Business/Order/OrderBusiness.cs
index 44a917b..74791a5 100644
--- a/BBWYB.Server.Business/Order/OrderBusiness.cs
+++ b/BBWYB.Server.Business/Order/OrderBusiness.cs
@@ -73,7 +73,6 @@ namespace BBWYB.Server.Business
             return (o, ocs, oct) => new Order()
             {
                 Id = o.Id,
-                BuyerRemark = o.BuyerRemark,
                 EndTime = o.EndTime,
                 FreightPrice = o.FreightPrice,
                 ModifyTime = o.ModifyTime,
@@ -88,6 +87,7 @@ namespace BBWYB.Server.Business
                 StartTime = o.StartTime,
                 VenderRemark = o.VenderRemark,
                 PurchaseRemark = o.PurchaseRemark,
+                BuyerRemark = o.BuyerRemark,
                 //WaybillNo = o.WaybillNo,
                 SellerPreferentialAmount = o.SellerPreferentialAmount,
                 PreferentialAmount = o.PreferentialAmount,
@@ -317,5 +317,10 @@ namespace BBWYB.Server.Business
                                       HttpMethod.Post);
             #endregion
         }
+
+        public void EditVenderRemark(EditVenderRemarkRequest request)
+        {
+            fsql.Update<Order>(request.OrderId).Set(o => o.VenderRemark, request.VenderRemark).ExecuteAffrows();
+        }
     }
 }
diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
index 6d317e3..a303c5d 100644
--- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
+++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
@@ -1011,20 +1011,20 @@ namespace BBWYB.Server.Business
                         updateOrderCostDetailList.Add(fsql.Update<OrderCostDetail>().SetSource(dbOrderSkuDetail));
                     }
 
-                    dbOrderCost.PurchaseAmount = totalPurchaseAmount;
+                    dbOrderCost.TotalCost = dbOrderCost.PurchaseAmount = totalPurchaseAmount;
                     dbOrderCost.Profit = dbOrder.OrderTotalPrice -
                                          dbOrderCost.PurchaseAmount -
                                          dbOrderCost.DeliveryExpressFreight;  // -orderCost.PlatformCommissionAmount
+                    updateOrderCost = fsql.Update<OrderCost>(dbOrderCost.OrderId)
+                                          .Set(oc => oc.PurchaseAmount, dbOrderCost.PurchaseAmount)
+                                          .Set(oc => oc.TotalCost, dbOrderCost.TotalCost)
+                                          .Set(oc => oc.Profit, dbOrderCost.Profit);
 
                     fsql.Transaction(() =>
                     {
                         foreach (var update in updateOrderCostDetailList)
                             update.ExecuteAffrows();
                         updateOrderCost?.ExecuteAffrows();
-
-                        //fsql.Update<OrderCost>(dbOrderCost.OrderId).Set(oc => oc.PurchaseAmount, dbOrderCost.PurchaseAmount)
-                        //                                           .Set(oc => oc.Profit, dbOrderCost.Profit)
-                        //                                           .ExecuteAffrows();
                     });
                 }
             }
diff --git a/BBWYB.Server.Model/Dto/Request/Order/EditVenderRemarkRequest.cs b/BBWYB.Server.Model/Dto/Request/Order/EditVenderRemarkRequest.cs
new file mode 100644
index 0000000..6f9795a
--- /dev/null
+++ b/BBWYB.Server.Model/Dto/Request/Order/EditVenderRemarkRequest.cs
@@ -0,0 +1,9 @@
+namespace BBWYB.Server.Model.Dto
+{
+    public class EditVenderRemarkRequest
+    {
+        public string OrderId { get; set; }
+
+        public string VenderRemark { get; set; }
+    }
+}