fix

AutoTurnOver.Services/AmazonDataSynchroService.cs

@@ -232,7 +232,7 @@ namespace AutoTurnOver.Services
                     if (item.AmznSpDevAccountObj != null && item.AmznSpTokenObj != null)
                     {
 
-                        var task_name = $"SynchroAmazonFinancialEventGroups_v7_{item.Id}";
+                        var task_name = $"SynchroAmazonFinancialEventGroups_v9_{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 });
 
@@ -269,8 +269,8 @@ 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,
-                                start_date  = feeItem.FinancialEventGroupStart == null ? new DateTime(1991, 1, 1) : feeItem.FinancialEventGroupStart.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,
                                 _ts = DateTime.Now,
@@ -822,7 +822,7 @@ namespace AutoTurnOver.Services
             ApiAmazonSettlementDto.AmazonEnvelopeDto.MessageDto.SettlementReportDto.OrderDto xmlSettlementOrderData)
         {
             List<dc_base_amazon_fee> datas = new List<dc_base_amazon_fee> { };
-            var fbaFeeTypeList = new List<string> { "FBAPerOrderFulfillmentFee", "FBAPerUnitFulfillmentFee", "FBAWeightBasedFee" };
+            var fbaFeeTypeList = new List<string> { "FBAPerOrderFulfillmentFee", "FBAPerUnitFulfillmentFee", "FBAWeightBasedFee", "ShippingChargeback" };
             var sellingFeesList = new List<string> { "Commission", "RefundCommission" };
             foreach (var item in xmlSettlementOrderData.Fulfillment.Item)
             {
@@ -1323,11 +1323,28 @@ namespace AutoTurnOver.Services
         /// </summary>
         public static void SetMarketplaceName()
         {
+            var allSites = new List<string> { "Amazon.it", "Amazon.fr", "Amazon.nl", "Amazon.es", "Amazon.de" };
             // 查询没有找到站点的结算表
-             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)
+             var datas = MyMySqlConnection._connection.Query<dc_base_amazon_settlement>(" select * from dc_base_amazon_settlement where marketplace_name_sys='' and currency='EUR' order by id desc limit 100 ").ToList();
+            foreach (var item in datas)
             {
-
+                // 查询这个计算表差不多时间
+                var settlements = MyMySqlConnection._connection.Query<dc_base_amazon_settlement>(" select * from dc_base_amazon_settlement where start_date<=@etime and end_date>=@btime and account=@account ", new {
+                    btime = item.start_date.Value.AddDays(-1),
+                    etime = item.start_date.Value.AddDays(1),
+                    account = item.account
+                }).ToList().Where(s=>!string.IsNullOrWhiteSpace( s.marketplace_name_sys)).ToList();
+                // 把已经有站点的账单挑出去，在剩余站点中随便找一个
+                var useDatas = allSites.Where(s => !settlements.Any(s1 => s1.marketplace_name_sys == s)).ToList();
+                if (useDatas.Count >= 1)
+                {
+                    item.marketplace_name_sys = useDatas.FirstOrDefault();
+                    MyMySqlConnection._connection.Execute(" update dc_base_amazon_settlement set marketplace_name_sys=@marketplace_name_sys where id=@id ", new
+                    {
+                        marketplace_name_sys = item.marketplace_name_sys,
+                        id = item.id
+                    });
+                }
             }
         }