Browse Source

修复预估成本的订单在自动计算成本时的重复计算问题

pjzs_starttask_update
shanji 2 years ago
parent
commit
259f3b2b71
  1. 18
      BBWY.Server.Business/Order/OrderBusiness.cs

18
BBWY.Server.Business/Order/OrderBusiness.cs

@ -596,17 +596,6 @@ namespace BBWY.Server.Business
SkuAmount = purchaseOrder.SingleSkuAmount * deductionQuantity, SkuAmount = purchaseOrder.SingleSkuAmount * deductionQuantity,
StorageAmount = purchaseOrder.SingleStorageAmount * deductionQuantity StorageAmount = purchaseOrder.SingleStorageAmount * deductionQuantity
}; };
//orderCostDetail.SkuGrossProfit = orderSku.Price.Value * deductionQuantity - avgPreferential - (orderCostDetail.TotalCost + orderCostDetail.DeliveryExpressFreight) - orderSku.Price.Value * deductionQuantity * autoCalculationCostRequest.PlatformCommissionRatio;
//var shouldPay = orderSku.ShouldPay ?? 0M;
//var pingTaiCoupon = orderSku.PingTaiChengDanYouHuiQuan ?? 0M;
//var venderFee = orderSku.VenderFee ?? 0M;
//var koudian = (shouldPay - venderFee) * deductionQuantity * autoCalculationCostRequest.PlatformCommissionRatio;
//orderCostDetail.SkuGrossProfit = (shouldPay + pingTaiCoupon) * deductionQuantity -
// orderCostDetail.TotalCost - orderCostDetail.DeliveryExpressFreight -
// koudian;
orderCostDetail.CalculationSkuGrossProfit(orderSku.ShouldPay ?? 0M, orderCostDetail.CalculationSkuGrossProfit(orderSku.ShouldPay ?? 0M,
orderSku.PingTaiChengDanYouHuiQuan ?? 0M, orderSku.PingTaiChengDanYouHuiQuan ?? 0M,
@ -642,7 +631,12 @@ namespace BBWY.Server.Business
} }
else else
{ {
orderCost.IsEstimateCost = false; if (orderCost.IsEstimateCost == true)
{
orderCost.IsEstimateCost = false;
orderCost.PurchaseAmount = 0M;
orderCost.DeliveryExpressFreight = 0M;
}
orderCost.PurchaseAmount += orderCostPurchaseAmount; orderCost.PurchaseAmount += orderCostPurchaseAmount;
orderCost.DeliveryExpressFreight += orderDeliveryExpressFreight; orderCost.DeliveryExpressFreight += orderDeliveryExpressFreight;
orderCost.CalculationOrderProfitAndCost(dbOrder, dbAfterSaleOrderList); orderCost.CalculationOrderProfitAndCost(dbOrder, dbAfterSaleOrderList);

Loading…
Cancel
Save