From 52f340cd34b9816786063d3d0cefcfd63a12d9bb Mon Sep 17 00:00:00 2001 From: sanji Date: Wed, 22 Nov 2023 14:43:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=89=A9=E5=B1=95=E5=87=BD=E6=95=B0=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E8=AE=A2=E5=8D=95=E5=88=A9=E6=B6=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseOrder/PurchaseOrderBusiness.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs index af931816..a6374d28 100644 --- a/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs +++ b/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs @@ -293,12 +293,13 @@ namespace BBWY.Server.Business SDOrderAmount = 0, PurchaseAmount = purchaseOrderSimpleInfo.TotalAmount }; - orderCost.PlatformCommissionAmount = dbOrder.OrderSellerPrice * orderCost.PlatformCommissionRatio; - orderCost.Profit = dbOrder.OrderSellerPrice + - dbOrder.FreightPrice - - orderCost.PurchaseAmount - - orderCost.DeliveryExpressFreight - - orderCost.PlatformCommissionAmount; + //orderCost.PlatformCommissionAmount = dbOrder.OrderSellerPrice * orderCost.PlatformCommissionRatio; + //orderCost.Profit = dbOrder.OrderSellerPrice + + // dbOrder.FreightPrice - + // orderCost.PurchaseAmount - + // orderCost.DeliveryExpressFreight - + // orderCost.PlatformCommissionAmount; + orderCost.CalculationOrderProfitAndCost(dbOrder, null); if (!isRepurchase) { insertOrderCost = fsql.Insert(orderCost); From e0506132ca95b7b2b9dd7d772c8a02740c1b107b Mon Sep 17 00:00:00 2001 From: sanji Date: Wed, 22 Nov 2023 16:22:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=B9=E4=BB=B7=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E8=AE=A2=E5=8D=95sku=E6=AF=9B=E5=88=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseOrder/PurchaseOrderBusiness.cs | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs index a6374d28..ca2b873d 100644 --- a/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs +++ b/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs @@ -713,6 +713,15 @@ namespace BBWY.Server.Business orderCostDetail.SkuAmount = currentOrderSkuProductAmount; orderCostDetail.PurchaseFreight = currentOrderSkuFreightAmount; + orderCostDetail.CalculationSkuGrossProfit(orderSku.ShouldPay ?? 0M, + orderSku.PingTaiChengDanYouHuiQuan ?? 0M, + orderSku.SuperRedEnvelope ?? 0M, + orderSku.XianPinLeiDongQuan ?? 0M, + orderSku.VenderFee ?? 0M, + orderSku.JingDou ?? 0M, + orderSku.DongQuan ?? 0M, + orderSku.Balance ?? 0M, + orderCost.PlatformCommissionRatio); //orderCostDetail.UnitCost = purchaseOrder.UnitCost; //orderCostDetail.TotalCost = currentOrderSkuProductAmount + currentOrderSkuFreightAmount; @@ -722,11 +731,12 @@ namespace BBWY.Server.Business } orderCost.PurchaseAmount = purchaseOrderSimpleInfo.TotalAmount; - orderCost.Profit = dbOrder.OrderSellerPrice + - dbOrder.FreightPrice - - orderCost.PurchaseAmount - - orderCost.DeliveryExpressFreight - - orderCost.PlatformCommissionAmount; + //orderCost.Profit = dbOrder.OrderSellerPrice + + // dbOrder.FreightPrice - + // orderCost.PurchaseAmount - + // orderCost.DeliveryExpressFreight - + // orderCost.PlatformCommissionAmount; + orderCost.CalculationOrderProfitAndCost(dbOrder, null); orderDropshipping.PurchaseAmount = purchaseOrderSimpleInfo.TotalAmount; orderDropshipping.SkuAmount = purchaseOrderSimpleInfo.ProductAmount;