调整销售利润报表的启动时间，增加每月5号重跑标记

Bailun.DC.MonthSaleProfit/Program.cs

@@ -7,26 +7,26 @@ namespace Bailun.DC.MonthSaleProfit
 {
     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 _services = new Services();
+            Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+            var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
+            {
+                services.AddHostedService<Services>();
+            });
 
-            var start = DateTime.Parse("2020-12-01");
-            //_services.Init(start);
-            _services.InitNew(start);
-            //_services.InitNew4K(start);
-            //_services.InitNew4K(start);
+            await builder.RunConsoleAsync();
         }
+
+        //static void Main(string[] args)
+        //{
+        //    var _services = new Services();
+
+        //    var start = DateTime.Parse("2020-12-01");
+        //    //_services.Init(start);
+        //    _services.InitNew(start);
+        //    //_services.InitNew4K(start);
+        //    //_services.InitNew4K(start);
+        //}
     }
 }

Bailun.DC.MonthSaleProfit/Services.cs

@@ -45,6 +45,13 @@ namespace Bailun.DC.MonthSaleProfit
 
                     Console.WriteLine("任务运行完成 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                 }
+                else if(now.Day==5 && now.Hour == 0 && now.Minute == 45 && now.Second == 1)
+                {
+                    Console.WriteLine("开始启动新销售利润报表计算 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+                    var start = DateTime.Parse(DateTime.Parse(now.ToString("yyyy-MM")+"-01").AddMonths(-1).ToShortDateString());
+                    InitNew(start);
+                    Console.WriteLine("任务运行完成 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+                }
                 //else if(now.Day==16 && now.Hour==0 && now.Minute==2)
                 //{
                 //    Console.WriteLine("重跑上个月的数据 启动 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
@@ -541,7 +548,7 @@ namespace Bailun.DC.MonthSaleProfit
 
                 sql = $@"select sum(amount_sales*seller_order_exchange_rate*bailun_sku_quantity_ordered) as amount_sales,sum(cost_product*bailun_sku_quantity_ordered) as cost_product,sum(cost_platform_fee*seller_order_exchange_rate*bailun_sku_quantity_ordered) as cost_platform_fee,sum(cost_first*bailun_sku_quantity_ordered) as cost_first,sum(cost_logistics*bailun_sku_quantity_ordered) as cost_logistics,sum(cost_fba_fee*seller_order_exchange_rate*bailun_sku_quantity_ordered) cost_fba_fee,if(t6.financecategoryname is null,'',t6.financecategoryname) as financecategoryname from dc_base_oms_sku tb left join dc_base_sku t5 on tb.bailun_sku=t5.bailun_sku
                     left join dc_base_sku_finance_category t6 on t6.bailuncategoryid=t5.bailun_category_id
-                    where tb.company_id=1 and tb.bailun_order_status!='Canceled' and tb.has_scalp=0 and tb.has_innersale=0 and tb.bailun_interception_status in ('None','Failed') and tb.platform_type='FBA' and tb.create_time>='{day.ToString("yyyy-MM-dd")}' and tb.create_time<'{day.AddMonths(1).ToString("yyyy-MM-dd")}'
+                    where tb.company_id=1 and tb.bailun_order_status!='Canceled' and tb.has_scalp=0 and tb.has_innersale=0 and tb.bailun_interception_status in ('None','Failed') and tb.platform_type='FBA' and tb.purchase_create_time>='{day.ToString("yyyy-MM-dd")}' and tb.purchase_create_time<'{day.AddMonths(1).ToString("yyyy-MM-dd")}'
                     group by t6.financecategoryname
                     ";
                 objFBA = cn.Query<Models.mOrder>(sql,null,null,true,6*60).ToList();
@@ -555,7 +562,7 @@ namespace Bailun.DC.MonthSaleProfit
                 m.amount_sales_jingyou = (objOrder.Where(a => a.financecategoryname == "精油类")?.Sum(a => a.amount_sales) ?? 0)+ (objFBA.Where(a => a.financecategoryname == "精油类")?.Sum(a => a.amount_sales) ?? 0);
                 m.amount_sales_meirongmj = (objOrder.Where(a => a.financecategoryname == "美容美甲类")?.Sum(a => a.amount_sales) ?? 0)+ (objFBA.Where(a => a.financecategoryname == "美容美甲类")?.Sum(a => a.amount_sales) ?? 0);
 
-                m.amount_sales_other = (objOrder.Where(a => a.financecategoryname == "")?.Sum(a => a.amount_sales) ?? 0) + (objFBA.Where(a => a.financecategoryname == "")?.Sum(a => a.amount_sales) ?? 0);
+                m.amount_sales_other = ((objOrder.Where(a => a.financecategoryname == "")?.Sum(a => a.amount_sales) ?? 0) + (objFBA.Where(a => a.financecategoryname == "")?.Sum(a => a.amount_sales) ?? 0));
 
                 m.amount_sales = m.amount_sales_dianzi + m.amount_sales_fuzhuang + m.amount_sales_jiaju + m.amount_sales_jingyou + m.amount_sales_meirongmj+ m.amount_sales_other;