fix

AutoTurnOver.Models/dc_base_amazon_fee_report_log.cs

@@ -8,6 +8,7 @@ namespace AutoTurnOver.Models
     {
         public int id { get; set; }
         public string report_id { get; set; }
+        public string site_code { get; set; }
         public string report_type { get; set; }
         public string report_par_json { get; set; }
         public int pams_account_id { get; set; }

AutoTurnOver.Services/AmazonDataSynchroService.cs

@@ -329,7 +329,7 @@ namespace AutoTurnOver.Services
                         var item = ApiServices.GetAmazonAccountList().FirstOrDefault(s => s.Id == itemV.Id);
 
                         var reportTypeEnum = ReportTypes.GET_V2_SETTLEMENT_REPORT_DATA_XML;
-                        var task_name = $"SynchroAmazonReport_{reportTypeEnum.ToString()}_v1_{item.Id}";
+                        var task_name = $"SynchroAmazonReport_{reportTypeEnum.ToString()}_v2_{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 });
 
@@ -343,7 +343,7 @@ namespace AutoTurnOver.Services
 
                         if (last_task_synchro_log != null)
                         {
-                            // 由于是拉报告，没必要太频繁，如果3小时之内拉过的，就先跳过
+                            // 由于是拉报告，没必要太频繁，如果24小时之内拉过的，就先跳过
                             if ((DateTime.Now - last_task_synchro_log.end_time).TotalHours <3)
                             {
                                 continue;
@@ -374,7 +374,8 @@ namespace AutoTurnOver.Services
                                 report_type = reportTypeEnum.ToString(),
                                 report_par_json = reportsItem.ToJson(),
                                 btime = reportsItem.DataStartTime,
-                                etime = reportsItem.DataEndTime
+                                etime = reportsItem.DataEndTime,
+                                site_code = item.SiteEn,
 
                             };
                             reportsDb.id = MyMySqlConnection._connection.QueryFirstOrDefault<int?>(" select id from dc_base_amazon_fee_report_log where report_id=@report_id and pams_account_id=@pams_account_id ",new {
@@ -434,6 +435,11 @@ namespace AutoTurnOver.Services
                 doc.LoadXml(response_str.ToString());
                 string jsonText = Newtonsoft.Json.JsonConvert.SerializeXmlNode(doc);
                 ana_task.content = jsonText;
+
+                //序列化
+                var settlementData = MapSettlement(jsonText);
+
+
                 ana_task.ana_error = "";
                 ana_task.ana_stack_trace = "";
                 ana_task.ana_status = 1;
@@ -448,6 +454,10 @@ namespace AutoTurnOver.Services
             MyMySqlConnection._connection.Update(ana_task);
         }
 
+        public ApiAmazonSettlementDto MapSettlement(string json)
+        {
+            return json.ToObj<ApiAmazonSettlementDto>();
+        }
         public dc_base_amazon_fee ApiDataMapDbData(string account, ShipmentEvent shipmentEvent, ShipmentItem shipmentItem, string type)
         {
             var fbaFeeTypeList = new List<string> { "FBAPerOrderFulfillmentFee", "FBAPerUnitFulfillmentFee", "FBAWeightBasedFee" };
@@ -638,7 +648,8 @@ namespace AutoTurnOver.Services
             parameters.dataEndTime = etime;
             parameters.marketplaceIds = new MarketplaceIds();
             parameters.marketplaceIds.Add(account.MarketPlaceObj.multiMwsMid);
-            parameters.reportOptions = new FikaAmazonAPI.AmazonSpApiSDK.Models.Reports.ReportOptions();
+            parameters.reportOptions = new 
+                ReportOptions() { };
 
             var reportId = amazonConnection.Reports.CreateReport(parameters);
 

ResetOutofstock/Program.cs

@@ -52,9 +52,10 @@ namespace ResetOutofstock
                 //report_invest_return_dao.CalculationStockScore("962073701");
                 //dc_ana_deviation_dao.PushAnaTask();
                 //new AmazonDataSynchroService().SynchroFinancialEventGroups();
+                //new AmazonDataSynchroService().SynchroReportIds();
                 //while (true)
                 //{
-                //    new AmazonDataSynchroService().AnaReport();
+                 //   new AmazonDataSynchroService().AnaReport();
                 //}
 
 

ResetOutofstock/ResetOutofstock.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>latest</LangVersion>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <PublishWithAspNetCoreTargetManifest>false</PublishWithAspNetCoreTargetManifest>