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 /// /// [HttpPost] - public void EditPrice([FromBody]OP_EditPriceRequest request) - { + public void EditPrice([FromBody] OP_EditPriceRequest request) + { orderBusiness.EditPrice(request); } - + /// + /// 修改商家备注 + /// + /// + [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(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().SetSource(dbOrderSkuDetail)); } - dbOrderCost.PurchaseAmount = totalPurchaseAmount; + dbOrderCost.TotalCost = dbOrderCost.PurchaseAmount = totalPurchaseAmount; dbOrderCost.Profit = dbOrder.OrderTotalPrice - dbOrderCost.PurchaseAmount - dbOrderCost.DeliveryExpressFreight; // -orderCost.PlatformCommissionAmount + updateOrderCost = fsql.Update(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(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; } + } +}