fix

AutoTurnOver.Models/dc_base_amazon_fee.cs

@@ -43,6 +43,7 @@ namespace AutoTurnOver.Models
         public DateTime date { get; set; }
         public string MarketplaceNameSys { get; set; }
         public string settlement_date_str { get; set; }
+        public string settlement_date_end_str { get; set; }
         public DateTime? start_date { get; set; }
         public DateTime? end_date { get; set; }
         public DateTime _ts { get; set; }

AutoTurnOver.Services/AmazonDataSynchroService.cs

@@ -97,6 +97,7 @@ namespace AutoTurnOver.Services
                             {
                                 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_end_str = $"{transferFee.end_date.Value.ToString("yyyy-MM-ddTHH:mm:ss")}";
                             }
                             else
                             {
@@ -549,6 +550,7 @@ namespace AutoTurnOver.Services
                         currency_code = settlementDbData.currency
                     };
                     netIncome.settlement_date_str = $"{netIncome.start_date.Value.ToString("yyyy-MM-ddTHH:mm:ss")}";
+                    netIncome.settlement_date_end_str = $"{netIncome.end_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;
@@ -564,6 +566,7 @@ namespace AutoTurnOver.Services
                             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.settlement_date_end_str = $"{feeItem.end_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)
@@ -1325,7 +1328,7 @@ 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 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
@@ -1339,6 +1342,31 @@ namespace AutoTurnOver.Services
                         id = item.id
                     });
                 }
+                else
+                {
+                    //自己的开始时间，是上一个报表的结束时间
+                    var feeSingleData2 = MyMySqlConnection._connection.QueryFirstOrDefault<dc_base_amazon_fee>(" select * from dc_base_amazon_fee where settlement_date_end_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)
+                    {
+                        var settlement_data = MyMySqlConnection._connection.QueryFirstOrDefault<dc_base_amazon_settlement>(" select * from dc_base_amazon_settlement where settlement_id=@settlement_id ",new { settlement_id = feeSingleData2.settlement_id});
+                        if (settlement_data != null)
+                        {
+                            item.MarketplaceName = settlement_data.marketplace_name;
+                            item.MarketplaceNameSys = settlement_data.marketplace_name_sys;
+                            MyMySqlConnection._connection.Execute(" update dc_base_amazon_fee set MarketplaceName=@MarketplaceName,MarketplaceNameSys=@MarketplaceNameSys,_ts=now() where id=@id ", new
+                            {
+                                MarketplaceName = item.MarketplaceName,
+                                MarketplaceNameSys = item.MarketplaceNameSys,
+                                id = item.id
+                            });
+                        }
+                        
+                    }
+                }
             }
 
         }