fix

AutoTurnOver.Services/AmazonDataSynchroService.cs

@@ -37,7 +37,7 @@ namespace AutoTurnOver.Services
         {
             // 拉取亚马逊账号
             var amazonAccounts = ApiServices.GetAmazonAccountList();
-            //amazonAccounts = amazonAccounts.Where(s => s.Account == "Ruby Store17" && s.SiteEn=="US").ToList();
+            amazonAccounts = amazonAccounts.Where(s => s.Account == "Siqidzi" && s.SiteEn=="DE").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_v16_{item.Id}";
+                        var task_name = $"SynchroAmazonFinancialEventGroups_v17_{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 });
 
@@ -90,7 +90,7 @@ namespace AutoTurnOver.Services
                                 settlement_id = "-",
                                 type = "Transfer", // 提现
                                 type_cn = "放款", // 提现
-                                total = (decimal)feeItem.BeginningBalance.CurrencyAmount - (decimal)feeItem.OriginalTotal.CurrencyAmount,
+                                total = Math.Max(0, (decimal)feeItem.BeginningBalance.CurrencyAmount) - (decimal)feeItem.OriginalTotal.CurrencyAmount,
                                 currency_code = feeItem.OriginalTotal.CurrencyCode
                             };
                             if (feeItem.FinancialEventGroupEnd != null)
@@ -108,7 +108,14 @@ namespace AutoTurnOver.Services
                             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.id = MyMySqlConnection._connection.QueryFirstOrDefault<int?>(" select id from dc_base_amazon_fee where data_id=@data_id ", new { data_id = transferFee.data_id }) ?? 0;
+                            var oldData = MyMySqlConnection._connection.QueryFirstOrDefault<dc_base_amazon_fee>(" select id from dc_base_amazon_fee where data_id=@data_id ", new { data_id = transferFee.data_id }) ;
+                            if (oldData != null)
+                            {
+                                transferFee.id = oldData.id;
+                                transferFee.settlement_id = oldData.settlement_id;
+                                transferFee.MarketplaceName = oldData.MarketplaceName;
+                                transferFee.MarketplaceNameSys = oldData.MarketplaceNameSys;
+                            }
                             SetProject(maps.data.list, transferFee);
                             if (transferFee.id == 0)
                             {

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();