|
@@ -467,7 +467,7 @@ namespace MySystem
|
|
string content = RedisDbconn.Instance.RPop<string>("ListenTradeDataQueue");
|
|
string content = RedisDbconn.Instance.RPop<string>("ListenTradeDataQueue");
|
|
if (!string.IsNullOrEmpty(content))
|
|
if (!string.IsNullOrEmpty(content))
|
|
{
|
|
{
|
|
- GetTradeData(content);
|
|
|
|
|
|
+ GetTradeData(content, true);
|
|
Thread.Sleep(2000);
|
|
Thread.Sleep(2000);
|
|
}
|
|
}
|
|
else
|
|
else
|
|
@@ -476,7 +476,7 @@ namespace MySystem
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- public void GetTradeData(string Date)
|
|
|
|
|
|
+ public void GetTradeData(string Date, bool IsAll = false)
|
|
{
|
|
{
|
|
// 要下载的文件路径
|
|
// 要下载的文件路径
|
|
string filePath = "/haoda-trade/" + Date + ".csv";
|
|
string filePath = "/haoda-trade/" + Date + ".csv";
|
|
@@ -531,7 +531,7 @@ namespace MySystem
|
|
|
|
|
|
TradeDate = TradeDate.Substring(0, 4) + "-" + TradeDate.Substring(4, 2) + "-" + TradeDate.Substring(6, 2) + " " + TradeDate.Substring(8, 2) + ":" + TradeDate.Substring(10, 2) + ":" + TradeDate.Substring(12, 2);
|
|
TradeDate = TradeDate.Substring(0, 4) + "-" + TradeDate.Substring(4, 2) + "-" + TradeDate.Substring(6, 2) + " " + TradeDate.Substring(8, 2) + ":" + TradeDate.Substring(10, 2) + ":" + TradeDate.Substring(12, 2);
|
|
|
|
|
|
- if(DateTime.Parse(TradeDate) > DateTime.Parse(DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd") + " 00:00:00"))
|
|
|
|
|
|
+ if(DateTime.Parse(TradeDate) > DateTime.Parse(DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd") + " 00:00:00") || IsAll)
|
|
{
|
|
{
|
|
function.WriteLog("OrderNo:" + OrderNo, "获取好哒FTP文件交易数据");
|
|
function.WriteLog("OrderNo:" + OrderNo, "获取好哒FTP文件交易数据");
|
|
function.WriteLog("MerchantNo:" + MerchantNo, "获取好哒FTP文件交易数据");
|
|
function.WriteLog("MerchantNo:" + MerchantNo, "获取好哒FTP文件交易数据");
|