调整SkuSales接口，增加按付款时间统计SKU销量

Bailun.DC.DailyPurchaseSellStock/Program.cs

@@ -7,31 +7,31 @@ namespace Bailun.DC.DailyPurchaseSellStock
 {
     class Program
     {
-        static async Task Main(string[] args)
-        {
-            Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
-            var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
-            {
-                services.AddHostedService<Services>();
-            });
+        //static async Task Main(string[] args)
+        //{
+        //    Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+        //    var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
+        //    {
+        //        services.AddHostedService<Services>();
+        //    });
 
-            await builder.RunConsoleAsync();
-        }
+        //    await builder.RunConsoleAsync();
+        //}
 
-        //static void Main(string[] args)
-        //{
-        //    var _services = new Services();
+        static void Main(string[] args)
+        {
+            var _services = new Services();
 
-        //    var start = DateTime.Parse("2020-08-03");
-        //    //_services.Init(start);
+            var start = DateTime.Parse("2020-08-08");
+            //_services.Init(start);
 
-        //    while (start.AddDays(1) < DateTime.Now)
-        //    {
-        //        Console.WriteLine(start);
-        //        _services.Init(start);
-        //        start = start.AddDays(1);
-        //    }
-        //}
+            while (start.AddDays(1) < DateTime.Now)
+            {
+                Console.WriteLine(start);
+                _services.Init(start);
+                start = start.AddDays(1);
+            }
+        }
     }
     
 }

Bailun.DC.Services/OrdersServices.cs

@@ -3882,11 +3882,21 @@ namespace Bailun.DC.Services
         /// <param name="end">结束时间</param>
         /// <param name="skus">sku数组</param>
         /// <param name="platform">平台类型</param>
+        /// <param name="timetype">1:创建时间，2：付款时间</param>
         /// <returns></returns>
-        public List<Models.Ebay.mEbaySkuSales> ListEbaySkuSalesCount(int page, int pagesize, DateTime start, DateTime end, string[] skus, string platform)
+        public List<Models.Ebay.mEbaySkuSales> ListEbaySkuSalesCount(int page, int pagesize, DateTime start, DateTime end, string[] skus, string platform,int timetype=1)
         {
             var sql = $@"select t1.platform_type,t1.website,t1.bailun_sku,sum(t1.bailun_sku_quantity_ordered) as bailun_sku_quantity_ordered,sum(t1.bailun_sku_quantity_ordered*t1.amount_sales*t1.seller_order_exchange_rate) as amount_sales from dc_base_oms_sku t1 
-                        where t1.create_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.create_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' and bailun_order_status!='Canceled'";
+                        where bailun_order_status!='Canceled'";
+
+            if (timetype == 1)
+            {
+                sql += $" and t1.create_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.create_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' ";
+            }
+            else if (timetype == 2)
+            {
+                sql += $" and t1.paid_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.paid_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' ";
+            }
 
             if (!string.IsNullOrEmpty(platform))
             {

Bailun.DC.Web/Controllers/ApiController.cs

@@ -587,7 +587,7 @@ namespace Bailun.DC.Web.Controllers
         /// <param name="platform">平台</param>
         /// <returns></returns>
         [HttpPost]
-        public JsonResult SkuSales(int page, DateTime start, DateTime end, string skus, int? isplatformtime,string platform = "Ebay")
+        public JsonResult SkuSales(int page, DateTime start, DateTime end, string skus, int? isplatformtime,int timetype=1, string platform = "Ebay")
         {
             Services.ApiServices.SaveApiLog("Api/SkuSales", _httpContextAccessor.HttpContext.Connection.RemoteIpAddress.ToString());
             int pagesize = 1000;