数据中心利润统计报表增加沃尔玛的利润数据

Bailun.DC.HappenAmount/Program.cs

@@ -9,29 +9,29 @@ 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("2020-02-14");
-            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));
-                //new Bailun.DC.Services.FinanceReportServices().AddLogisticsWaitPay(start, 0);
-                start = start.AddDays(1);
-            }
-
-            //new Bailun.DC.Services.FinanceReportServices().UpdateLogisticsWaitPay(start, 0, "admin", null);
+                services.AddHostedService<Services>();
+            });
 
+            await builder.RunConsoleAsync();
         }
+
+        //static void Main(string[] args)
+        //{
+        //    var start = DateTime.Parse("2020-02-14");
+        //    while (start.AddDays(1) < DateTime.Now)
+        //    {
+        //        new Services().Init(start, start.AddDays(1));
+        //        //new Bailun.DC.Services.FinanceReportServices().AddLogisticsWaitPay(start, 0);
+        //        start = start.AddDays(1);
+        //    }
+
+        //    //new Bailun.DC.Services.FinanceReportServices().UpdateLogisticsWaitPay(start, 0, "admin", null);
+
+        //}
     }
 }

Bailun.DC.HappenAmount/Services.cs

@@ -184,12 +184,12 @@ namespace Bailun.DC.HappenAmount
 
                 //发生额
                 sqlhappen = $@"select sum(t2.cost_tail*t1.quantity_shipped) from dc_base_oms_pick t1 
-                            join dc_base_oms_sku t2 on t1.bailun_sku = t2.bailun_sku and t1.origin_order_id = t2.origin_order_id and t2.bailun_order_status != 'Canceled' and t2.has_scalp = 0 and t2.has_delete = 0 and t2.has_innersale = 0 and t2.company_id = 1 and t2.cost_tail > 0 and t2.bailun_account_id!=1690
+                            join dc_base_oms_sku t2 on t1.bailun_sku = t2.bailun_sku and t1.origin_order_id = t2.origin_order_id and t2.bailun_order_status != 'Canceled' and t2.has_scalp = 0 and t2.has_delete = 0 and t2.has_innersale = 0 and t2.company_id = 1 and t2.cost_tail > 0 
                             where t1.shipping_time >= '{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.shipping_time < '{end.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.has_delete = 0 and t1.company_id = 1 and t1.shipping_status = 'TotalShipping'";
                 m.tl_amount_happen += cn.QueryFirstOrDefault<decimal?>(sqlhappen,null,null,2*60)??0;
 
                 //销售额
-                sqlsales = $"select sum(cost_logistics*bailun_sku_quantity_ordered) from dc_base_oms_sku t1 where paid_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and paid_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' and bailun_order_status!='Canceled' and has_scalp=0 and has_delete=0 and has_innersale=0 and company_id=1 and cost_logistics>0 and t1.bailun_account_id!=1690";
+                sqlsales = $"select sum(cost_logistics*bailun_sku_quantity_ordered) from dc_base_oms_sku t1 where paid_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and paid_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' and bailun_order_status!='Canceled' and has_scalp=0 and has_delete=0 and has_innersale=0 and company_id=1 and cost_logistics>0 ";
                 m.tl_amount_sales += cn.QueryFirstOrDefault<decimal?>(sqlsales, null, null, 2 * 60)??0;
 
                 #endregion