优化每日发生额服务

Bailun.DC.HappenAmount/Program.cs

@@ -9,30 +9,31 @@ 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-05-19");
-            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);
+                services.AddHostedService<Services>();
+            });
+
+            await builder.RunConsoleAsync();
+        }
+
+        //static void Main(string[] args)
+        //{
+        //    var start = DateTime.Parse("2020-06-01");
+        //    while (start.AddDays(1) < DateTime.Now)
+        //    {
+        //        Console.WriteLine(start);
+        //        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);
+        //    //new Bailun.DC.Services.FinanceReportServices().UpdateLogisticsWaitPay(start, 0, "admin", null);
 
-        }
+        //}
     }
 }

Bailun.DC.HappenAmount/Services.cs

@@ -112,7 +112,7 @@ namespace Bailun.DC.HappenAmount
                 var listInterest = new Bailun.DC.Services.FinanceReportServices().ListInterestExpense(cwurl);
 
                 //管理成本
-                var list = new Bailun.DC.Services.FinanceReportServices().ListOtherCost(url);
+                var list = new Bailun.DC.Services.FinanceReportServices().ListFinanceManageCost(start, start, "", "", "", null); //new Bailun.DC.Services.FinanceReportServices().ListOtherCost(url);
                 //物流费支出
                 //var listlg = ListLogisticFee(lgurl);
 
@@ -120,17 +120,17 @@ namespace Bailun.DC.HappenAmount
 
                 var listFeeType = new List<string> { "推广费", "税费", "平台费用", "服务费", "其他" };
 
-                list = list.Where(a => a.companyName.Contains("广州歌戈儿生活科技有限公司") || a.companyValue == 5 || a.companyValue ==1 || a.companyValue == 3 || a.companyValue == 8 || a.companyValue == 2 ).ToList();
+                list = list.Where(a => a.company_name.Contains("广州歌戈儿生活科技有限公司") || a.company_value == 5 || a.company_value == 1 || a.company_value == 3 || a.company_value == 8 || a.company_value == 2 ).ToList();
 
                 if (list.Count > 0)
                 {
-                    m.ac_amount_pay += list.Sum(a => a.amountRmb);
-                    m.ac_amount_happen += list.Sum(a => a.amountRmb);
+                    m.ac_amount_pay += list.Sum(a => a.amount_rmb);
+                    m.ac_amount_happen += list.Sum(a => a.amount_rmb);
 
-                    var objtemp = list.Where(a => a.companyValue == 5 || a.companyValue == 2).Where(b => listFeeType.Contains(b.feeSuperType));
+                    var objtemp = list.Where(a => a.company_value == 5 || a.company_value == 2).Where(b => listFeeType.Contains(b.fee_super_type));
                     if (objtemp.Count() > 0)
                     {
-                        m.ac_amount_sales = objtemp.Sum(a => a.amountRmb);
+                        m.ac_amount_sales = objtemp.Sum(a => a.amount_rmb);
                     }
 
                 }
@@ -200,7 +200,7 @@ namespace Bailun.DC.HappenAmount
                 //付款额
                 sqlpay = $"select sum(cashier_paymoneyrmb) cashier_paymoneyrmb from dc_base_finance_cashier where cashier_type=1 and cashier_status=1 and sourcecode ='Buy' and cashier_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and cashier_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}'";
                 m.tos_amount_pay += cn.QueryFirstOrDefault<decimal?>(sqlpay, null, null, 2 * 60)??0;
-
+                
                 //发生额
                 sqlhappen = $"select sum(unit_price*quantity_purchase) from dc_base_purchase_details where status>-1 and create_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and create_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' and ispush=0";
                 m.tos_amount_happen += cn.QueryFirstOrDefault<decimal?>(sqlhappen, null, null, 2 * 60)??0;