|
@@ -56,8 +56,6 @@ namespace MySystem
|
|
|
GetDepositData();
|
|
|
Thread.Sleep(60000);
|
|
|
SaveTradeData(DateTime.Now.AddDays(-1).ToString("yyyyMMdd"));
|
|
|
- Thread.Sleep(2000);
|
|
|
- GetTradeData();
|
|
|
}
|
|
|
}
|
|
|
Thread.Sleep(7200000);
|
|
@@ -86,8 +84,6 @@ namespace MySystem
|
|
|
GetDepositData();
|
|
|
}
|
|
|
SaveTradeData(DateTime.Now.ToString("yyyyMMdd"));
|
|
|
- Thread.Sleep(2000);
|
|
|
- GetTradeData();
|
|
|
Thread.Sleep(1800000);
|
|
|
}
|
|
|
}
|
|
@@ -371,8 +367,6 @@ namespace MySystem
|
|
|
{
|
|
|
function.WritePage("/GetFTPTradeYesterday/", "check" + DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd") + ".txt", DateTime.Now.ToString());
|
|
|
SaveTradeData(DateTime.Now.AddDays(-1).ToString("yyyyMMdd"));
|
|
|
- Thread.Sleep(2000);
|
|
|
- GetTradeData();
|
|
|
Thread.Sleep(600000);
|
|
|
}
|
|
|
}
|
|
@@ -401,8 +395,6 @@ namespace MySystem
|
|
|
{
|
|
|
SaveTradeData(content);
|
|
|
Thread.Sleep(2000);
|
|
|
- GetTradeData();
|
|
|
- Thread.Sleep(2000);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -508,13 +500,30 @@ namespace MySystem
|
|
|
}
|
|
|
|
|
|
|
|
|
+ public void StartGetTradeData()
|
|
|
+ {
|
|
|
+ //每天凌晨执行获取好哒FTP昨日交易数据
|
|
|
+ Thread th2 = new Thread(ListenGetTradeData);
|
|
|
+ th2.IsBackground = true;
|
|
|
+ th2.Start();
|
|
|
+ }
|
|
|
+ /// <summary>
|
|
|
+ /// 获取好哒FTP昨日交易数据
|
|
|
+ /// </summary>
|
|
|
+ public void ListenGetTradeData()
|
|
|
+ {
|
|
|
+ while (true)
|
|
|
+ {
|
|
|
+ GetTradeData();
|
|
|
+ Thread.Sleep(2000);
|
|
|
+ }
|
|
|
+ }
|
|
|
public void GetTradeData()
|
|
|
- {
|
|
|
+ {
|
|
|
try
|
|
|
{
|
|
|
MpMainModels2.WebCMSEntities db = new MpMainModels2.WebCMSEntities();
|
|
|
- List<string> orderNos = db.ConsumerOrders.Select(m => m.OrderNo).ToList();
|
|
|
- List<MpMainModels2.HdOrderTmp> orders = db.HdOrderTmp.Where(m => !orderNos.Contains(m.OrderNo)).ToList();
|
|
|
+ List<MpMainModels2.HdOrderTmp> orders = db.HdOrderTmp.Where(m => m.Status == 0).Take(200).ToList();
|
|
|
if(orders.Count > 1)
|
|
|
{
|
|
|
foreach (var order in orders)
|
|
@@ -567,6 +576,11 @@ namespace MySystem
|
|
|
Sort = (int)FeeRate,
|
|
|
TradePayNo = MerchantNo,
|
|
|
}).Entity;
|
|
|
+ MpMainModels2.HdOrderTmp edit = db.HdOrderTmp.FirstOrDefault(m => m.OrderNo == OrderNo);
|
|
|
+ if(edit != null)
|
|
|
+ {
|
|
|
+ edit.Status = 1;
|
|
|
+ }
|
|
|
db.SaveChanges();
|
|
|
function.WriteLog("入库完毕", "获取好哒FTP文件交易数据");
|
|
|
|
|
@@ -589,10 +603,18 @@ namespace MySystem
|
|
|
|
|
|
}
|
|
|
}
|
|
|
+ else
|
|
|
+ {
|
|
|
+ MpMainModels2.HdOrderTmp edit = db.HdOrderTmp.FirstOrDefault(m => m.OrderNo == OrderNo);
|
|
|
+ if(edit != null)
|
|
|
+ {
|
|
|
+ edit.Status = -1;
|
|
|
+ }
|
|
|
+ db.SaveChanges();
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
db.Dispose();
|
|
|
- function.WriteLog("结束\n\n\n", "获取好哒FTP文件数据异常");
|
|
|
}
|
|
|
catch (WebException ex)
|
|
|
{
|