Commit 43e86cec by lizefeng

记录结账时间的唯一字段

parent 9e02945e
......@@ -39,6 +39,7 @@ namespace AutoTurnOver.Models
public decimal total { get; set; }
public DateTime date { get; set; }
public string MarketplaceNameSys { get; set; }
public string settlement_date_str { get; set; }
public DateTime? start_date { get; set; }
public DateTime? end_date { get; set; }
public DateTime _ts { get; set; }
......
......@@ -232,7 +232,7 @@ namespace AutoTurnOver.Services
if (item.AmznSpDevAccountObj != null && item.AmznSpTokenObj != null)
{
var task_name = $"SynchroAmazonFinancialEventGroups_v6_{item.Id}";
var task_name = $"SynchroAmazonFinancialEventGroups_v7_{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 });
......@@ -269,6 +269,8 @@ namespace AutoTurnOver.Services
{
account = item.Account,
date = feeItem.FundTransferDate==null?new DateTime(1991,1,1) : feeItem.FundTransferDate.Value,
end_date = feeItem.FinancialEventGroupEnd == null ? new DateTime(1991, 1, 1) : feeItem.FinancialEventGroupEnd.Value,
start_date = feeItem.FinancialEventGroupStart == null ? new DateTime(1991, 1, 1) : feeItem.FinancialEventGroupStart.Value,
AmazonOrderId = feeItem.FinancialEventGroupId,
SellerOrderId = feeItem.TraceId,
description = $"To account ending in: {feeItem.AccountTail}",
......@@ -276,6 +278,7 @@ namespace AutoTurnOver.Services
total = (decimal)feeItem.BeginningBalance.CurrencyAmount - (decimal)feeItem.OriginalTotal.CurrencyAmount ,
currency_code = feeItem.OriginalTotal.CurrencyCode
};
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.data_id = $"{feeItem.TraceId}_{transferFee.type}_{transferFee.AmazonOrderId}";
transferFee.id = MyMySqlConnection._connection.QueryFirstOrDefault<int?>(" select id from dc_base_amazon_fee where data_id=@data_id ", new { data_id = transferFee.data_id }) ?? 0;
......@@ -639,6 +642,7 @@ namespace AutoTurnOver.Services
feeItem.MarketplaceNameSys = marketplaceNameSys;
feeItem.start_date = settlementDbData.start_date;
feeItem.end_date = settlementDbData.end_date;
feeItem.settlement_date_str =$"{feeItem.start_date.Value.ToString("yyyy-MM-ddTHH:mm:ss")}~{feeItem.end_date.Value.ToString("yyyy-MM-ddTHH:mm:ss")}";
feeItem._ts = DateTime.Now;
feeItem.id = MyMySqlConnection._connection.QueryFirstOrDefault<int?>("select id from dc_base_amazon_fee where data_id=@data_id", new { data_id = feeItem.data_id }) ?? 0;
if (feeItem.id > 0)
......
......@@ -268,7 +268,7 @@ namespace AutoTurnOver.Services
try
{
string url = ConfigHelper.GetValue("Pams_GetAccountToken");
string resultStr = HttpHelper.Request(url, RequestType.GET, "", timeout: 1000 * 60 * 60 * 24);
string resultStr = HttpHelper.Request(url+ "?platform=amazon", RequestType.GET, "", timeout: 1000 * 60 * 60 * 24);
var result = resultStr.ToObj<PamsResultDto<List<AmazonAccountDto>>>();
if (result == null)
{
......
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