优化放款记录的结算id计算

AutoTurnOver.Services/AmazonDataSynchroService.cs

@@ -37,7 +37,7 @@ namespace AutoTurnOver.Services
         {
             // 拉取亚马逊账号
             var amazonAccounts = ApiServices.GetAmazonAccountList();
-            //amazonAccounts = amazonAccounts.Where(s => s.Account == "Siqidzi" && s.SiteEn=="DE").ToList();
+            amazonAccounts = amazonAccounts.Where(s => s.Account == "ouzyi" && s.SiteEn=="IT").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)
             {
@@ -1352,21 +1352,41 @@ namespace AutoTurnOver.Services
             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
+                var feeSingleDatas = MyMySqlConnection._connection.Query<dc_base_amazon_fee>(" select * from dc_base_amazon_fee where settlement_date_str=@settlement_date_str  and account=@account and settlement_id!='-' group by settlement_id  ", new
                 {
                     settlement_date_str = item.settlement_date_str,
                     account = item.account
-                });
-                if (feeSingleData != null)
+                }).ToList();
+                if (feeSingleDatas != null && feeSingleDatas.Count>0)
                 {
-                    item.settlement_id = feeSingleData.settlement_id;
-                    MyMySqlConnection._connection.Execute(" update dc_base_amazon_fee set settlement_id=@settlement_id,_ts=now() where id=@id ", new
+                    if(feeSingleDatas.Count == 1)
                     {
-                        settlement_id = item.settlement_id,
-                        id = item.id
-                    });
+                        item.settlement_id = feeSingleDatas[0].settlement_id;
+                        MyMySqlConnection._connection.Execute(" update dc_base_amazon_fee set settlement_id=@settlement_id,_ts=now() where id=@id ", new
+                        {
+                            settlement_id = item.settlement_id,
+                            id = item.id
+                        });
+                    }
+                    else
+                    {
+                        if (item.end_date != null)
+                        {
+                            var endDateStr = item.end_date.Value.ToString("yyyy-MM-ddTHH:mm:ss");
+                            var settlementFeeData = feeSingleDatas.FirstOrDefault(s => s.end_date != null && s.end_date.Value.ToString("yyyy-MM-ddTHH:mm:ss") == endDateStr);
+                            if (settlementFeeData != null)
+                            {
+                                item.settlement_id = settlementFeeData.settlement_id;
+                                MyMySqlConnection._connection.Execute(" update dc_base_amazon_fee set settlement_id=@settlement_id,_ts=now() where id=@id ", new
+                                {
+                                    settlement_id = item.settlement_id,
+                                    id = item.id
+                                });
+                            }
+                            
+                        }
+                    }
                 }
-                
             }
 
         }

ResetOutofstock/Program.cs

@@ -53,8 +53,8 @@ namespace ResetOutofstock
                 //dc_ana_deviation_dao.PushAnaTask();
                 //new AmazonDataSynchroService().SynchroFinancialEventGroups();
                 //new AmazonDataSynchroService().SetMarketplaceName(DateTime.Now);
-                new AmazonDataSynchroService().SetSettlementByDate();
-                new AmazonDataSynchroService().SetMarketplaceNameByDate();
+                //new AmazonDataSynchroService().SetSettlementByDate();
+                //new AmazonDataSynchroService().SetMarketplaceNameByDate();
                 //new AmazonDataSynchroService().SynchroReportIds();
 
                 //new AmazonDataSynchroService().SynchroReportIds(FikaAmazonAPI.Utils.Constants.ReportTypes.GET_V2_SETTLEMENT_REPORT_DATA_XML, 13, "Siqidzi","BE");