|
@ -615,7 +615,7 @@ namespace BBWY.Server.Business |
|
|
if (osku != null) |
|
|
if (osku != null) |
|
|
{ |
|
|
{ |
|
|
orderCostDetail.SkuGrossProfit = osku.Price.Value * orderCostDetail.DeductionQuantity - |
|
|
orderCostDetail.SkuGrossProfit = osku.Price.Value * orderCostDetail.DeductionQuantity - |
|
|
(orderCostDetail.TotalCost + orderCostDetail.DeliveryExpressFreight) * |
|
|
(orderCostDetail.TotalCost + orderCostDetail.DeliveryExpressFreight) - |
|
|
osku.Price.Value * orderCostDetail.DeductionQuantity * manualCalculationCostRequest.PlatformCommissionRatio; |
|
|
osku.Price.Value * orderCostDetail.DeductionQuantity * manualCalculationCostRequest.PlatformCommissionRatio; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
@ -784,12 +784,14 @@ namespace BBWY.Server.Business |
|
|
List<PurchaseOrder> insertPurchaseOrderList = new List<PurchaseOrder>(); |
|
|
List<PurchaseOrder> insertPurchaseOrderList = new List<PurchaseOrder>(); |
|
|
List<OrderCostDetail> insertOrderCostDetailList = new List<OrderCostDetail>(); |
|
|
List<OrderCostDetail> insertOrderCostDetailList = new List<OrderCostDetail>(); |
|
|
|
|
|
|
|
|
|
|
|
var dbOrderSkuList = fsql.Select<OrderSku>().Where(osku => osku.OrderId == dbOrder.Id).ToList(); |
|
|
var oldPourchaseIdList = fsql.Select<OrderCostDetail>().Where(ocd => ocd.OrderId == dbOrder.Id) |
|
|
var oldPourchaseIdList = fsql.Select<OrderCostDetail>().Where(ocd => ocd.OrderId == dbOrder.Id) |
|
|
.ToList(ocd => ocd.PurchaseOrderPKId); |
|
|
.ToList(ocd => ocd.PurchaseOrderPKId); |
|
|
|
|
|
|
|
|
deletePurchaseOrder = fsql.Delete<PurchaseOrder>().Where(po => oldPourchaseIdList.Contains(po.Id)); |
|
|
deletePurchaseOrder = fsql.Delete<PurchaseOrder>().Where(po => oldPourchaseIdList.Contains(po.Id)); |
|
|
deleteOrderCostDetail = fsql.Delete<OrderCostDetail>().Where(ocd => ocd.OrderId == dbOrder.Id); |
|
|
deleteOrderCostDetail = fsql.Delete<OrderCostDetail>().Where(ocd => ocd.OrderId == dbOrder.Id); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
foreach (var odsRequest in relationPurchaseOrderRequestV2.OrderDropShippingList) |
|
|
foreach (var odsRequest in relationPurchaseOrderRequestV2.OrderDropShippingList) |
|
|
{ |
|
|
{ |
|
|
#region 代发信息表
|
|
|
#region 代发信息表
|
|
@ -843,7 +845,7 @@ namespace BBWY.Server.Business |
|
|
#endregion
|
|
|
#endregion
|
|
|
|
|
|
|
|
|
#region 明细
|
|
|
#region 明细
|
|
|
insertOrderCostDetailList.Add(new OrderCostDetail() |
|
|
var orderCostDetail = new OrderCostDetail() |
|
|
{ |
|
|
{ |
|
|
Id = idGenerator.NewLong(), |
|
|
Id = idGenerator.NewLong(), |
|
|
ConsumableAmount = 0, |
|
|
ConsumableAmount = 0, |
|
@ -863,7 +865,16 @@ namespace BBWY.Server.Business |
|
|
//TotalCost = relationOrderSku.SingleSkuAmount * relationOrderSku.Quantity + odsRequest.PurchaseFreight / odsRequest.RelationPurchaseOrderSkuList.Count(),
|
|
|
//TotalCost = relationOrderSku.SingleSkuAmount * relationOrderSku.Quantity + odsRequest.PurchaseFreight / odsRequest.RelationPurchaseOrderSkuList.Count(),
|
|
|
//UnitCost = purchaseOrder.UnitCost,
|
|
|
//UnitCost = purchaseOrder.UnitCost,
|
|
|
PurchaseOrderPKId = purchaseOrder.Id |
|
|
PurchaseOrderPKId = purchaseOrder.Id |
|
|
}); |
|
|
}; |
|
|
|
|
|
insertOrderCostDetailList.Add(orderCostDetail); |
|
|
|
|
|
|
|
|
|
|
|
var dbOrderSku = dbOrderSkuList.FirstOrDefault(dbosku => dbosku.SkuId == relationOrderSku.SkuId); |
|
|
|
|
|
if (dbOrderSku != null) |
|
|
|
|
|
{ |
|
|
|
|
|
orderCostDetail.SkuGrossProfit = dbOrderSku.Price.Value * orderCostDetail.DeductionQuantity - |
|
|
|
|
|
(orderCostDetail.TotalCost + orderCostDetail.DeliveryExpressFreight) - |
|
|
|
|
|
dbOrderSku.Price.Value * orderCostDetail.DeductionQuantity * relationPurchaseOrderRequestV2.PlatformCommissionRatio; |
|
|
|
|
|
} |
|
|
#endregion
|
|
|
#endregion
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|