pengcong001
/
bbwy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwy

AddValidOverTime
506583276@qq.com 2 years ago
parent
489dd55476 e0506132ca
commit
253a2ae649
1 changed files with 22 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs

33
BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
View File

@ -293,12 +293,13 @@ namespace BBWY.Server.Business
SDOrderAmount = 0, SDOrderAmount = 0,
PurchaseAmount = purchaseOrderSimpleInfo.TotalAmount PurchaseAmount = purchaseOrderSimpleInfo.TotalAmount
}; };
orderCost.PlatformCommissionAmount = dbOrder.OrderSellerPrice * orderCost.PlatformCommissionRatio; //orderCost.PlatformCommissionAmount = dbOrder.OrderSellerPrice * orderCost.PlatformCommissionRatio;
orderCost.Profit = dbOrder.OrderSellerPrice + //orderCost.Profit = dbOrder.OrderSellerPrice +
dbOrder.FreightPrice - // dbOrder.FreightPrice -
orderCost.PurchaseAmount - // orderCost.PurchaseAmount -
orderCost.DeliveryExpressFreight - // orderCost.DeliveryExpressFreight -
orderCost.PlatformCommissionAmount; // orderCost.PlatformCommissionAmount;
orderCost.CalculationOrderProfitAndCost(dbOrder, null);
if (!isRepurchase) if (!isRepurchase)
{ {
insertOrderCost = fsql.Insert(orderCost); insertOrderCost = fsql.Insert(orderCost);
@ -712,6 +713,15 @@ namespace BBWY.Server.Business
orderCostDetail.SkuAmount = currentOrderSkuProductAmount; orderCostDetail.SkuAmount = currentOrderSkuProductAmount;
orderCostDetail.PurchaseFreight = currentOrderSkuFreightAmount; 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.UnitCost = purchaseOrder.UnitCost;
//orderCostDetail.TotalCost = currentOrderSkuProductAmount + currentOrderSkuFreightAmount; //orderCostDetail.TotalCost = currentOrderSkuProductAmount + currentOrderSkuFreightAmount;
@ -721,11 +731,12 @@ namespace BBWY.Server.Business
} }
orderCost.PurchaseAmount = purchaseOrderSimpleInfo.TotalAmount; orderCost.PurchaseAmount = purchaseOrderSimpleInfo.TotalAmount;
orderCost.Profit = dbOrder.OrderSellerPrice + //orderCost.Profit = dbOrder.OrderSellerPrice +
dbOrder.FreightPrice - // dbOrder.FreightPrice -
orderCost.PurchaseAmount - // orderCost.PurchaseAmount -
orderCost.DeliveryExpressFreight - // orderCost.DeliveryExpressFreight -
orderCost.PlatformCommissionAmount; // orderCost.PlatformCommissionAmount;
orderCost.CalculationOrderProfitAndCost(dbOrder, null);
orderDropshipping.PurchaseAmount = purchaseOrderSimpleInfo.TotalAmount; orderDropshipping.PurchaseAmount = purchaseOrderSimpleInfo.TotalAmount;
orderDropshipping.SkuAmount = purchaseOrderSimpleInfo.ProductAmount; orderDropshipping.SkuAmount = purchaseOrderSimpleInfo.ProductAmount;

Write Preview
Loading…
Cancel
Save