|
|
@@ -522,6 +522,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
/// <param name="ExcelData"></param>
|
|
|
public string ImportTradePost(string ExcelPath)
|
|
|
{
|
|
|
+ int DoCount = 0;
|
|
|
string FullExcelPath = function.getPath(ExcelPath);
|
|
|
FullExcelPath = FullExcelPath.Replace("//", "/");
|
|
|
DataTable list = new PublicFunction().ExcelToDataTable(FullExcelPath);
|
|
|
@@ -589,8 +590,8 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
string OrderNo = DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
|
|
|
decimal TotalAmountNum = decimal.Parse(function.CheckNum(numberString: TotalAmount));
|
|
|
DateTime CreateDate = DateTime.Parse(OrderCreateTime);
|
|
|
-
|
|
|
- if(CreateDate < DateTime.Now.AddMonths(-3)) op = false;
|
|
|
+ DateTime CheckDate = DateTime.Now.AddMonths(-3);
|
|
|
+ if(DateTime.Parse(CreateDate.ToString("yyyy-MM") + "-01 00:00:00") >= DateTime.Parse(CheckDate.ToString("yyyy-MM") + "-01 00:00:00")) op = false;
|
|
|
if(OrderStatus == "待激活") op = false;
|
|
|
if(UserStatus == "已注销" || UserStatus.Contains("欠费"))
|
|
|
{
|
|
|
@@ -605,6 +606,16 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
}
|
|
|
db.SaveChanges();
|
|
|
}
|
|
|
+ PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == SimNo);
|
|
|
+ if(pos != null)
|
|
|
+ {
|
|
|
+ pos.Status = -1;
|
|
|
+ if(UserStatus.Contains("欠费"))
|
|
|
+ {
|
|
|
+ pos.Status = -2;
|
|
|
+ }
|
|
|
+ db.SaveChanges();
|
|
|
+ }
|
|
|
}
|
|
|
if(UserStatus == "正常")
|
|
|
{
|
|
|
@@ -615,7 +626,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
db.SaveChanges();
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if(TotalAmountNum > 0 && op)
|
|
|
{
|
|
|
spdb.TradeRecord.Add(new SpModels.TradeRecord()
|
|
|
@@ -641,10 +652,12 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
});
|
|
|
|
|
|
spdb.SaveChanges();
|
|
|
+
|
|
|
+ DoCount += 1;
|
|
|
}
|
|
|
}
|
|
|
AddSysLog("0", "TradeRecord", "Import");
|
|
|
- return "success";
|
|
|
+ return "success|" + DoCount;
|
|
|
}
|
|
|
#endregion
|
|
|
|