fix

AutoTurnOver.Services/AmazonDataSynchroService.cs

@@ -881,7 +881,7 @@ namespace AutoTurnOver.Services
                         if (oldData != null)
                         {
                             // 多份报表都出现同一份数据。已报表实际较晚的为准
-                            if (oldData.report_end_date <= storageFee.report_end_date)
+                            if (oldData.report_end_date < storageFee.report_end_date)
                             {
                                 storageFee._project = oldData._project;
                                 storageFee.exchange_cny = oldData.exchange_cny;

ResetOutofstock/Program.cs

@@ -65,11 +65,14 @@ namespace ResetOutofstock
                 //new AmazonDataSynchroService().AnaFbaStorageFeeReport(status:-1);
                 //new AmazonDataSynchroService().AnaFbaLongTermStorageFeeReport();
                 //new AmazonDataSynchroService().AnaFbaOverageStorageFeeReport(report_id: "937084019471");
-                //while (true)
-                //{
-                //    new AmazonDataSynchroService().AnaFbaStorageFeeReport();
-                //}
+
                 //new AmazonDataSynchroService().AnaReport(data_id: "17339571721");
+
+                new AmazonDataSynchroService().SynchroReportIdByCreate(
+                      FikaAmazonAPI.Utils.Constants.ReportTypes.GET_FBA_STORAGE_FEE_CHARGES_DATA,
+                      version: 18,
+                        btime: DateTime.Now.AddMonths(-1).GetMonthFirstDay().ToDayHome().AddHours(-8),
+                       etime: DateTime.Now.AddMonths(-1).LastDayOfMonth().ToDayEnd().AddHours(-8));
             }
             catch (Exception ex)
             {

ResetOutofstock/ResetOutofstockBackgrounService.cs

@@ -722,7 +722,20 @@ namespace ResetOutofstock
                 try
                 {
                     Console.WriteLine($"开始  拉取亚马逊 月度仓储费，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
-                    new AmazonDataSynchroService().SynchroReportIds(FikaAmazonAPI.Utils.Constants.ReportTypes.GET_FBA_STORAGE_FEE_CHARGES_DATA, 15);
+                    //new AmazonDataSynchroService().SynchroReportIds(FikaAmazonAPI.Utils.Constants.ReportTypes.GET_FBA_STORAGE_FEE_CHARGES_DATA, 15);
+
+                    // 下载上个月的
+                    new AmazonDataSynchroService().SynchroReportIdByCreate(
+                        FikaAmazonAPI.Utils.Constants.ReportTypes.GET_FBA_STORAGE_FEE_CHARGES_DATA,
+                        version: 23,
+                          btime: DateTime.Now.AddMonths(-1).GetMonthFirstDay().ToDayHome().AddHours(-8),
+                         etime: DateTime.Now.AddMonths(-1).LastDayOfMonth().ToDayEnd().AddHours(-8));
+                    // 下载这个月的
+                    new AmazonDataSynchroService().SynchroReportIdByCreate(
+                       FikaAmazonAPI.Utils.Constants.ReportTypes.GET_FBA_STORAGE_FEE_CHARGES_DATA,
+                       version: 23,
+                         btime: DateTime.Now.GetMonthFirstDay().ToDayHome(),
+                        etime: DateTime.Now.ToDayEnd());
                     Console.WriteLine($"结束 拉取亚马逊 月度仓储费，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
                     Thread.Sleep(1000 * 60 * 3);
                 }
@@ -791,7 +804,7 @@ namespace ResetOutofstock
                 {
                     Console.WriteLine($"开始  解析月度仓储费，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
                     new AmazonDataSynchroService().AnaFbaStorageFeeReport();
-                    //new AmazonDataSynchroService().AnaFbaStorageFeeReport(-1);
+                    new AmazonDataSynchroService().AnaFbaStorageFeeReport(-1);
                     Console.WriteLine($"结束 解析月度仓储费，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
                     Thread.Sleep(500);
                 }