Browse Source

1

updatebug
shanji 2 years ago
parent
commit
325a33b821
  1. 36
      BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
  2. 16
      BBWYB.Server.Model/Dto/Request/PurchaseOrder/AssocationOrderCostDetailRequest.cs
  3. 5
      BBWYB.Server.Model/Dto/Request/PurchaseOrder/AssociationOrderRequest.cs

36
BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs

@ -460,10 +460,46 @@ namespace BBWYB.Server.Business
foreach (var purchaseOrder in request.AssociationPurchaseOrderList)
{
var avgFreight = purchaseOrder.PurchaseFreight / purchaseOrder.AssocationOrderCostDetailList.Count();
var dbPurchaserOrder = dbPurchaseOrderList.FirstOrDefault(x => x.PurchaseOrderId == purchaseOrder.PurchaserOrderId);
if (dbPurchaserOrder == null)
{
dbPurchaserOrder = new OrderPurchaseInfo()
{
Id = idGenerator.NewLong(),
OrderId = request.OrderId,
PurchaseAccountId = purchaseOrder.PurchaseAccountId,
PurchaseAccountName = purchaseOrder.PurchaseAccountName,
IsEnabled = true,
BelongSkuIds = string.Join(",", purchaseOrder.AssocationOrderCostDetailList.Select(x => x.SkuId)),
CreateTime = DateTime.Now,
PurchaseMethod = Enums.PurchaseMethod.线,
PurchaseOrderId = purchaseOrder.PurchaserOrderId,
PurchasePlatform = purchaseOrder.PurchasePlatform,
PurchaserId = purchaseOrder.PurchaserId,
PurchaserName = purchaseOrder.PurchaserName,
ShopId = request.ShopId
};
insertOrderPurchaseInfoList.Add(dbPurchaserOrder);
foreach (var assOrderCostDetail in purchaseOrder.AssocationOrderCostDetailList)
{
var dbOrderSku = dbOrderSkuList.FirstOrDefault(osku => osku.SkuId == assOrderCostDetail.SkuId);
var orderCostDetail = new OrderCostDetail()
{
Id = idGenerator.NewLong(),
CreateTime = DateTime.Now,
DeductionQuantity = assOrderCostDetail.PurchaseQuantity,
IsEnabled = true,
OrderId = request.OrderId,
ProductId = dbOrderSku.ProductId,
SkuId = assOrderCostDetail.SkuId,
PurchaseAmount = assOrderCostDetail.SkuAmount,
PurchaseFreight = avgFreight,
TotalCost = assOrderCostDetail.SkuAmount + avgFreight
};
insertOrderCostDetailList.Add(orderCostDetail);
}
}
else
{

16
BBWYB.Server.Model/Dto/Request/PurchaseOrder/AssocationOrderCostDetailRequest.cs

@ -14,19 +14,19 @@
/// </summary>
public decimal SkuAmount { get; set; }
/// <summary>
/// 采购运费
/// </summary>
public decimal PurchaseFreight { get; set; }
///// <summary>
///// 采购运费
///// </summary>
//public decimal PurchaseFreight { get; set; }
/// <summary>
/// 采购数量
/// </summary>
public int PurchaseQuantity { get; set; }
/// <summary>
/// 采购单价
/// </summary>
public decimal PurchasePrice { get; set; }
///// <summary>
///// 采购单价
///// </summary>
//public decimal PurchasePrice { get; set; }
}
}

5
BBWYB.Server.Model/Dto/Request/PurchaseOrder/AssociationOrderRequest.cs

@ -7,6 +7,11 @@
/// </summary>
public string OrderId { get; set; }
/// <summary>
/// 店铺Id (Shop对象的ShopId)
/// </summary>
public long ShopId { get; set; }
/// <summary>
/// 采购单列表
/// </summary>

Loading…
Cancel
Save