订单导出接口增加字段

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<OrderDropShipping>().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));
             }

BBWY.Server.Model/Dto/Response/Order/ExportOrderResponse.cs

@@ -88,5 +88,25 @@ namespace BBWY.Server.Model.Dto
         /// 用户应付金额
         /// </summary>
         public decimal OrderPayment { get; set; }
+
+        /// <summary>
+        /// 耗材费
+        /// </summary>
+        public decimal ConsumableAmount { get; set; }
+
+        /// <summary>
+        /// 入仓操作费
+        /// </summary>
+        public decimal InStorageAmount { get; set; }
+
+        /// <summary>
+        /// 出仓操作费
+        /// </summary>
+        public decimal OutStorageAmount { get; set; }
+
+        /// <summary>
+        /// 刷单/空单号费
+        /// </summary>
+        public decimal SDOrderAmount { get; set; } = 0.00M;
     }
 }