重跑每日发生额和现金流量表服务

Bailun.DC.HappenAmount/Program.cs

@@ -7,25 +7,25 @@ namespace Bailun.DC.HappenAmount
 {
     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>();
-        //    });
-
-        //    await builder.RunConsoleAsync();
-        //}
-
-        static void Main(string[] args)
+        static async Task Main(string[] args)
         {
-            var start = DateTime.Parse("2019-11-01");
-            while (start.AddDays(1) < DateTime.Now)
+            Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+            var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
             {
-                new Services().Init(start, start.AddDays(1));
-                start = start.AddDays(1);
-            }
+                services.AddHostedService<Services>();
+            });
+
+            await builder.RunConsoleAsync();
         }
+
+        //static void Main(string[] args)
+        //{
+        //    var start = DateTime.Parse("2019-11-01");
+        //    while (start.AddDays(1) < DateTime.Now)
+        //    {
+        //        new Services().Init(start, start.AddDays(1));
+        //        start = start.AddDays(1);
+        //    }
+        //}
     }
 }

Bailun.DC.HappenAmount/Services.cs

@@ -173,9 +173,18 @@ namespace Bailun.DC.HappenAmount
                 m.tos_amount_happen += cn.QueryFirstOrDefault<decimal?>(sqlhappen, null, null, 2 * 60)??0;
 
                 //销售额
-                sqlsales = $@"select sum(t1.quantity_shipped*t2.bailun_sku_unit_price) from 
-                            (select quantity_shipped, origin_order_id, bailun_sku from dc_base_oms_pick where has_delete = 0 and shipping_status = 'TotalShipping' and shipping_time >= '{start.ToString("yyyy-MM-dd HH:mm:ss")}' and shipping_time < '{end.ToString("yyyy-MM-dd HH:mm:ss")}') t1
-                            join dc_base_oms_sku t2 on t1.origin_order_id = t2.origin_order_id and t1.bailun_sku = t2.bailun_sku and t2.has_delete = 0";
+                sqlsales = $@"select sum(amount) from (
+                                select sum(t1.cost_product*t2.quantity_shipped) amount
+                                from dc_base_oms_sku t1
+                                join dc_base_oms_pick t2 on t1.bailun_order_id=t2.bailun_order_id and t1.bailun_sku=t2.bailun_sku and t2.has_delete=0 and t2.shipping_status='TotalShipping' and t2.company_id=1
+                                where t1.has_scalp=0 and t1.has_delete=0 and t1.has_innersale=0 and t1.bailun_order_status!='Canceled' and t1.has_innersale=0 and t1.company_id=1 and ((t1.platform_type!='FBA' and t1.bailun_order_status!='CantHandle') or t1.platform_type='FBA')
+                                 and t2.shipping_time>='{start.ToString("yyyy-MM-dd")}' and t2.shipping_time<'{end.ToString("yyyy-MM-dd")}'
+                                union all 
+                                select sum(t1.cost_product*t1.bailun_sku_quantity_shipped) amount
+                                from dc_base_oms_sku t1
+                                where t1.has_delete=0 and t1.company_id=1 and t1.bailun_order_status!='Canceled' and t1.create_time>='{start.ToString("yyyy-MM-dd")}' and t1.create_time<'{end.ToString("yyyy-MM-dd")}' 
+                                and t1.platform_type='FBA'
+                                ) tb";
                 m.tos_amount_sales += cn.QueryFirstOrDefault<decimal?>(sqlsales, null, null, 2 * 60)??0;
                 #endregion