增加根据订单更新时间获取下单日期的接口

Bailun.DC.Services/OrdersServices.cs

@@ -3974,6 +3974,31 @@ namespace Bailun.DC.Services
         }
 
         /// <summary>
+        /// 根据订单更新的时间获取下单的日期
+        /// </summary>
+        /// <param name="start"></param>
+        /// <param name="end"></param>
+        /// <returns></returns>
+        public List<DateTime> ListSaleCountChangeDate(DateTime start,DateTime end)
+        {
+            var sql = $@"select distinct DATE_FORMAT(t1.purchase_create_time,'%Y-%m-%d') as from dc_base_oms_sku as t1 where (t1.gmt_modified >= '{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.gmt_modified <='{end.ToString("yyyy-MM-dd HH:mm:ss")}') or (
+(t1.has_delete = 1 or t1.has_scalp = 1) and t1.gmt_modified >= '{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.gmt_modified <='{end.ToString("yyyy-MM-dd HH:mm:ss")}'
+)";
+
+            using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
+            {
+                if (cn.State == System.Data.ConnectionState.Closed)
+                {
+                    cn.Open();
+                }
+
+                return cn.Query<DateTime>(sql).ToList();
+
+            }
+
+        }
+
+        /// <summary>
         /// 内部编码Sku的利润
         /// </summary>
         /// <param name="parameter"></param>

Bailun.DC.Web/Controllers/ApiController.cs

@@ -632,7 +632,39 @@ namespace Bailun.DC.Web.Controllers
 
         }
 
-        
+        /// <summary>
+        /// 根据订单更新的时间获取下单的日期
+        /// </summary>
+        /// <param name="start"></param>
+        /// <param name="end"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public JsonResult ListSaleCountChangeDate(DateTime start, DateTime end)
+        {
+            try
+            {
+                var result = new Services.OrdersServices().ListSaleCountChangeDate(start, end);
+
+                return Json(new
+                {
+                    success = true,
+                    msg = "",
+                    data = result.Select(a => a.ToString("yyyy-MM-dd"))
+                });
+            }
+            catch (Exception ex)
+            {
+                return Json(new
+                {
+                    success = false,
+                    msg = ex.Message,
+                    
+                });
+            }
+            
+
+        }
+
         /// <summary>
         /// 根据时间段获取采购单明细
         /// </summary>

Bailun.DC.Web/Controllers/HomeController.cs

@@ -54,16 +54,23 @@ namespace Bailun.DC.Web.Controllers
             return View();
         }
 
+        [HttpPost]
+        public JsonResult SetCookie(string token)
+        {
+
+
+            return Json("");
+        }
 
         public ActionResult Main()
         {
 #if DEBUG
-            var cookie = "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6ImQ3ZjgyYjYyN2E1OWY4YWJkMWU2OTI5MTlkNzc1NmNkIiwidHlwIjoiSldUIn0.eyJuYmYiOjE1OTUwMzk4MDMsImV4cCI6MTU5NTA3NTgwMywiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNTk1MDM5ODAzLCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsInJvbGVzIjoiW3tcIklkXCI6MSxcIlJvbGVDb2RlXCI6XCJJVFwiLFwiUm9sZU5hbWVcIjpcIuezu-e7n-euoeeQhuWRmFwifSx7XCJJZFwiOjI4LFwiUm9sZUNvZGVcIjpcInBwc19lZGl0b3JcIixcIlJvbGVOYW1lXCI6XCLkuqflk4HotYTmlpnlkZhcIn0se1wiSWRcIjozNjgsXCJSb2xlQ29kZVwiOlwib21zX2FkbWluXCIsXCJSb2xlTmFtZVwiOlwib21zX-euoeeQhuWRmFwifSx7XCJJZFwiOjM3MCxcIlJvbGVDb2RlXCI6XCJvbXNfbm9ybWFsXCIsXCJSb2xlTmFtZVwiOlwib21z5pmu6YCa5Lq65ZGYXCJ9LHtcIklkXCI6NTUyLFwiUm9sZUNvZGVcIjpcIkJJX1N1cHBsaWVyX1RyYW5jYXRpb25cIixcIlJvbGVOYW1lXCI6XCLkvpvlupTllYblvoDmnaVcIn0se1wiSWRcIjo1NzAsXCJSb2xlQ29kZVwiOlwiY2FzaGllcl9uZXdcIixcIlJvbGVOYW1lXCI6XCLotKLliqHnrqHnkIbns7vnu5_op5LoibJcIn0se1wiSWRcIjo1NzEsXCJSb2xlQ29kZVwiOlwiY3dfYnNpY3NcIixcIlJvbGVOYW1lXCI6XCLotKLliqHln7rnoYDmnYPpmZBcIn0se1wiSWRcIjo1NzIsXCJSb2xlQ29kZVwiOlwiY3dfYWRtaW4xXCIsXCJSb2xlTmFtZVwiOlwi6LSi5Yqh566h55CG5LiA57qn5p2D6ZmQXCJ9LHtcIklkXCI6NTgwLFwiUm9sZUNvZGVcIjpcImN3X3Rlc3RcIixcIlJvbGVOYW1lXCI6XCLotKLliqHmtYvor5VcIn0se1wiSWRcIjo3MTMsXCJSb2xlQ29kZVwiOlwiZmVlX29yZGluYXJ5XCIsXCJSb2xlTmFtZVwiOlwi6LS555So57O757ufLeaZrumAmuS6uuWRmFwifV0iLCJEZXBhcnRtZW50Ijoie1wiRGVwYXJ0bWVudElkXCI6MjU4LFwiTmFtZVwiOlwi5pWw5o2u5Lit5b-DXCIsXCJDb2RlXCI6XCJcIn0iLCJzY29wZSI6WyJvcGVuaWQiLCJwcm9maWxlIiwiYmFpbHVuQXBpIl0sImFtciI6WyJjdXN0b20iXX0.OYC5eV064HV_koAvGQD9pSsWOqufCMnDn9VZ24gmxm_VesUEBtwsRrp2Ojuab2VwCg_VTFxUZdoAc-92LzK2zDfWRjgsBQtpSmxvc3eu-e7PiWSM9bJKHyaRR4FbS3ZGUUmkWhT5tAPyR4_tspMx-ZJsZeAq58OkwRjEc3UzvSpkTm-zbR_F-gIa_6ywQ_yinuzd2pw_TrAC-g2Xp4mfFSRhdLGxq0zlQynduYBG98bcFtpY_1ydtIjUteDor4MWrXTBNzzciChMxh6Rbd2BAv-B_UlOpGLbKk_RwHfZAnZrmOuWJClUpLW4WrFBU7ifg5JS9xnGWQtkhZpwLvuL7A";
+            var cookie = "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6ImQ3ZjgyYjYyN2E1OWY4YWJkMWU2OTI5MTlkNzc1NmNkIiwidHlwIjoiSldUIn0.eyJuYmYiOjE1OTUyMDkyMjMsImV4cCI6MTU5NTI0NTIyMywiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi6buE5pmUIiwiYXV0aF90aW1lIjoxNTk1MjA5MjIzLCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjI5MTk3NzEiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDE3ODUiLCJVc2VyQ29kZSI6IkJMNTU2NjgyNiIsIk9hVXNlcklkIjoiMTg3Iiwicm9sZXMiOiJbXSIsIkRlcGFydG1lbnQiOiJ7XCJEZXBhcnRtZW50SWRcIjoxODcsXCJOYW1lXCI6XCLotKbliqHnu4RcIixcIkNvZGVcIjpcIkNXQ1dcIn0iLCJzY29wZSI6WyJvcGVuaWQiLCJwcm9maWxlIiwiYmFpbHVuQXBpIl0sImFtciI6WyJjdXN0b20iXX0.NAA4BWBVzSochYuzm5wpw-nq5ipfhzMDGOMgUtk9cIBigb3GKgIP07tJt5EukaXBZu82AQuzz8Z0J8ani2S-b6ZyLLm6bPZBN46zrNmr7B23vw1IC6PzInhFJYyrqdO0U3lmMT8bKKaQHJLsPPa-VvjCYwEiE3HoAehRKYuyqZDr4g1wzPBzwP87QQZPybYMbe4bLdrPhArE-UrRD9EI_HP2XIrz8vJ8lmPJe8s9r02i6_lEwP3D8z4Pn6jiCTvYs461g1RsjHIk7shTfMJfh6Gq9KvSSDwMQDtoLRBe3C-zIgta5WZxthf-wyKojGdLDWhJzjcyrHR8RgHZUqVSIw";
 #else
             //var user = Common.HttpHelper.NetHelper.Request("http://sso.bailuntec.com/GetUserResource");
             var cookie = HttpContext.Request.Cookies["BailunToken"];
 #endif
-
+            
             var companyid = -1;
             var departmentname = "";
             var username = "";

Bailun.DC.Web/Pages/Index.cshtml

@@ -24,7 +24,7 @@
 
     <script src="css/hplus/js/jquery.min.js?v=2.1.4"></script>
     <script src="~/js/jquery.cookie.js" type="text/javascript"></script>
-    <script src="~/js/common.js?20200220004" type="text/javascript"></script>
+    <script src="~/js/common.js?20200720001" type="text/javascript"></script>
 </head>
 
 <body class="fixed-sidebar full-height-layout gray-bg" style="overflow:hidden">

Bailun.DC.Web/Views/Home/Main.cshtml

@@ -28,7 +28,7 @@
 
     <script src="/css/hplus/js/jquery.min.js?v=2.1.4"></script>
     <script src="/js/jquery.cookie.js" type="text/javascript"></script>
-    <script src="/js/common.js?20200220001" type="text/javascript"></script>
+    <script src="/js/common.js?20200220004" type="text/javascript"></script>
 </head>
 
 <body class="fixed-sidebar full-height-layout white-bg" style="overflow:hidden">

Bailun.DC.Web/wwwroot/js/common.js

@@ -323,7 +323,7 @@ function login() {
     else {
         token = $.cookie('BailunToken');
 
-        if (token == '' || token == undefined || token==null) {
+        if (token == '' || token == undefined || token == null) {
             window.location = "http://sso.bailuntec.com/?returnUrl=" + baseUrl;
             return false;
         }
@@ -333,9 +333,16 @@ function login() {
 function login_localhost() {
     var token = getUrlParam('token');
 
+    if (token == '') {
+        token = $.cookie('BailunToken');
+    }
+
     if (token != '') {
         $.cookie('BailunToken', token, { expires: 1, domain: 'localhost' });
-        window.location = baseUrl;
+
+
+
+        window.location = 'http://localhost:59628/Home/Main?token=' + token;
     }
     else {
         token = $.cookie('BailunToken');