增加未对账金额

Bailun.DC.DailyPlatformAccountBalance/Program.cs

@@ -11,23 +11,23 @@ namespace Bailun.DC.DailyPlatformAccountBalance
     /// </summary>
     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>();
-            });
+        //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();
-        }
+        //    await builder.RunConsoleAsync();
+        //}
 
-        //        static void Main(string[] args)
-        //        {
-        //            var _services = new Services();
+        static void Main(string[] args)
+        {
+            var _services = new Services();
 
-        //            //_services.Init(DateTime.Parse("2020-01-01"), DateTime.Parse("2020-06-29 15:30"));
-        //            //_services.UpdateBalanceSheet(DateTime.Now.AddDays(-1))
-        //;        }
+            _services.Init(DateTime.Parse("2020-01-01"), DateTime.Parse("2020-08-01 15:30"));
+            _services.UpdateBalanceSheet(DateTime.Now.AddDays(-1));
+        }
     }
 }

Bailun.DC.DailyPlatformAccountBalance/Services.cs

@@ -62,7 +62,7 @@ namespace Bailun.DC.DailyPlatformAccountBalance
         
         public void Init(DateTime start,DateTime end)
         {
-            url += "?StartDate="+start.ToString("yyyy-MM-dd HH:mm:ss")+ "&EndDate="+end.ToString("yyyy-MM-dd HH:mm:ss")+ "&page=1&pagesize=100000";
+            url += "?Currencys=GBP,AUD,USD,EUR,CNY,HKD,IDR&StartDate=" + start.ToString("yyyy-MM-dd HH:mm:ss")+ "&EndDate="+end.ToString("yyyy-MM-dd HH:mm:ss")+ "&page=1&pagesize=100000";
 
             var str = Common.HttpHelper.NetHelper.Request(url);
 

Bailun.DC.DailyPurchaseSellStock/Program.cs

@@ -22,7 +22,7 @@ namespace Bailun.DC.DailyPurchaseSellStock
         {
             var _services = new Services();
 
-            var start = DateTime.Parse("2020-03-23");
+            var start = DateTime.Parse("2020-07-01");
             while (start.AddDays(1) < DateTime.Now)
             {
                 Console.WriteLine(start);

Bailun.DC.Services/LogisticsServices.cs

@@ -17,7 +17,29 @@ namespace Bailun.DC.Services
     public class LogisticsServices
     {
         #region 往来报表
-         
+
+        /// <summary>
+        /// 获取未对账金额
+        /// </summary>
+        /// <returns></returns>
+        public decimal NoStatisticAmount()
+        {
+            var sql = $@"select sum(t1.merchant_shipment_cost_cny) as merchant_shipment_cost_cny from dc_base_logistics t1 where t1.diff_state_type=0 and t1.company_name!='广州嘉和货运代理有限公司'";
+
+            using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
+            {
+                if (cn.State == System.Data.ConnectionState.Closed)
+                {
+                    cn.Open();
+                }
+
+                var result = cn.QueryFirstOrDefault<decimal?>(sql);
+
+                return result ?? 0;
+
+            }
+
+        }
 
         /// <summary>
         /// 物流供应商往来统计报表

Bailun.DC.Web/Areas/Reports/Controllers/LogisticsController.cs

@@ -25,6 +25,10 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
         /// <returns></returns>
         public ActionResult SupplierTrancationReport()
         {
+            //未对账往来数据总额
+            var amount = new Services.LogisticsServices().NoStatisticAmount();
+            ViewBag.amount = amount.ToString("N2");
+
             return View();
         }
 

Bailun.DC.Web/Areas/Reports/Views/Logistics/SupplierTrancationReport.cshtml

@@ -30,6 +30,7 @@
             </form>
         </div>
         <div class="ibox-content m-b-sm border-bottom">
+            <div style="margin:10px 0px;">未对账金额：@(ViewBag.amount)</div>
             <table id="roletable" style="table-layout:fixed;"></table>
         </div>
     </div>

Bailun.DC.Web/Controllers/HomeController.cs

@@ -58,7 +58,7 @@ namespace Bailun.DC.Web.Controllers
         public ActionResult Main()
         {
 #if DEBUG
-            var cookie = "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IjE4MWU5NzNjODkzNzFhNTI5N2FmYWI1MTQ0NTdmODQzIiwidHlwIjoiSldUIn0.eyJuYmYiOjE1OTMzMDk0OTUsImV4cCI6MTU5MzM0NTQ5NSwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNTkzMzA5NDk1LCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsInJvbGVzIjoiW3tcIklkXCI6MSxcIlJvbGVDb2RlXCI6XCJJVFwiLFwiUm9sZU5hbWVcIjpcIuezu-e7n-euoeeQhuWRmFwifSx7XCJJZFwiOjI4LFwiUm9sZUNvZGVcIjpcInBwc19lZGl0b3JcIixcIlJvbGVOYW1lXCI6XCLkuqflk4HotYTmlpnlkZhcIn0se1wiSWRcIjozNjgsXCJSb2xlQ29kZVwiOlwib21zX2FkbWluXCIsXCJSb2xlTmFtZVwiOlwib21zX-euoeeQhuWRmFwifSx7XCJJZFwiOjM3MCxcIlJvbGVDb2RlXCI6XCJvbXNfbm9ybWFsXCIsXCJSb2xlTmFtZVwiOlwib21z5pmu6YCa5Lq65ZGYXCJ9LHtcIklkXCI6NTUyLFwiUm9sZUNvZGVcIjpcIkJJX1N1cHBsaWVyX1RyYW5jYXRpb25cIixcIlJvbGVOYW1lXCI6XCLkvpvlupTllYblvoDmnaVcIn0se1wiSWRcIjo1NzAsXCJSb2xlQ29kZVwiOlwiY2FzaGllcl9uZXdcIixcIlJvbGVOYW1lXCI6XCLotKLliqHnrqHnkIbns7vnu5_op5LoibJcIn0se1wiSWRcIjo1NzEsXCJSb2xlQ29kZVwiOlwiY3dfYnNpY3NcIixcIlJvbGVOYW1lXCI6XCLotKLliqHln7rnoYDmnYPpmZBcIn0se1wiSWRcIjo1NzIsXCJSb2xlQ29kZVwiOlwiY3dfYWRtaW4xXCIsXCJSb2xlTmFtZVwiOlwi6LSi5Yqh566h55CG5LiA57qn5p2D6ZmQXCJ9LHtcIklkXCI6NTgwLFwiUm9sZUNvZGVcIjpcImN3X3Rlc3RcIixcIlJvbGVOYW1lXCI6XCLotKLliqHmtYvor5VcIn0se1wiSWRcIjo3MTMsXCJSb2xlQ29kZVwiOlwiZmVlX29yZGluYXJ5XCIsXCJSb2xlTmFtZVwiOlwi6LS555So57O757ufLeaZrumAmuS6uuWRmFwifV0iLCJEZXBhcnRtZW50Ijoie1wiRGVwYXJ0bWVudElkXCI6MjU4LFwiTmFtZVwiOlwi5pWw5o2u5Lit5b-DXCIsXCJDb2RlXCI6XCJcIn0iLCJzY29wZSI6WyJvcGVuaWQiLCJwcm9maWxlIiwiYmFpbHVuQXBpIl0sImFtciI6WyJjdXN0b20iXX0.rKBchgs41bEzxuJ6rA3cgPO90DN09euOTD1Mt8pjg-G9Cw6-eoDda0538GQ4KWLxfrSe8NON2jPLOpK1BhMbHbWqO_HIj2pOAYlYTnf-cKH21-3OrN1dXnScBidxDvOSlYz-3sKpVRVRjVZPjuLkuBowuP0NcEElrg_Zh_f3wLOtipkXpIJrzWld8Qm3nd0WmLUwlYXCPwKGX2u1QxEPS9DgKGgH5aEOsnRxiwrfphdlpYEVG8FlLp3rJejGFcPGD01BIf9ohdMaUEdAR5tRQB1TsNfix_H1UZugKtLK3FqLbGd53MfyntO5L6OYEyzHp0-nk69j2oatPP-c7j2mJA";
+            var cookie = "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IjE4MWU5NzNjODkzNzFhNTI5N2FmYWI1MTQ0NTdmODQzIiwidHlwIjoiSldUIn0.eyJuYmYiOjE1OTM2NjgyMDQsImV4cCI6MTU5MzcwNDIwNCwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNTkzNjY4MjA0LCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsInJvbGVzIjoiW3tcIklkXCI6MSxcIlJvbGVDb2RlXCI6XCJJVFwiLFwiUm9sZU5hbWVcIjpcIuezu-e7n-euoeeQhuWRmFwifSx7XCJJZFwiOjI4LFwiUm9sZUNvZGVcIjpcInBwc19lZGl0b3JcIixcIlJvbGVOYW1lXCI6XCLkuqflk4HotYTmlpnlkZhcIn0se1wiSWRcIjozNjgsXCJSb2xlQ29kZVwiOlwib21zX2FkbWluXCIsXCJSb2xlTmFtZVwiOlwib21zX-euoeeQhuWRmFwifSx7XCJJZFwiOjM3MCxcIlJvbGVDb2RlXCI6XCJvbXNfbm9ybWFsXCIsXCJSb2xlTmFtZVwiOlwib21z5pmu6YCa5Lq65ZGYXCJ9LHtcIklkXCI6NTUyLFwiUm9sZUNvZGVcIjpcIkJJX1N1cHBsaWVyX1RyYW5jYXRpb25cIixcIlJvbGVOYW1lXCI6XCLkvpvlupTllYblvoDmnaVcIn0se1wiSWRcIjo1NzAsXCJSb2xlQ29kZVwiOlwiY2FzaGllcl9uZXdcIixcIlJvbGVOYW1lXCI6XCLotKLliqHnrqHnkIbns7vnu5_op5LoibJcIn0se1wiSWRcIjo1NzEsXCJSb2xlQ29kZVwiOlwiY3dfYnNpY3NcIixcIlJvbGVOYW1lXCI6XCLotKLliqHln7rnoYDmnYPpmZBcIn0se1wiSWRcIjo1NzIsXCJSb2xlQ29kZVwiOlwiY3dfYWRtaW4xXCIsXCJSb2xlTmFtZVwiOlwi6LSi5Yqh566h55CG5LiA57qn5p2D6ZmQXCJ9LHtcIklkXCI6NTgwLFwiUm9sZUNvZGVcIjpcImN3X3Rlc3RcIixcIlJvbGVOYW1lXCI6XCLotKLliqHmtYvor5VcIn0se1wiSWRcIjo3MTMsXCJSb2xlQ29kZVwiOlwiZmVlX29yZGluYXJ5XCIsXCJSb2xlTmFtZVwiOlwi6LS555So57O757ufLeaZrumAmuS6uuWRmFwifV0iLCJEZXBhcnRtZW50Ijoie1wiRGVwYXJ0bWVudElkXCI6MjU4LFwiTmFtZVwiOlwi5pWw5o2u5Lit5b-DXCIsXCJDb2RlXCI6XCJcIn0iLCJzY29wZSI6WyJvcGVuaWQiLCJwcm9maWxlIiwiYmFpbHVuQXBpIl0sImFtciI6WyJjdXN0b20iXX0.srZCsXDV4rJtQu7FA_UKuu1pBHtQFsmzTeQKk5SwBjPXo9WZLhHkG2pIjfQl-TsS3_FX8kdCoR5KmYOaAax92MxzMeCOy_TH76KsSPkwbihKseAs_Fv2RBTLm4ltjYxf7Bvd7TeONahEeJWl_XP1vfQ23cYnv0Le_zFaQVFml5W_bWidLtuoWLge2ppzSA7sH9sPuFSaWOsKvNU854X0_SW0QmlQqafNDsKzwDLrSZf0Z8UBqvuDZehHIECkJFWx7WU2VOtIIWRs-aXm-nhzSw6pgrGDv3ecbs2SaM7knhXTJweTGwaD7WT0z878Mxiq80efwwGhHrXibbQguwaRKg";
 #else
             //var user = Common.HttpHelper.NetHelper.Request("http://sso.bailuntec.com/GetUserResource");
             var cookie = HttpContext.Request.Cookies["BailunToken"];