fix

AutoTurnOver.Services/AmazonDataSynchroService.cs

@@ -224,7 +224,7 @@ namespace AutoTurnOver.Services
         {
             // 拉取亚马逊账号
             var amazonAccounts = ApiServices.GetAmazonAccountList();
-            //amazonAccounts = amazonAccounts.Where(s => s.Account == "Ninezkeji" && s.SiteEn=="UK").ToList();
+            //amazonAccounts = amazonAccounts.Where(s => s.Account == "Natural Daisy Encens" && s.SiteEn=="UK").ToList();
             foreach (var item in amazonAccounts)
             {
                 try
@@ -273,6 +273,7 @@ namespace AutoTurnOver.Services
                                 start_date  = feeItem.FinancialEventGroupStart == null ? new DateTime(1991, 1, 1) : feeItem.FinancialEventGroupStart.Value,
                                 AmazonOrderId = feeItem.FinancialEventGroupId,
                                 SellerOrderId = feeItem.TraceId,
+                                _ts = DateTime.Now,
                                 settlement_id="-",
                                 description = $"To account ending in: {feeItem.AccountTail}",
                                 type = "Transfer", // 提现
@@ -574,7 +575,7 @@ namespace AutoTurnOver.Services
                     var marketplaceNameSys = marketplaceName;
                     if (string.IsNullOrWhiteSpace(marketplaceNameSys))
                     {
-                        ComputeMarketplaceNameByCurrency(settlementData.AmazonEnvelope.Message.SettlementReport.SettlementData.TotalAmount.Currency);
+                        marketplaceNameSys = ComputeMarketplaceNameByCurrency(settlementData.AmazonEnvelope.Message.SettlementReport.SettlementData.TotalAmount.Currency);
                     }
 
                     foreach (var otherTransactionItem in settlementData.AmazonEnvelope.Message.SettlementReport.OtherTransaction)
@@ -1291,6 +1292,46 @@ namespace AutoTurnOver.Services
 
             return assumeRoleResponse;
         }
+
+        /// <summary>
+        /// 通过精准的时分秒的结算时间，寻找结算id
+        /// </summary>
+        public static void SetSettlementByDate()
+        {
+            var datas = MyMySqlConnection._connection.Query<dc_base_amazon_fee>(" select * from dc_base_amazon_fee where settlement_id='-' order by id desc limit 100 ").ToList();
+            foreach (var item in datas)
+            {
+                //查询同账号下，相同时间节点的费用
+                var feeSingleData = MyMySqlConnection._connection.QueryFirstOrDefault<dc_base_amazon_fee>(" select * from dc_base_amazon_fee where settlement_date_str=@settlement_date_str and account=@account and settlement_id!='-' limit 1  ", new {
+                    settlement_date_str= item.settlement_date_str,
+                    account = item.account
+                });
+                if (feeSingleData != null)
+                {
+                    item.settlement_id = feeSingleData.settlement_id;
+                    MyMySqlConnection._connection.Execute(" update dc_base_amazon_fee set settlement_id=@settlement_id where id=@id ",new {
+                        settlement_id = item.settlement_id,
+                        id = item.id
+                    });
+                }
+            }
+
+        }
+
+        /// <summary>
+        /// 计算站点 （目前只有欧洲站点有这个情况）
+        /// </summary>
+        public static void SetMarketplaceName()
+        {
+            // 查询没有找到站点的结算表
+             var datas = MyMySqlConnection._connection.Query<dc_base_amazon_fee>(" select * from dc_base_amazon_settlement where marketplace_name_sys='' order by id desc limit 100 ").ToList();
+            foreach (var item in collection)
+            {
+
+            }
+        }
+
+
     }