From a726b856dbd013d773e54fc05173a935f19a62ce Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Wed, 29 Jun 2022 23:35:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E8=BF=90=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../APIModel/Response/Order/ExportOrderResponse.cs    | 11 ++++++++---
 BBWY.Client/ViewModels/Order/OrderListViewModel.cs    |  2 +-
 BBWY.Server.Business/Order/OrderBusiness.cs           |  4 +++-
 .../Dto/Response/Order/ExportOrderResponse.cs         |  5 +++++
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/BBWY.Client/Models/APIModel/Response/Order/ExportOrderResponse.cs b/BBWY.Client/Models/APIModel/Response/Order/ExportOrderResponse.cs
index deb232e0..33e5ec6c 100644
--- a/BBWY.Client/Models/APIModel/Response/Order/ExportOrderResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/Order/ExportOrderResponse.cs
@@ -23,10 +23,15 @@ namespace BBWY.Client.Models
         public decimal OrderTotalPrice { get; set; }
 
         /// <summary>
-        /// 采购金额
+        /// 商品成本
         /// </summary>
         public decimal PurchaseSkuAmount { get; set; }
 
+        /// <summary>
+        /// 采购运费
+        /// </summary>
+        public decimal PurchaseFreight { get; set; }
+
         /// <summary>
         /// 头程费用
         /// </summary>
@@ -69,8 +74,8 @@ namespace BBWY.Client.Models
 
         public override string ToString()
         {
-            //日期,店铺订单号,SKU编码,代发下单单号,售价,商品成本,头程费用,仓储服务费,快递费,平台扣点,补差金额,利润,利润率,收件人联系方式
-            return $"{OrderStartTime:yyyy-MM-dd HH:mm:ss},{OrderId},{SkuIds},{StorageType},{PurchaseOrderIds},{OrderTotalPrice},{PurchaseSkuAmount},{FirstFreight},{StorageAmount},{DeliveryExpressFreight},{PlatformCommissionAmount},{FreightPrice},{Profit},{ProfitRatio},{ConsigneeStr}";
+            //日期,店铺订单号,SKU编码,代发下单单号,售价,商品成本,采购运费,头程费用,仓储服务费,快递费,平台扣点,补差金额,利润,利润率,收件人联系方式
+            return $"{OrderStartTime:yyyy-MM-dd HH:mm:ss},{OrderId},{SkuIds},{StorageType},{PurchaseOrderIds},{OrderTotalPrice},{PurchaseSkuAmount},{PurchaseFreight},{FirstFreight},{StorageAmount},{DeliveryExpressFreight},{PlatformCommissionAmount},{FreightPrice},{Profit},{ProfitRatio},{ConsigneeStr}";
         }
     }
 }
diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
index 0faa711f..2a9c7551 100644
--- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
+++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
@@ -689,7 +689,7 @@ namespace BBWY.Client.ViewModels
                                                          try
                                                          {
                                                              var list = r.Data.Select(x => x.ToString()).ToList();
-                                                             list.Insert(0, "日期,店铺订单号,SKU编码,仓储类型,代发下单单号,售价,商品成本,头程费用,仓储服务费,快递费,平台扣点,补差金额,利润,利润率,收件人联系方式,售后类型,售后与特殊情况备注");
+                                                             list.Insert(0, "日期,店铺订单号,SKU编码,仓储类型,代发下单单号,售价,商品成本,采购运费,头程费用,仓储服务费,快递费,平台扣点,补差金额,利润,利润率,收件人联系方式,售后类型,售后与特殊情况备注");
                                                              System.IO.File.WriteAllLines(ssaveFileName, list, Encoding.UTF8);
                                                              App.Current.Dispatcher.Invoke(() => MessageBox.Show("导出完成", "导出"));
                                                          }
diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs
index c0ae7597..df890b6a 100644
--- a/BBWY.Server.Business/Order/OrderBusiness.cs
+++ b/BBWY.Server.Business/Order/OrderBusiness.cs
@@ -263,7 +263,8 @@ namespace BBWY.Server.Business
                                                                         OrderId = g.Key,
                                                                         SkuAmount = g.Sum(g.Value.SkuAmount),
                                                                         FirstFreight = g.Sum(g.Value.FirstFreight),
-                                                                        StorageAmount = g.Sum(g.Value.StorageAmount)
+                                                                        StorageAmount = g.Sum(g.Value.StorageAmount),
+                                                                        PurchaseFreight = g.Sum(g.Value.PurchaseFreight)
                                                                     });
             var orderDropShippingList = fsql.Select<OrderDropShipping>().Where(ods => orderIdList.Contains(ods.OrderId)).ToList();
 
@@ -272,6 +273,7 @@ namespace BBWY.Server.Business
                 var statistics = orderCostDetailGroup.FirstOrDefault(g => g.OrderId == order.OrderId);
                 order.FirstFreight = statistics?.FirstFreight ?? 0M;
                 order.PurchaseSkuAmount = statistics?.SkuAmount ?? 0M;
+                order.PurchaseFreight = statistics?.PurchaseFreight ?? 0M;
                 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);
diff --git a/BBWY.Server.Model/Dto/Response/Order/ExportOrderResponse.cs b/BBWY.Server.Model/Dto/Response/Order/ExportOrderResponse.cs
index 398d00e1..6b8a0612 100644
--- a/BBWY.Server.Model/Dto/Response/Order/ExportOrderResponse.cs
+++ b/BBWY.Server.Model/Dto/Response/Order/ExportOrderResponse.cs
@@ -42,6 +42,11 @@ namespace BBWY.Server.Model.Dto
         /// </summary>
         public decimal DeliveryExpressFreight { get; set; }
 
+        /// <summary>
+        /// 采购运费
+        /// </summary>
+        public decimal PurchaseFreight { get; set; }
+
         /// <summary>
         /// 平台扣点金额
         /// </summary>