报表下载记录，新增account字段

AutoTurnOver.Models/dc_base_amazon_fee_report_log.cs

@@ -24,5 +24,6 @@ namespace AutoTurnOver.Models
         public DateTime create_time { get; set; }
         public DateTime? btime { get; set; }
         public DateTime? etime { get; set; }
+        public string account { get; set; }
     }
 }

AutoTurnOver.Services/AmazonDataSynchroService.cs

@@ -38,7 +38,7 @@ namespace AutoTurnOver.Services
             // 拉取亚马逊账号
             var amazonAccounts = ApiServices.GetAmazonAccountList();
             //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" } } });
+            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)
             {
                 try
@@ -94,12 +94,12 @@ 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.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")}";
                             transferFee.other = transferFee.total;
                             transferFee.data_id = $"{feeItem.TraceId}_{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);
+                            SetProject(maps.data.list, transferFee);
                             if (transferFee.id == 0)
                             {
                                 MyMySqlConnection._connection.Insert(transferFee);
@@ -109,7 +109,7 @@ namespace AutoTurnOver.Services
                                 MyMySqlConnection._connection.Update(transferFee);
                             }
 
-                           
+
                         }
 
 
@@ -144,11 +144,15 @@ namespace AutoTurnOver.Services
         /// <summary>
         /// 拉取报表
         /// </summary>
-        public void SynchroReportIds(ReportTypes reportTypeEnum, int version = 8)
+        public void SynchroReportIds(ReportTypes reportTypeEnum, int version = 8, string account = "")
         {
             // 拉取亚马逊账号
             var amazonAccounts = ApiServices.GetAmazonAccountList();
-            //amazonAccounts = amazonAccounts.Where(s => s.Account == "Natural Daisy Encens" && s.SiteEn == "UK").ToList();
+            if (!string.IsNullOrWhiteSpace(account))
+            {
+                amazonAccounts = amazonAccounts.Where(s => s.Account == account).ToList();
+            }
+
             foreach (var itemV in amazonAccounts)
             {
                 try
@@ -210,6 +214,7 @@ namespace AutoTurnOver.Services
                                 btime = reportsItem.DataStartTime,
                                 etime = reportsItem.DataEndTime,
                                 site_code = item.MarketPlaceObj.multiMwsMid,
+                                account= item.Account
 
                             };
                             reportsDb.id = MyMySqlConnection._connection.QueryFirstOrDefault<int?>(" select id from dc_base_amazon_fee_report_log where report_id=@report_id ", new
@@ -220,6 +225,13 @@ namespace AutoTurnOver.Services
                             {
                                 MyMySqlConnection._connection.Insert(reportsDb);
                             }
+                            else
+                            {
+                                MyMySqlConnection._connection.Execute(" update dc_base_amazon_fee_report_log set account=@account where id=@id  ",new {
+                                    id = reportsDb.id,
+                                    account = reportsDb.account
+                                });
+                            }
 
                         }
 
@@ -582,10 +594,10 @@ namespace AutoTurnOver.Services
         }
 
         //计算项目映射
-        public void SetProject(List<ProjectMapDto.data_list_dto> maps,dc_base_amazon_fee fee)
+        public void SetProject(List<ProjectMapDto.data_list_dto> maps, dc_base_amazon_fee fee)
         {
             // 账号
-           var thisMaps = maps.Where(s => s.account == "" || s.account.Equals(fee.account, StringComparison.OrdinalIgnoreCase)).ToList();
+            var thisMaps = maps.Where(s => s.account == "" || s.account.Equals(fee.account, StringComparison.OrdinalIgnoreCase)).ToList();
             if (thisMaps != null && thisMaps.Count >= 1)
             {
                 var firstData = thisMaps.OrderByDescending(s => s.account).OrderByDescending(s => s.site_en).OrderByDescending(s => s.platform_en).FirstOrDefault();
@@ -602,36 +614,36 @@ namespace AutoTurnOver.Services
         {
             switch (type_en)
             {
-                case "REVERSAL_REIMBURSEMENT": 
-                case "COMPENSATED_CLAWBACK": 
-                case "FREE_REPLACEMENT_REFUND_ITEMS": 
-                case "MISSING_FROM_INBOUND_CLAWBACK": 
-                case "WAREHOUSE_DAMAGE": 
+                case "REVERSAL_REIMBURSEMENT":
+                case "COMPENSATED_CLAWBACK":
+                case "FREE_REPLACEMENT_REFUND_ITEMS":
+                case "MISSING_FROM_INBOUND_CLAWBACK":
+                case "WAREHOUSE_DAMAGE":
                     return "Adjustment";
-                case "Successful charge": 
+                case "Successful charge":
                     return "Debt";
-                case "FBA Inventory Fee": 
-                case "RemovalComplete": 
+                case "FBA Inventory Fee":
+                case "RemovalComplete":
                     return "FBA仓储费";
-                case "order": 
+                case "order":
                     return "订单";
-                case "Transfer": 
+                case "Transfer":
                     return "放款";
-                case "Service Fee": 
+                case "Service Fee":
                     return "服务费用";
-                case "Deal Fee": 
+                case "Deal Fee":
                     return "交易费用";
-                case "CouponRedemptionFee": 
+                case "CouponRedemptionFee":
                     return "空--换券费";
-                case "Previous Reserve Amount Balance": 
+                case "Previous Reserve Amount Balance":
                     return "期初余额";
-                case "refund": 
+                case "refund":
                     return "退款";
-                case "Current Reserve Amount": 
+                case "Current Reserve Amount":
                     return "预留金额";
-                case "Payable to Amazon": 
+                case "Payable to Amazon":
                     return "支付给亚马逊";
-                default:return type_en;
+                default: return type_en;
             }
         }
         public void AnaFbaShipmentReport()

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