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 == "Ruby Store17" && s.SiteEn=="US").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)
             {
@@ -83,7 +83,6 @@ namespace AutoTurnOver.Services
                             {
                                 account = item.Account,
                                 date = feeItem.FundTransferDate == null ? new DateTime(1991, 1, 1) : feeItem.FundTransferDate.Value,
-                                end_date = (feeItem.FinancialEventGroupEnd == null ? new DateTime(1991, 1, 1) : feeItem.FinancialEventGroupEnd.Value).AddHours(8),
                                 start_date = (feeItem.FinancialEventGroupStart == null ? new DateTime(1991, 1, 1) : feeItem.FinancialEventGroupStart.Value).AddHours(8),
                                 AmazonOrderId = feeItem.FinancialEventGroupId,
                                 SellerOrderId = feeItem.TraceId,
@@ -94,10 +93,14 @@ namespace AutoTurnOver.Services
                                 total = (decimal)feeItem.BeginningBalance.CurrencyAmount - (decimal)feeItem.OriginalTotal.CurrencyAmount,
                                 currency_code = feeItem.OriginalTotal.CurrencyCode
                             };
-                            transferFee.description = $"已于 {transferFee.date.AddHours(8).ToString("yyyy/MM/dd")} 向您尾号为 {feeItem.AccountTail} 的账户转入金额为 {transferFee.currency_code}${0 - transferFee.total} 的款项。此款项大约需要 3-5 个工作日显示在您的银行账户中。";
-                            transferFee.settlement_date_str = $"{transferFee.start_date.Value.ToString("yyyy-MM-ddTHH:mm:ss")}~{transferFee.end_date.Value.ToString("yyyy-MM-ddTHH:mm:ss")}";
+                            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.settlement_date_str = $"{transferFee.start_date.Value.ToString("yyyy-MM-ddTHH:mm:ss")}";
                             transferFee.other = transferFee.total;
-                            transferFee.data_id = $"{feeItem.TraceId}_{transferFee.type}_{transferFee.AmazonOrderId}";
+                            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;
                             SetProject(maps.data.list, transferFee);
                             if (transferFee.id == 0)
@@ -538,7 +541,7 @@ namespace AutoTurnOver.Services
                         total = (decimal)settlementDbData.amount,
                         currency_code = settlementDbData.currency
                     };
-                    netIncome.settlement_date_str = $"{netIncome.start_date.Value.ToString("yyyy-MM-ddTHH:mm:ss")}~{netIncome.end_date.Value.ToString("yyyy-MM-ddTHH:mm:ss")}";
+                    netIncome.settlement_date_str = $"{netIncome.start_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;
@@ -553,7 +556,7 @@ namespace AutoTurnOver.Services
                             feeItem.start_date = settlementDbData.start_date;
                             feeItem.end_date = settlementDbData.end_date;
                             feeItem.type_cn = GetTypeCn(feeItem.type);
-                            feeItem.settlement_date_str = $"{feeItem.start_date.Value.ToString("yyyy-MM-ddTHH:mm:ss")}~{feeItem.end_date.Value.ToString("yyyy-MM-ddTHH:mm:ss")}";
+                            feeItem.settlement_date_str = $"{feeItem.start_date.Value.ToString("yyyy-MM-ddTHH:mm:ss")}";
                             feeItem._ts = DateTime.Now;
                             feeItem.id = MyMySqlConnection._connection.QueryFirstOrDefault<int?>("select id from dc_base_amazon_fee where data_id=@data_id", new { data_id = feeItem.data_id }) ?? 0;
                             if (feeItem.id > 0)

ResetOutofstock/Program.cs

@@ -51,12 +51,12 @@ 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().SynchroReportIds();
 
-                new AmazonDataSynchroService().SynchroReportIds(FikaAmazonAPI.Utils.Constants.ReportTypes.GET_V2_SETTLEMENT_REPORT_DATA_XML, 12, "Siqidzi");
+                //new AmazonDataSynchroService().SynchroReportIds(FikaAmazonAPI.Utils.Constants.ReportTypes.GET_V2_SETTLEMENT_REPORT_DATA_XML, 12, "Siqidzi");
                 //while (true)
                 //{
                 //    new AmazonDataSynchroService().AnaReport(status:-1);