fix

AutoTurnOver.Services/AmazonDataSynchroService.cs

@@ -37,7 +37,7 @@ namespace AutoTurnOver.Services
         {
             // 拉取亚马逊账号
             var amazonAccounts = ApiServices.GetAmazonAccountList();
-            amazonAccounts = amazonAccounts.Where(s => s.Account == "ouzyi" && s.SiteEn=="IT").ToList();
+            //amazonAccounts = amazonAccounts.Where(s => s.Account == "ouzyi" && s.SiteEn=="IT").ToList();
             var maps = ApiUtility.GetProjectMap(new NewQueryFilterDTO { modelId = "309227134293902597", CurrentPage = 1, PageSize = 10000, ListFilter = new List<FieldFilterDTO> { new FieldFilterDTO { Field = "type", Operator = "in", Value = "10" } } });
             foreach (var item in amazonAccounts)
             {
@@ -46,7 +46,7 @@ namespace AutoTurnOver.Services
                     if (item.AmznSpDevAccountObj != null && item.AmznSpTokenObj != null)
                     {
 
-                        var task_name = $"SynchroAmazonFinancialEventGroups_v17_{item.Id}";
+                        var task_name = $"SynchroAmazonFinancialEventGroups_v18_{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 });
 
@@ -96,7 +96,7 @@ namespace AutoTurnOver.Services
                             if (feeItem.FinancialEventGroupEnd != null)
                             {
                                 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 个工作日显示在您的银行账户中。";
+                                transferFee.description = $"已于 {transferFee.date.ToString("yyyy/MM/dd")} 向您尾号为 {feeItem.AccountTail} 的账户转入金额为 {transferFee.currency_code}${transferFee.total} 的款项。此款项大约需要 3-5 个工作日显示在您的银行账户中。";
                                 transferFee.settlement_date_end_str = $"{transferFee.end_date.Value.ToString("yyyy-MM-ddTHH:mm:ss")}";
                             }
                             else
@@ -104,12 +104,12 @@ namespace AutoTurnOver.Services
                                 var end_date_utc = feeItem.FinancialEventGroupStart.Value.AddDays(14);
                                 transferFee.end_date = end_date_utc.AddHours(8);
                                 transferFee.type_cn = "放款 预估";
-                                transferFee.description = $" {transferFee.currency_code}${0 - transferFee.total} 转账计划于以下日期发起：{end_date_utc.ToString("yyyy/MM/dd")}。";
+                                transferFee.description = $" {transferFee.currency_code}${transferFee.total} 转账计划于以下日期发起：{end_date_utc.ToString("yyyy/MM/dd")}。";
                             }
                            
                             transferFee.settlement_date_str = $"{transferFee.start_date.Value.ToString("yyyy-MM-ddTHH:mm:ss")}";
                             transferFee.other = transferFee.total;
-                            transferFee.data_id = $"{transferFee.type}_{transferFee.AmazonOrderId}";
+                            transferFee.data_id = $"{transferFee.type}_{transferFee.account}-{transferFee.settlement_date_str}";
                             var oldData = MyMySqlConnection._connection.QueryFirstOrDefault<dc_base_amazon_fee>(" select * from dc_base_amazon_fee where data_id=@data_id ", new { data_id = transferFee.data_id }) ;
                             if (oldData != null)
                             {

ResetOutofstock/Program.cs

@@ -51,7 +51,7 @@ namespace ResetOutofstock
                 //report_invest_return_dao.SynchBtmOrderRefund();
                 //report_invest_return_dao.CalculationStockScore("962073701");
                 //dc_ana_deviation_dao.PushAnaTask();
-                //new AmazonDataSynchroService().SynchroFinancialEventGroups();
+                new AmazonDataSynchroService().SynchroFinancialEventGroups();
                 //new AmazonDataSynchroService().SetMarketplaceName(DateTime.Now);
                 //new AmazonDataSynchroService().SetSettlementByDate();
                 //new AmazonDataSynchroService().SetMarketplaceNameByDate();