Commit 10807c1c by 泽锋 李

同步完刊登数据后,刷新报表

parent 9c0d0b64
...@@ -739,7 +739,9 @@ where bailun_sku in @skus", new { skus = skus.Split(',').ToList() }); ...@@ -739,7 +739,9 @@ where bailun_sku in @skus", new { skus = skus.Split(',').ToList() });
alter table dc_base_listing_status_temp rename dc_base_listing_status; alter table dc_base_listing_status_temp rename dc_base_listing_status;
alter table dc_base_listing_statusTemp rename dc_base_listing_status_temp; alter table dc_base_listing_statusTemp rename dc_base_listing_status_temp;
truncate table dc_base_listing_status_temp; "); truncate table dc_base_listing_status_temp; ");
report.ResetDataHighFrequencyListting();
} }
public static void BatchUpdateDatas(MySqlConnection conn, List<dc_base_listing_status> datas) public static void BatchUpdateDatas(MySqlConnection conn, List<dc_base_listing_status> datas)
{ {
......
...@@ -4,6 +4,7 @@ using AutoTurnOver.Models.Base; ...@@ -4,6 +4,7 @@ using AutoTurnOver.Models.Base;
using Dapper; using Dapper;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text; using System.Text;
namespace AutoTurnOver.DB namespace AutoTurnOver.DB
...@@ -163,6 +164,18 @@ where tdb.usable_stock>0 "; ...@@ -163,6 +164,18 @@ where tdb.usable_stock>0 ";
sql += " and t1.source =@source "; sql += " and t1.source =@source ";
parameters.Add("source", search.source); parameters.Add("source", search.source);
} }
if (search.listing_status == 1)
{
// 可上架
var fields = GetShowField(search.warehouse_code);
sql += $"and tdb.usable_stock>0 and ( {string.Join(" or ", fields.Select(v=>"t11.{v} <= 0 "))} )";
}
if (search.listing_status == 2)
{
// 无在线
var fields = GetShowField(search.warehouse_code);
sql += $"and tdb.usable_stock>0 and ( {string.Join(" and ", fields.Select(v => "t11.{v} <= 0 "))} )";
}
} }
return _connection.Page<listing_status_view_dto>(sql, search, parameters); return _connection.Page<listing_status_view_dto>(sql, search, parameters);
} }
...@@ -174,9 +187,14 @@ where tdb.usable_stock>0 "; ...@@ -174,9 +187,14 @@ where tdb.usable_stock>0 ";
/// <returns></returns> /// <returns></returns>
public static List<string> GetShowField(string warehouse_code) public static List<string> GetShowField(string warehouse_code)
{ {
var full = new List<string> { "ebay_uk_china" , "ebay_uk_abroad", "ebay_us_china", "ebay_us_abroad", "wish_china", "wish_abroad", "amazon_uk_china", "amazon_uk_abroad", "amazon_us_china", "amazon_us_abroad"
,"aliexpress_china","aliexpress_abroad","walmart_china","walmart_abroad","sears_china","sears_abroad","ebay_au_china","ebay_au_abroad","ebay_de_china","ebay_de_abroad","ebay_es_china","ebay_es_abroad",
"ebay_fr_china","ebay_fr_abroad","ebay_it_china","ebay_it_abroad","amazon_au_china","amazon_au_abroad","amazon_de_china","amazon_de_abroad","amazon_es_china","amazon_es_abroad","amazon_fr_china",
"amazon_fr_abroad","amazon_it_china","amazon_it_abroad","amazon_jp_china","amazon_jp_abroad","amazon_na_china","amazon_na_abroad","amazon_ca_china","amazon_ca_abroad"
};
if (string.IsNullOrWhiteSpace(warehouse_code)) if (string.IsNullOrWhiteSpace(warehouse_code))
{ {
return new List<string>(); return full;
} }
var wData = _connection.QuerySingleOrDefault<dc_base_warehouse>(" select * from dc_base_warehouse where warehouse_code=@warehouse_code ",new { warehouse_code = warehouse_code }); var wData = _connection.QuerySingleOrDefault<dc_base_warehouse>(" select * from dc_base_warehouse where warehouse_code=@warehouse_code ",new { warehouse_code = warehouse_code });
if (wData.hq_type == "国内仓") if (wData.hq_type == "国内仓")
...@@ -194,7 +212,7 @@ where tdb.usable_stock>0 "; ...@@ -194,7 +212,7 @@ where tdb.usable_stock>0 ";
} }
else else
{ {
return new List<string> { }; return full;
} }
} }
......
...@@ -1863,7 +1863,7 @@ update dc_report_cash_flow_sku_group set current_balance=current_income+current ...@@ -1863,7 +1863,7 @@ update dc_report_cash_flow_sku_group set current_balance=current_income+current
/// <summary> /// <summary>
/// 刷新数据 (高频) /// 刷新数据 (高频)
/// </summary> /// </summary>
public static void ResetDataHighFrequency() public static void ResetDataHighFrequencyListting()
{ {
_connection.Execute(@" -- 刷新 订单 listing_status 映射表 _connection.Execute(@" -- 刷新 订单 listing_status 映射表
set session transaction isolation level read uncommitted; set session transaction isolation level read uncommitted;
...@@ -1936,6 +1936,7 @@ alter table dc_base_listing_status_sum_viewTemp rename dc_base_listing_status_su ...@@ -1936,6 +1936,7 @@ alter table dc_base_listing_status_sum_viewTemp rename dc_base_listing_status_su
truncate table dc_base_listing_status_sum_view_temp; ", commandTimeout: 0); truncate table dc_base_listing_status_sum_view_temp; ", commandTimeout: 0);
} }
/// <summary> /// <summary>
/// 刷新库存监控数据 /// 刷新库存监控数据
/// </summary> /// </summary>
......
...@@ -23,7 +23,7 @@ namespace ResetOutofstock ...@@ -23,7 +23,7 @@ namespace ResetOutofstock
// throw; // throw;
//} //}
report.ResetCashFlowData(); //report.ResetCashFlowData();
var builder = new HostBuilder().ConfigureServices((hostContext, services) => var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
......
...@@ -122,25 +122,6 @@ namespace ResetOutofstock ...@@ -122,25 +122,6 @@ namespace ResetOutofstock
} }
}); });
Task.Factory.StartNew(() =>
{
while (true)
{
try
{
Console.WriteLine($"开始刷新 listing 数据,线程Id:{Thread.CurrentThread.ManagedThreadId}{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
report.ResetDataHighFrequency();
Console.WriteLine($"结束刷新 listing 数据,线程Id:{Thread.CurrentThread.ManagedThreadId}{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
}
catch (Exception ex)
{
Console.WriteLine(ex.Message);
}
Thread.Sleep(30 * 60 * 1000);
}
});
return Task.CompletedTask; return Task.CompletedTask;
} }
......
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