|
@@ -278,7 +278,7 @@ namespace MySystem
|
|
|
{
|
|
|
// 要下载的文件路径
|
|
|
string filePath = "/haoda-trade/" + Date + ".csv";
|
|
|
- function.WriteLog(DateTime.Now.ToString() + ":" + filePath, "获取好哒FTP文件数据异常");
|
|
|
+ function.WriteLog(DateTime.Now.ToString() + ":" + filePath, "获取好哒FTP文件交易数据");
|
|
|
|
|
|
try
|
|
|
{
|
|
@@ -295,7 +295,7 @@ namespace MySystem
|
|
|
StreamReader reader = new StreamReader(responseStream);
|
|
|
// 读取数据
|
|
|
string fileContents = reader.ReadToEnd();
|
|
|
- function.WriteLog("fileContents:" + fileContents, "获取好哒FTP文件数据异常");
|
|
|
+ function.WriteLog("fileContents:" + fileContents, "获取好哒FTP文件交易数据");
|
|
|
if (!string.IsNullOrEmpty(fileContents))
|
|
|
{
|
|
|
MpMainModels2.WebCMSEntities db = new MpMainModels2.WebCMSEntities();
|
|
@@ -329,8 +329,8 @@ 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);
|
|
|
|
|
|
- function.WriteLog("OrderNo:" + OrderNo, "获取好哒FTP文件数据异常");
|
|
|
- function.WriteLog("MerchantNo:" + MerchantNo, "获取好哒FTP文件数据异常");
|
|
|
+ function.WriteLog("OrderNo:" + OrderNo, "获取好哒FTP文件交易数据");
|
|
|
+ function.WriteLog("MerchantNo:" + MerchantNo, "获取好哒FTP文件交易数据");
|
|
|
|
|
|
var PayMode = 0;
|
|
|
if (PayWay.Contains("支付宝")) PayMode = 1;
|
|
@@ -339,7 +339,7 @@ namespace MySystem
|
|
|
var merchantAddInfo = db.MerchantAddInfo.FirstOrDefault(m => m.MchtNo == MerchantNo) ?? new MpMainModels2.MerchantAddInfo();
|
|
|
if (merchantAddInfo.Id > 0)
|
|
|
{
|
|
|
- function.WriteLog("找到商户", "获取好哒FTP文件数据异常");
|
|
|
+ function.WriteLog("找到商户", "获取好哒FTP文件交易数据");
|
|
|
var merchantInfo = db.MerchantInfo.FirstOrDefault(m => m.Id == merchantAddInfo.Id) ?? new MpMainModels2.MerchantInfo();
|
|
|
if(merchantInfo.IsAct == 0)
|
|
|
{
|
|
@@ -348,7 +348,7 @@ namespace MySystem
|
|
|
var orders = db.ConsumerOrders.FirstOrDefault(m => m.SeoTitle == OrderNo && OrderNo == OrderNo) ?? new MpMainModels2.ConsumerOrders();
|
|
|
if (orders.Id == 0)
|
|
|
{
|
|
|
- function.WriteLog("订单号不存在,开始入库", "获取好哒FTP文件数据异常");
|
|
|
+ function.WriteLog("订单号不存在,开始入库", "获取好哒FTP文件交易数据");
|
|
|
var query = db.ConsumerOrders.Add(new MpMainModels2.ConsumerOrders()
|
|
|
{
|
|
|
Status = 1,
|
|
@@ -363,7 +363,7 @@ namespace MySystem
|
|
|
UserId = merchantInfo.UserId
|
|
|
}).Entity;
|
|
|
db.SaveChanges();
|
|
|
- function.WriteLog("入库完毕", "获取好哒FTP文件数据异常");
|
|
|
+ function.WriteLog("入库完毕", "获取好哒FTP文件交易数据");
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -379,7 +379,7 @@ namespace MySystem
|
|
|
}
|
|
|
catch (WebException ex)
|
|
|
{
|
|
|
- function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "获取好哒FTP文件数据异常");
|
|
|
+ function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "获取好哒FTP文件交易数据异常");
|
|
|
}
|
|
|
}
|
|
|
|