修改商家备注

修复改价通知遗漏订单成本的bug

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);
+        }
     }
 }

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();
+        }
     }
 }

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();
                     });
                 }
             }

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; }
+    }
+}