fba 放款金额取数调整

AutoTurnOver.Services/AmazonDataSynchroService.cs

@@ -119,6 +119,8 @@ namespace AutoTurnOver.Services
                             };
                             if (feeItem.FinancialEventGroupEnd != null)
                             {
+                                // 实际放款，这个位置抓不准，所以要跳过，换结算表抓取
+                                continue;
                                 transferFee.end_date = feeItem.FinancialEventGroupEnd.Value.AddHours(8);
                                 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")}";
@@ -630,8 +632,8 @@ namespace AutoTurnOver.Services
                     {
                         account = pamsAccount.Account,
                         date = settlementDbData.end_date.Value == null ? new DateTime(1991, 1, 1) : settlementDbData.end_date.Value,
-                        end_date = (settlementDbData.end_date == null ? new DateTime(1991, 1, 1) : settlementDbData.end_date.Value).AddHours(8),
-                        start_date = (settlementDbData.start_date == null ? new DateTime(1991, 1, 1) : settlementDbData.start_date.Value).AddHours(8),
+                        end_date = settlementDbData.end_date,
+                        start_date = settlementDbData.start_date,
                         AmazonOrderId = settlementDbData.settlement_id,
                         SellerOrderId = settlementDbData.settlement_id,
                         _ts = DateTime.Now,
@@ -647,9 +649,19 @@ namespace AutoTurnOver.Services
                     netIncome.settlement_date_end_str = $"{netIncome.end_date.Value.ToString("yyyy-MM-ddTHH:mm:ss")}";
                     netIncome.description = $"{netIncome.start_date.Value.AddHours(8).ToString("yyyy-MM-dd")}~{netIncome.end_date.Value.AddHours(8).ToString("yyyy-MM-dd")}";
                     netIncome.data_id = $"{netIncome.settlement_id}_{netIncome.type}";
-                    netIncome.id = MyMySqlConnection._connection.QueryFirstOrDefault<int?>(" select id from dc_base_amazon_fee where data_id=@data_id ", new { data_id = netIncome.data_id }) ?? 0;
+                    //netIncome.id = MyMySqlConnection._connection.QueryFirstOrDefault<int?>(" select id from dc_base_amazon_fee where data_id=@data_id ", new { data_id = netIncome.data_id }) ?? 0;
                     feeDatas.Add(netIncome);
 
+                    // 计算实际放款
+                    var realityTransfer = netIncome.ToJson().ToObj<dc_base_amazon_fee>();
+                    var yuliu = Math.Max(0M, feeDatas.FirstOrDefault(s => s.type_cn == "预留金额")?.total ?? 0);
+                    realityTransfer.total = netIncome.total - yuliu;
+                    realityTransfer.type = "Transfer";
+                    realityTransfer.type_cn = "放款";
+                    realityTransfer.description = $"结算表 {settlementDbData.settlement_id} ， 净收入{netIncome.total} - 预留金额（负数取0）{yuliu}";
+                    realityTransfer.data_id = $"{realityTransfer.type}_{realityTransfer.account}-{realityTransfer.settlement_date_str}"; 
+                    feeDatas.Add(realityTransfer);
+
                     foreach (var feeItem in feeDatas)
                     {
                         try
@@ -1999,7 +2011,7 @@ namespace AutoTurnOver.Services
 
             var parameters = new ParameterListFinancialEventGroup();
             parameters.FinancialEventGroupStartedAfter = btime;
-            parameters.FinancialEventGroupStartedBefore = etime;
+            //parameters.FinancialEventGroupStartedBefore = etime;
             parameters.MaxResultsPerPage = 100;
             var reports = amazonConnection.Financial.ListFinancialEventGroups(parameters);
             return reports;

ResetOutofstock/Program.cs

@@ -49,10 +49,10 @@ namespace ResetOutofstock
                 //report_invest_return_dao.SynchBtmOrderRefund();
                 //report_invest_return_dao.CalculationStockScore("962073701");
                 //dc_ana_deviation_dao.PushAnaTask();
-                //new AmazonDataSynchroService().SynchroFinancialEventGroups("ouzyi", "FR");
+                //new AmazonDataSynchroService().SynchroFinancialEventGroups("Natural Daisy Encens", "UK");
                 //new AmazonDataSynchroService().SetMarketplaceName(DateTime.Now);
                 //new AmazonDataSynchroService().SetSettlementByDate();
-                new AmazonDataSynchroService().SetMarketplaceName(DateTime.Now.AddHours(-24), 372205);
+                //new AmazonDataSynchroService().SetMarketplaceName(DateTime.Now.AddHours(-24), 372205);
                 //new AmazonDataSynchroService().SetMarketplaceNameByDate(id: 341198);
                 //new AmazonDataSynchroService().SynchroReportIds();
 
@@ -60,6 +60,7 @@ namespace ResetOutofstock
                 //new AmazonDataSynchroService().SynchroReportIdByCreate(FikaAmazonAPI.Utils.Constants.ReportTypes.GET_FBA_INVENTORY_PLANNING_DATA, version: 22, account: "Elite99 Nail Art", site: "US",
                 //   btime: DateTime.Parse("2023-04-01"), DateTime.Parse("2023-04-24 23:59:59"));
                 //new AmazonDataSynchroService().SynchroReportIds(FikaAmazonAPI.Utils.Constants.ReportTypes.GET_AFN_INVENTORY_DATA, 13, "Natural Daisy Encens", "ES");
+                //new AmazonDataSynchroService().AnaReport(1, data_id: "20331759402");
                 //new AmazonDataSynchroService().AnaFbaShipmentReport();
                 //new AmazonDataSynchroService().AnaFbaStorageFeeReport(status:-1);
                 //new AmazonDataSynchroService().AnaFbaLongTermStorageFeeReport(3);