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;