Commit 086043b0 by lizefeng

提现记录追随结账id

parent b4d7ce86
...@@ -57,5 +57,6 @@ namespace AutoTurnOver.Models ...@@ -57,5 +57,6 @@ namespace AutoTurnOver.Models
public string fulfillment_center_id { get; set; } public string fulfillment_center_id { get; set; }
public string fulfillment_channel { get; set; } public string fulfillment_channel { get; set; }
public string sales_channel { get; set; } public string sales_channel { get; set; }
public DateTime _ts { get; set; }
} }
} }
...@@ -763,6 +763,7 @@ namespace AutoTurnOver.Services ...@@ -763,6 +763,7 @@ namespace AutoTurnOver.Services
fulfillment_channel = row.DataRowToString(comIndex++), fulfillment_channel = row.DataRowToString(comIndex++),
sales_channel = row.DataRowToString(comIndex++) sales_channel = row.DataRowToString(comIndex++)
}; };
fulfilledShipments._ts = DateTime.Now;
fulfilledShipments.data_id = $"{fulfilledShipments.amazon_order_id}-{fulfilledShipments.amazon_order_item_id}-{fulfilledShipments.sku}-{fulfilledShipments.merchant_order_item_id}-{fulfilledShipments.shipment_id}-{fulfilledShipments.shipment_item_id}-end"; fulfilledShipments.data_id = $"{fulfilledShipments.amazon_order_id}-{fulfilledShipments.amazon_order_item_id}-{fulfilledShipments.sku}-{fulfilledShipments.merchant_order_item_id}-{fulfilledShipments.shipment_id}-{fulfilledShipments.shipment_item_id}-end";
fulfilledShipments.id = MyMySqlConnection._connection.QueryFirstOrDefault<int?>(" select id from dc_base_amazon_fulfilled_shipments where data_id=@data_id ",new { data_id = fulfilledShipments.data_id })??0; fulfilledShipments.id = MyMySqlConnection._connection.QueryFirstOrDefault<int?>(" select id from dc_base_amazon_fulfilled_shipments where data_id=@data_id ",new { data_id = fulfilledShipments.data_id })??0;
if (fulfilledShipments.id > 0) if (fulfilledShipments.id > 0)
...@@ -1298,7 +1299,7 @@ namespace AutoTurnOver.Services ...@@ -1298,7 +1299,7 @@ namespace AutoTurnOver.Services
/// <summary> /// <summary>
/// 通过精准的时分秒的结算时间,寻找结算id /// 通过精准的时分秒的结算时间,寻找结算id
/// </summary> /// </summary>
public static void SetSettlementByDate() public void SetSettlementByDate()
{ {
var datas = MyMySqlConnection._connection.Query<dc_base_amazon_fee>(" select * from dc_base_amazon_fee where settlement_id='-' order by id desc limit 100 ").ToList(); var datas = MyMySqlConnection._connection.Query<dc_base_amazon_fee>(" select * from dc_base_amazon_fee where settlement_id='-' order by id desc limit 100 ").ToList();
foreach (var item in datas) foreach (var item in datas)
...@@ -1311,7 +1312,7 @@ namespace AutoTurnOver.Services ...@@ -1311,7 +1312,7 @@ namespace AutoTurnOver.Services
if (feeSingleData != null) if (feeSingleData != null)
{ {
item.settlement_id = feeSingleData.settlement_id; item.settlement_id = feeSingleData.settlement_id;
MyMySqlConnection._connection.Execute(" update dc_base_amazon_fee set settlement_id=@settlement_id where id=@id ",new { MyMySqlConnection._connection.Execute(" update dc_base_amazon_fee set settlement_id=@settlement_id,_ts=now() where id=@id ",new {
settlement_id = item.settlement_id, settlement_id = item.settlement_id,
id = item.id id = item.id
}); });
...@@ -1323,11 +1324,13 @@ namespace AutoTurnOver.Services ...@@ -1323,11 +1324,13 @@ namespace AutoTurnOver.Services
/// <summary> /// <summary>
/// 计算站点 (目前只有欧洲站点有这个情况) /// 计算站点 (目前只有欧洲站点有这个情况)
/// </summary> /// </summary>
public static void SetMarketplaceName() public void SetMarketplaceName(DateTime nowDate)
{ {
var allSites = new List<string> { "Amazon.it", "Amazon.fr", "Amazon.nl", "Amazon.es", "Amazon.de" }; var allSites = new List<string> { "Amazon.it", "Amazon.fr", "Amazon.nl", "Amazon.es", "Amazon.de" };
// 查询没有找到站点的结算表 // 查询没有找到站点的结算表
var datas = MyMySqlConnection._connection.Query<dc_base_amazon_settlement>(" select * from dc_base_amazon_settlement where marketplace_name_sys='' and currency='EUR' order by id desc limit 100 ").ToList(); var datas = MyMySqlConnection._connection.Query<dc_base_amazon_settlement>(" select * from dc_base_amazon_settlement where marketplace_name_sys='' and currency='EUR' and _ts<@nowDate order by id desc limit 100 ", new {
nowDate = nowDate
}).ToList();
foreach (var item in datas) foreach (var item in datas)
{ {
// 查询这个计算表差不多时间 // 查询这个计算表差不多时间
......
...@@ -52,6 +52,8 @@ namespace ResetOutofstock ...@@ -52,6 +52,8 @@ namespace ResetOutofstock
//report_invest_return_dao.CalculationStockScore("962073701"); //report_invest_return_dao.CalculationStockScore("962073701");
//dc_ana_deviation_dao.PushAnaTask(); //dc_ana_deviation_dao.PushAnaTask();
//new AmazonDataSynchroService().SynchroFinancialEventGroups(); //new AmazonDataSynchroService().SynchroFinancialEventGroups();
//new AmazonDataSynchroService().SetMarketplaceName(DateTime.Now);
//new AmazonDataSynchroService().SetSettlementByDate();
//new AmazonDataSynchroService().SynchroReportIds(); //new AmazonDataSynchroService().SynchroReportIds();
//new AmazonDataSynchroService().SynchroReportIds(FikaAmazonAPI.Utils.Constants.ReportTypes.GET_V2_SETTLEMENT_REPORT_DATA_FLAT_FILE_V2, 10); //new AmazonDataSynchroService().SynchroReportIds(FikaAmazonAPI.Utils.Constants.ReportTypes.GET_V2_SETTLEMENT_REPORT_DATA_FLAT_FILE_V2, 10);
......
...@@ -712,15 +712,60 @@ namespace ResetOutofstock ...@@ -712,15 +712,60 @@ namespace ResetOutofstock
try try
{ {
Console.WriteLine($"开始 拉取亚马逊现记录,线程Id:{Thread.CurrentThread.ManagedThreadId}{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}"); Console.WriteLine($"开始 拉取亚马逊现记录,线程Id:{Thread.CurrentThread.ManagedThreadId}{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
new AmazonDataSynchroService().SynchroFinancialEventGroups(); new AmazonDataSynchroService().SynchroFinancialEventGroups();
Console.WriteLine($"结束 拉取亚马逊现记录,线程Id:{Thread.CurrentThread.ManagedThreadId}{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}"); Console.WriteLine($"结束 拉取亚马逊现记录,线程Id:{Thread.CurrentThread.ManagedThreadId}{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
Thread.Sleep(1000 * 3 ); Thread.Sleep(1000 * 3 );
} }
catch (Exception ex) catch (Exception ex)
{ {
Console.WriteLine(" 解析亚马逊报表:" + ex.Message); Console.WriteLine(" 拉取亚马逊体现记录:" + ex.Message);
Console.WriteLine(" 解析亚马逊报表 :" + ex.StackTrace); Console.WriteLine(" 拉取亚马逊体现记录 :" + ex.StackTrace);
}
}
});
Task.Factory.StartNew(() =>
{
while (true)
{
try
{
Console.WriteLine($"开始 补充计算结算记录的站点,线程Id:{Thread.CurrentThread.ManagedThreadId}{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
new AmazonDataSynchroService().SetMarketplaceName(DateTime.Now.AddHours(-24));
Console.WriteLine($"结束 补充计算结算记录的站点,线程Id:{Thread.CurrentThread.ManagedThreadId}{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
Thread.Sleep(1000 * 3 );
}
catch (Exception ex)
{
Console.WriteLine(" 补充计算结算记录的站点:" + ex.Message);
Console.WriteLine(" 补充计算结算记录的站点 :" + ex.StackTrace);
}
}
});
Task.Factory.StartNew(() =>
{
while (true)
{
try
{
Console.WriteLine($"开始 提现记录追溯结算id,线程Id:{Thread.CurrentThread.ManagedThreadId}{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
new AmazonDataSynchroService().SetSettlementByDate();
Console.WriteLine($"结束 提现记录追溯结算id,线程Id:{Thread.CurrentThread.ManagedThreadId}{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
Thread.Sleep(1000 * 3 );
}
catch (Exception ex)
{
Console.WriteLine(" 提现记录追溯结算id:" + ex.Message);
Console.WriteLine(" 提现记录追溯结算id :" + ex.StackTrace);
} }
......
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