From 0c17ed4e088c2f0494af4d8bc144bec8244d79a6 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Fri, 29 Apr 2022 04:49:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Models/APIModel/Response/Order/ExportOrderResponse.cs    | 2 +-
 BBWY.Client/ViewModels/Order/OrderListViewModel.cs           | 2 +-
 BBWY.Server.Business/Order/OrderBusiness.cs                  | 5 +----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/BBWY.Client/Models/APIModel/Response/Order/ExportOrderResponse.cs b/BBWY.Client/Models/APIModel/Response/Order/ExportOrderResponse.cs
index 0eee8bfd..4c3ad4ff 100644
--- a/BBWY.Client/Models/APIModel/Response/Order/ExportOrderResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/Order/ExportOrderResponse.cs
@@ -70,7 +70,7 @@ namespace BBWY.Client.Models
         public override string ToString()
         {
             //日期,店铺订单号,SKU编码,代发下单单号,售价,采购金额,头程费用,仓储服务费,快递费,平台扣点,补差金额,利润,利润率,收件人联系方式
-            return $"{OrderStartTime:yyyy-MM-dd HH:mm:ss},{OrderId},{SkuIds},{PurchaseOrderIds},{OrderTotalPrice},{PurchaseSkuAmount},{FirstFreight},{StorageAmount},{DeliveryExpressFreight},{PlatformCommissionAmount},{FreightPrice},{Profit},{ProfitRatio},{ConsigneeStr}";
+            return $"{OrderStartTime:yyyy-MM-dd HH:mm:ss},{OrderId},{SkuIds},{StorageType},{PurchaseOrderIds},{OrderTotalPrice},{PurchaseSkuAmount},{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 56fde002..046cd39d 100644
--- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
+++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
@@ -607,7 +607,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 b36231ea..f6e3905e 100644
--- a/BBWY.Server.Business/Order/OrderBusiness.cs
+++ b/BBWY.Server.Business/Order/OrderBusiness.cs
@@ -27,7 +27,6 @@ namespace BBWY.Server.Business
         private IIdGenerator idGenerator;
         private TaskSchedulerManager taskSchedulerManager;
         private MDSBusiness mdsBusiness;
-        private FreeSqlMultiDBManager freeSqlMultiDBManager;
 
         public OrderBusiness(RestApiService restApiService,
                              ILogger logger,
@@ -35,8 +34,7 @@ namespace BBWY.Server.Business
                              IIdGenerator idGenerator,
                              IOptions<GlobalConfig> options,
                              TaskSchedulerManager taskSchedulerManager,
-                             MDSBusiness mdsBusiness,
-                             FreeSqlMultiDBManager freeSqlMultiDBManager) : base(restApiService, options)
+                             MDSBusiness mdsBusiness) : base(restApiService, options)
         {
             this.logger = logger;
             this.fsql = fsql;
@@ -47,7 +45,6 @@ namespace BBWY.Server.Business
                 { Enums.Platform.京东, SyncJDOrder }
             };
             this.mdsBusiness = mdsBusiness;
-            this.freeSqlMultiDBManager = freeSqlMultiDBManager;
         }
 
         public OrderListResponse GetOrderList(SearchOrderRequest searchOrderRequest)