Commit fcebd18c by lizefeng

fix

parent 30aa0566
...@@ -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_v12_{item.Id}"; var task_name = $"SynchroAmazonFinancialEventGroups_v13_{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 });
...@@ -89,17 +89,12 @@ namespace AutoTurnOver.Services ...@@ -89,17 +89,12 @@ namespace AutoTurnOver.Services
SellerOrderId = feeItem.TraceId, SellerOrderId = feeItem.TraceId,
_ts = DateTime.Now, _ts = DateTime.Now,
settlement_id = "-", settlement_id = "-",
type = "Transfer", // 提现 type = "Transfer", // 提现
type_cn = "放款", // 提现 type_cn = "放款", // 提现
total = (decimal)feeItem.BeginningBalance.CurrencyAmount - (decimal)feeItem.OriginalTotal.CurrencyAmount, total = (decimal)feeItem.BeginningBalance.CurrencyAmount - (decimal)feeItem.OriginalTotal.CurrencyAmount,
currency_code = feeItem.OriginalTotal.CurrencyCode currency_code = feeItem.OriginalTotal.CurrencyCode
}; };
transferFee.description = $"计划于 { transferFee.date.AddHours(8).ToString("yyyy/MM/dd")}* 扣除 {transferFee.total} {transferFee.currency_code} 的金额"; transferFee.description = $"已于 {transferFee.date.AddHours(8).ToString("yyyy/MM/dd")} 向您尾号为 {feeItem.AccountTail} 的账户转入金额为 {transferFee.currency_code}${transferFee.total} 的款项。此款项大约需要 3-5 个工作日显示在您的银行账户中。";
if (transferFee.total > 0)
{
transferFee.description = $"已于 {transferFee.date.AddHours(8).ToString("yyyy/MM/dd")} 向您尾号为 {feeItem.AccountTail} 的账户转入金额为 {transferFee.currency_code}${transferFee.total} 的款项。此款项大约需要 3-5 个工作日显示在您的银行账户中。";
}
transferFee.settlement_date_str = $"{transferFee.start_date.Value.ToString("yyyy-MM-ddTHH:mm:ss")}~{transferFee.end_date.Value.ToString("yyyy-MM-ddTHH:mm:ss")}"; transferFee.settlement_date_str = $"{transferFee.start_date.Value.ToString("yyyy-MM-ddTHH:mm:ss")}~{transferFee.end_date.Value.ToString("yyyy-MM-ddTHH:mm:ss")}";
transferFee.other = transferFee.total; transferFee.other = transferFee.total;
transferFee.data_id = $"{feeItem.TraceId}_{transferFee.type}_{transferFee.AmazonOrderId}"; transferFee.data_id = $"{feeItem.TraceId}_{transferFee.type}_{transferFee.AmazonOrderId}";
...@@ -1030,7 +1025,10 @@ namespace AutoTurnOver.Services ...@@ -1030,7 +1025,10 @@ namespace AutoTurnOver.Services
} }
feeShipmentEvent.date = postedDate == null ? new DateTime(1991, 1, 1) : postedDate.Value; feeShipmentEvent.date = postedDate == null ? new DateTime(1991, 1, 1) : postedDate.Value;
feeShipmentEvent.data_id = $"{account.Account}_OtherTransaction_{transactionID}_{feeShipmentEvent.AmazonOrderId}_{ feeShipmentEvent.description}_{feeShipmentEvent.settlement_id}_{feeShipmentEvent.date.ToString("yyyy-MM-ddTHH:mm:ss")}"; feeShipmentEvent.data_id = $"{account.Account}_OtherTransaction_{transactionID}_{feeShipmentEvent.AmazonOrderId}_{ feeShipmentEvent.description}_{feeShipmentEvent.settlement_id}_{feeShipmentEvent.date.ToString("yyyy-MM-ddTHH:mm:ss")}";
if (feeShipmentEvent.type == "Payable to Amazon")
{
feeShipmentEvent.description = $"计划于 { feeShipmentEvent.date.AddHours(8).ToString("yyyy/MM/dd")}* 扣除 {feeShipmentEvent.total} {feeShipmentEvent.currency_code} 的金额";
}
return feeShipmentEvent; return feeShipmentEvent;
} }
......
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