|
|
@@ -1099,7 +1099,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
if (openreward.Id > 0)
|
|
|
{
|
|
|
Users user = db.Users.FirstOrDefault(m => m.Id == openreward.UserId) ?? new Users();
|
|
|
- OpenUser20 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "发放时间：" + openreward.CreateDate.Value.ToString("yyyy-MM-dd hh:mm:ss");
|
|
|
+ OpenUser20 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "发放时间：" + openreward.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
|
|
}
|
|
|
openreward = OpenRewardDetail.FirstOrDefault(m => m.CreditRewardAmount == 10) ?? new OpenRewardDetail();
|
|
|
if (openreward.Id > 0)
|
|
|
@@ -2315,8 +2315,8 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- var stattime = pos.RecycStartDate == null ? "" : pos.RecycStartDate.Value.ToString("yyyy-MM-dd hh:mm:ss");
|
|
|
- var endtime = pos.RecycEndDate == null ? "" : pos.RecycEndDate.Value.ToString("yyyy-MM-dd hh:mm:ss");
|
|
|
+ var stattime = pos.RecycStartDate == null ? "" : pos.RecycStartDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
|
|
+ var endtime = pos.RecycEndDate == null ? "" : pos.RecycEndDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
|
|
result += "循环开始时间：" + stattime + "\n";
|
|
|
result += "循环结束时间：" + endtime + "\n";
|
|
|
result += "来源机具/券：" + pos.SourcePosSn + "\n";
|
|
|
@@ -4510,8 +4510,8 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
IsOk = "未达标";
|
|
|
}
|
|
|
result += IsOk + "\n";
|
|
|
- result += "开机时间：" + DateTime.Parse(pos.BindingTime.ToString()).ToString("yyyy-MM-dd hh:mm:sss") + "\n";
|
|
|
- result += "激活时间：" + DateTime.Parse(pos.ActivationTime.ToString()).ToString("yyyy-MM-dd hh:mm:sss") + "\n";
|
|
|
+ result += "开机时间：" + DateTime.Parse(pos.BindingTime.ToString()).ToString("yyyy-MM-dd HH:mm:ss") + "\n";
|
|
|
+ result += "激活时间：" + DateTime.Parse(pos.ActivationTime.ToString()).ToString("yyyy-MM-dd HH:mm:ss") + "\n";
|
|
|
result += "商户姓名：" + mer.MerRealName + "\n";
|
|
|
result += "明细：\n";
|
|
|
for (int i = 0; i < 12; i++)
|
DuGuYang