Commit 8d24b8a9 by 泽锋 李

fix

parent 00f10a75
...@@ -1840,7 +1840,7 @@ truncate table dc_base_lastweek_data_temp; ", new { btime = DateTime.Now.AddDays ...@@ -1840,7 +1840,7 @@ truncate table dc_base_lastweek_data_temp; ", new { btime = DateTime.Now.AddDays
public static void ResetCashFlowData() public static void ResetCashFlowData()
{ {
//现金流汇总报表,9点之前还在跑数据,不用刷新 //现金流汇总报表,9点之前还在跑数据,不用刷新
if (DateTime.Now.Hour > 9) if (DateTime.Now.Hour >= 9)
{ {
_connection.Execute(@" -- 刷新 现金流汇总表 _connection.Execute(@" -- 刷新 现金流汇总表
set session transaction isolation level read uncommitted; set session transaction isolation level read uncommitted;
...@@ -2650,7 +2650,7 @@ where 1=1 ...@@ -2650,7 +2650,7 @@ where 1=1
public static List<platform_type_website_dto> PlatformtypeWebsiteList(string platform_type) public static List<platform_type_website_dto> PlatformtypeWebsiteList(string platform_type)
{ {
return _connection.Query<platform_type_website_dto>(" select DISTINCT platform_type,website from dc_base_oms_order ").AsList(); return _connection.Query<platform_type_website_dto>(" select DISTINCT platform_type,web_site as 'website' from dc_report_cash_flow_group_day ").AsList();
} }
public static List<string> BrandList() public static List<string> BrandList()
......
...@@ -42,7 +42,7 @@ namespace AutoTurnOver.DB ...@@ -42,7 +42,7 @@ namespace AutoTurnOver.DB
parameters.Add("etime", etime.Value.ToString("yyyy-MM-dd 23:59:59")); parameters.Add("etime", etime.Value.ToString("yyyy-MM-dd 23:59:59"));
} }
sql += $" order by id desc limit {(page - 1) * rows},{rows} "; sql += $" order by id desc limit {(page - 1) * rows},{rows} ";
var order_list = conn.Query<dc_base_oms_sku>(sql, parameters).AsList(); var order_list = conn.Query<dc_base_oms_sku>(sql, parameters,commandTimeout:0).AsList();
if (order_list == null || order_list.Count <= 0) if (order_list == null || order_list.Count <= 0)
{ {
break; break;
...@@ -467,7 +467,7 @@ namespace AutoTurnOver.DB ...@@ -467,7 +467,7 @@ namespace AutoTurnOver.DB
parameters.Add("etime", etime.Value.ToString("yyyy-MM-dd 23:59:59")); parameters.Add("etime", etime.Value.ToString("yyyy-MM-dd 23:59:59"));
} }
sql += $" order by id desc limit {(page - 1) * rows},{rows} "; sql += $" order by id desc limit {(page - 1) * rows},{rows} ";
var order_list = conn.Query<dc_base_oms_sku>(sql, parameters).AsList(); var order_list = conn.Query<dc_base_oms_sku>(sql, parameters, commandTimeout: 0).AsList();
if (order_list == null || order_list.Count <= 0) if (order_list == null || order_list.Count <= 0)
{ {
break; break;
...@@ -589,7 +589,7 @@ namespace AutoTurnOver.DB ...@@ -589,7 +589,7 @@ namespace AutoTurnOver.DB
parameters.Add("bailun_sku", bailun_sku); parameters.Add("bailun_sku", bailun_sku);
} }
sql += $" limit {(page - 1) * rows},{rows} "; sql += $" limit {(page - 1) * rows},{rows} ";
var order_list = conn.Query<dc_base_purchase_details_dto>(sql, parameters).AsList(); var order_list = conn.Query<dc_base_purchase_details_dto>(sql, parameters, commandTimeout: 0).AsList();
if (order_list == null || order_list.Count <= 0) if (order_list == null || order_list.Count <= 0)
{ {
break; break;
...@@ -752,7 +752,7 @@ where t1.gmt_create>=@btime and t1.gmt_create<=@etime "; ...@@ -752,7 +752,7 @@ where t1.gmt_create>=@btime and t1.gmt_create<=@etime ";
parameters.Add("btime", btime.ToString("yyyy-MM-dd 00:00:00")); parameters.Add("btime", btime.ToString("yyyy-MM-dd 00:00:00"));
parameters.Add("etime", etime.ToString("yyyy-MM-dd 23:59:59")); parameters.Add("etime", etime.ToString("yyyy-MM-dd 23:59:59"));
sql += $" order by t1.id desc limit {(page - 1) * rows},{rows} "; sql += $" order by t1.id desc limit {(page - 1) * rows},{rows} ";
var order_list = conn.Query<dc_base_crm_refund_dto>(sql, parameters).AsList(); var order_list = conn.Query<dc_base_crm_refund_dto>(sql, parameters, commandTimeout: 0).AsList();
if (order_list == null || order_list.Count <= 0) if (order_list == null || order_list.Count <= 0)
{ {
break; break;
...@@ -847,7 +847,7 @@ where t1.create_time>=@btime and t1.create_time<=@etime "; ...@@ -847,7 +847,7 @@ where t1.create_time>=@btime and t1.create_time<=@etime ";
parameters.Add("btime", btime.ToString("yyyy-MM-dd 00:00:00")); parameters.Add("btime", btime.ToString("yyyy-MM-dd 00:00:00"));
parameters.Add("etime", etime.ToString("yyyy-MM-dd 23:59:59")); parameters.Add("etime", etime.ToString("yyyy-MM-dd 23:59:59"));
sql += $" limit {(page - 1) * rows},{rows} "; sql += $" limit {(page - 1) * rows},{rows} ";
var order_list = conn.Query<dc_base_transfer_verify_dto>(sql, parameters).AsList(); var order_list = conn.Query<dc_base_transfer_verify_dto>(sql, parameters, commandTimeout: 0).AsList();
if (order_list == null || order_list.Count <= 0) if (order_list == null || order_list.Count <= 0)
{ {
break; break;
......
...@@ -174,7 +174,7 @@ namespace AutoTurnOver.Controllers ...@@ -174,7 +174,7 @@ namespace AutoTurnOver.Controllers
} }
public JsonResult PlatformtypeWebsiteList(string platform_type) public JsonResult PlatformtypeWebsiteList(string platform_type)
{ {
var datas = ApiServices.PlatformtypeWebsiteList(platform_type); var datas = ApiServices.PlatformtypeWebsiteList(platform_type).GroupBy(s=>s.website).Select(s=>new { website = s.Key}).ToList();
return new JsonResult(datas); return new JsonResult(datas);
} }
......
...@@ -13,16 +13,6 @@ namespace ResetOutofstock ...@@ -13,16 +13,6 @@ namespace ResetOutofstock
static async Task Main(string[] args) static async Task Main(string[] args)
{ {
Console.WriteLine("刷新缺货数据任务启动..."); Console.WriteLine("刷新缺货数据任务启动...");
try
{
var now = DateTime.Now;
report_cash_flow_dao.CalculationRefundOrder(now.AddMonths(-3), DateTime.Parse(now.AddDays(-1).ToString("yyyy-MM-dd 23:59:59")));
}
catch (Exception ex)
{
throw;
}
var builder = new HostBuilder().ConfigureServices((hostContext, services) => var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
{ {
services.AddHostedService<ResetOutofstockBackgrounService>(); services.AddHostedService<ResetOutofstockBackgrounService>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment