diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs index 42e534b9..1c0e8d0c 100644 --- a/BBWY.Server.Business/Order/OrderBusiness.cs +++ b/BBWY.Server.Business/Order/OrderBusiness.cs @@ -182,7 +182,7 @@ namespace BBWY.Server.Business order.OrderDropShippingList = orderDropShippingList.Where(ods => ods.OrderId == order.Id && ods.IsHistory == false).ToList(); order.HistoryOrderDropShippingList = orderDropShippingList.Where(ods => ods.OrderId == order.Id && ods.IsHistory).ToList(); } - + #endregion #region 处理Sku @@ -289,7 +289,8 @@ namespace BBWY.Server.Business OrderState = o.OrderState.Value, VenderRemark = o.VenderRemark, OrderPayment = o.OrderPayment, - OrderSellerPrice = o.OrderSellerPrice + OrderSellerPrice = o.OrderSellerPrice, + SDOrderAmount = oct.SDOrderAmount }); var orderIdList = orderSourceList.Select(o => o.OrderId).ToList(); @@ -301,7 +302,10 @@ namespace BBWY.Server.Business SkuAmount = g.Sum(g.Value.SkuAmount), FirstFreight = g.Sum(g.Value.FirstFreight), StorageAmount = g.Sum(g.Value.StorageAmount), - PurchaseFreight = g.Sum(g.Value.PurchaseFreight) + PurchaseFreight = g.Sum(g.Value.PurchaseFreight), + ConsumableAmount = g.Sum(g.Value.ConsumableAmount), + InStorageAmount = g.Sum(g.Value.InStorageAmount), + OutStorageAmount = g.Sum(g.Value.OutStorageAmount) }); var orderDropShippingList = fsql.Select().Where(ods => orderIdList.Contains(ods.OrderId) && ods.IsHistory == false).ToList(); @@ -314,6 +318,9 @@ namespace BBWY.Server.Business order.StorageAmount = statistics?.StorageAmount ?? 0M; order.SkuIds = string.Join("|", orderSkuList.Where(osku => osku.OrderId == order.OrderId).Select(osku => osku.SkuId)); order.ProfitRatio = order.TotalCost == 0 ? 0 : Math.Round(order.Profit / order.TotalCost * 100, 2); + order.ConsumableAmount = statistics?.ConsumableAmount ?? 0M; + order.InStorageAmount = statistics?.InStorageAmount ?? 0M; + order.OutStorageAmount = statistics?.OutStorageAmount ?? 0M; if (order.StorageType == Enums.StorageType.代发) order.PurchaseOrderIds = string.Join("|", orderDropShippingList.Where(ods => ods.OrderId == order.OrderId).Select(ods => ods.PurchaseOrderId)); } diff --git a/BBWY.Server.Model/Dto/Response/Order/ExportOrderResponse.cs b/BBWY.Server.Model/Dto/Response/Order/ExportOrderResponse.cs index 2c892b8f..2ace70b3 100644 --- a/BBWY.Server.Model/Dto/Response/Order/ExportOrderResponse.cs +++ b/BBWY.Server.Model/Dto/Response/Order/ExportOrderResponse.cs @@ -88,5 +88,25 @@ namespace BBWY.Server.Model.Dto /// 用户应付金额 /// public decimal OrderPayment { get; set; } + + /// + /// 耗材费 + /// + public decimal ConsumableAmount { get; set; } + + /// + /// 入仓操作费 + /// + public decimal InStorageAmount { get; set; } + + /// + /// 出仓操作费 + /// + public decimal OutStorageAmount { get; set; } + + /// + /// 刷单/空单号费 + /// + public decimal SDOrderAmount { get; set; } = 0.00M; } }