Commit 529a3029 by lizefeng

fix

parent 5d307a1d
...@@ -46,7 +46,7 @@ namespace AutoTurnOver.Services ...@@ -46,7 +46,7 @@ namespace AutoTurnOver.Services
if (item.AmznSpDevAccountObj != null && item.AmznSpTokenObj != null) if (item.AmznSpDevAccountObj != null && item.AmznSpTokenObj != null)
{ {
var task_name = $"SynchroAmazonFinancialEventGroups_v14_{item.Id}"; var task_name = $"SynchroAmazonFinancialEventGroups_v15_{item.Id}";
// 查询最后一次成功抓取的记录 // 查询最后一次成功抓取的记录
var last_task_synchro_log = MyMySqlConnection._connection.QuerySingleOrDefault<task_synchro_log>(" select * from task_synchro_log where task_name=@task_name and status=1 order by end_time desc limit 1 ", new { task_name = task_name }); var last_task_synchro_log = MyMySqlConnection._connection.QuerySingleOrDefault<task_synchro_log>(" select * from task_synchro_log where task_name=@task_name and status=1 order by end_time desc limit 1 ", new { task_name = task_name });
...@@ -60,7 +60,7 @@ namespace AutoTurnOver.Services ...@@ -60,7 +60,7 @@ namespace AutoTurnOver.Services
if (last_task_synchro_log != null) if (last_task_synchro_log != null)
{ {
new_task_synchro_log.start_time = last_task_synchro_log.end_time.AddMinutes(-1); new_task_synchro_log.start_time = last_task_synchro_log.end_time.AddMonths(-3);
} }
else else
{ {
...@@ -75,7 +75,7 @@ namespace AutoTurnOver.Services ...@@ -75,7 +75,7 @@ namespace AutoTurnOver.Services
var now = DateTime.Now; var now = DateTime.Now;
var fees = GetFinancialEventGroups(item, new_task_synchro_log.start_time, new_task_synchro_log.end_time); var fees = GetFinancialEventGroups(item, new_task_synchro_log.start_time, new_task_synchro_log.end_time);
//var json = fees.ToJson(); //var json = fees.ToJson();
foreach (var feeItem in fees.Where(s => s.FundTransferStatus == "Succeeded")) foreach (var feeItem in fees.Where(s => s.FundTransferStatus == "Succeeded" || (s.ProcessingStatus== "Open" && s.FinancialEventGroupEnd==null)) )
{ {
...@@ -96,8 +96,15 @@ namespace AutoTurnOver.Services ...@@ -96,8 +96,15 @@ namespace AutoTurnOver.Services
if (feeItem.FinancialEventGroupEnd != null) if (feeItem.FinancialEventGroupEnd != null)
{ {
transferFee.end_date = feeItem.FinancialEventGroupEnd.Value.AddHours(8); transferFee.end_date = feeItem.FinancialEventGroupEnd.Value.AddHours(8);
transferFee.description = $"已于 {transferFee.date.ToString("yyyy/MM/dd")} 向您尾号为 {feeItem.AccountTail} 的账户转入金额为 {transferFee.currency_code}${0 - transferFee.total} 的款项。此款项大约需要 3-5 个工作日显示在您的银行账户中。";
}
else
{
transferFee.type = "Transfer Estimate";
transferFee.type_cn = "放款 预估";
transferFee.description = $" {transferFee.currency_code}${0 - transferFee.total} 转账计划于以下日期发起:预估。";
} }
transferFee.description = $"已于 {transferFee.date.ToString("yyyy/MM/dd")} 向您尾号为 {feeItem.AccountTail} 的账户转入金额为 {transferFee.currency_code}${0 - transferFee.total} 的款项。此款项大约需要 3-5 个工作日显示在您的银行账户中。";
transferFee.settlement_date_str = $"{transferFee.start_date.Value.ToString("yyyy-MM-ddTHH:mm:ss")}"; transferFee.settlement_date_str = $"{transferFee.start_date.Value.ToString("yyyy-MM-ddTHH:mm:ss")}";
transferFee.other = transferFee.total; transferFee.other = transferFee.total;
transferFee.data_id = $"{transferFee.type}_{transferFee.AmazonOrderId}"; transferFee.data_id = $"{transferFee.type}_{transferFee.AmazonOrderId}";
......
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