更新每日发生额

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-01-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));
-                //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-04-06");
+        //    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

@@ -30,7 +30,7 @@ namespace Bailun.DC.HappenAmount
                 hl_amount_pay = 0;
                 var now = DateTime.Now;
 
-                if (now.Hour == 23 && now.Minute == 59)  //每天 23：59分启动
+                if (now.Hour == 0 && now.Minute == 30)  //每天 0：30分启动
                 {
                     var day = now;
                     Console.WriteLine("开始启动 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
@@ -152,14 +152,14 @@ namespace Bailun.DC.HappenAmount
 
 
                 #region 头程物流
-
+                // and cashier_time>= '{start.ToString("yyyy-MM-dd HH:mm:ss")}' and cashier_time<'{end.AddDays(1).ToString("yyyy-MM-dd HH:mm:ss")}'
                 //已付款
-                sqlpay = $"select sum(cashier_paymoneyrmb) cashier_paymoneyrmb from dc_base_finance_cashier where cashier_type=1 and cashier_status=1 and sourcecode in ('newCost','oldbuy') and type_name='销售费用/物流费' and cashier_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and cashier_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}'";
+                sqlpay = $"select sum(if (cashier_type = 2,-cashier_paymoneyrmb,cashier_paymoneyrmb)) cashier_paymoneyrmb from dc_base_finance_cashier where cashier_type in (1, 2) and cashier_status = 1 and sourcecode in ('newCost', 'oldbuy') and type_name = '销售费用/物流费' and cashier_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and cashier_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}'";
                 m.hl_amount_pay += cn.QueryFirstOrDefault<decimal?>(sqlpay, null, null, 2 * 60)??0;
 
                 //Add by Allan at 20200220，已付款要减去收款金额
-                var sqlrecevice = $@"select sum(cashier_paymoneyrmb) cashier_paymoneyrmb from dc_base_finance_cashier where cashier_type=2 and cashier_status=1 and sourcecode in ('newCost','oldbuy') and type_name='销售费用/物流费' and cashier_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and cashier_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}'";
-                m.hl_amount_pay -= cn.QueryFirstOrDefault<decimal?>(sqlrecevice, null, null, 2 * 60) ?? 0;
+                //var sqlrecevice = $@"select sum(cashier_paymoneyrmb) cashier_paymoneyrmb from dc_base_finance_cashier where cashier_type=2 and cashier_status=1 and sourcecode in ('newCost','oldbuy') and type_name='销售费用/物流费' and cashier_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and cashier_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}'";
+                //m.hl_amount_pay -= cn.QueryFirstOrDefault<decimal?>(sqlrecevice, null, null, 2 * 60) ?? 0;
 
 
                 //发生额

Bailun.DC.Services/FinanceReportServices.cs

@@ -2199,7 +2199,7 @@ namespace Bailun.DC.Services
         /// <returns></returns>
         public dc_base_finance_cashier ListHeadLogisticPayCount(DateTime start, DateTime end)
         {
-            var sql = $"select sum(if(cashier_type=2,-paymoney_rmb,paymoney_rmb)) paymoney_rmb,sum(if(cashier_type=2,-cashier_paymoneyrmb,cashier_paymoneyrmb)) cashier_paymoneyrmb from dc_base_finance_cashier where cashier_type in (1,2) and cashier_status=1 and sourcecode in ('newCost','oldbuy') and type_name='销售费用/物流费' and cashier_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and cashier_time<'{end.AddDays(1).ToString("yyyy-MM-dd HH:mm:ss")}'"; ;
+            var sql = $"select sum(if(cashier_type=2,-paymoney_rmb,paymoney_rmb)) paymoney_rmb,sum(if(cashier_type=2,-cashier_paymoneyrmb,cashier_paymoneyrmb)) cashier_paymoneyrmb from dc_base_finance_cashier where cashier_type in (1,2) and cashier_status=1 and sourcecode in ('newCost','oldbuy') and type_name='销售费用/物流费' and cashier_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and cashier_time<'{end.AddDays(1).ToString("yyyy-MM-dd HH:mm:ss")}'";
 
             using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
             {

Bailun.DC.Web/Pages/Index.cshtml

@@ -29,8 +29,8 @@
 
 <body class="fixed-sidebar full-height-layout gray-bg" style="overflow:hidden">
     <script type="text/javascript">
-        //login_localhost();
-        login();
+        login_localhost();
+        //login();
         window.location = "@Url.Content("~/Home/Main")";
     </script>
 </body>