|
|
@@ -99,6 +99,11 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
dic["UserIdMakerCode"] = userid_Users.MakerCode;
|
|
|
dic.Remove("UserId");
|
|
|
|
|
|
+ //变动类别
|
|
|
+ int ChangeType = int.Parse(dic["Sort"].ToString());
|
|
|
+ if (ChangeType == 1) dic["ChangeType"] = "购买临额";
|
|
|
+ if (ChangeType == 3) dic["ChangeType"] = "调低临额";
|
|
|
+
|
|
|
//操作类别
|
|
|
int OperateType = int.Parse(dic["OperateType"].ToString());
|
|
|
if (OperateType == 0) dic["OperateType"] = "减少";
|
|
|
@@ -214,8 +219,6 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
if (Status == 2) dic["Status"] = "处理中";
|
|
|
if (Status == 1) dic["Status"] = "成功";
|
|
|
if (Status == -1) dic["Status"] = "失败";
|
|
|
- decimal UseAmount = Convert.ToDecimal(dic["UseAmount"].ToString());
|
|
|
- dic["UseAmount"] = UseAmount / 2;
|
|
|
}
|
|
|
return Json(obj);
|
|
|
}
|
|
|
@@ -269,8 +272,6 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
|
|
|
dic["UserIdRealName"] = userid_Users.RealName;
|
|
|
dic["UserIdMakerCode"] = userid_Users.MakerCode;
|
|
|
- decimal UseAmount = Convert.ToDecimal(dic["UseAmount"].ToString());
|
|
|
- dic["UseAmount"] = UseAmount / 2;
|
|
|
dic["CertId"] = userid_Users.CertId;
|
|
|
dic["SettleBankCardNo"] = userid_Users.SettleBankCardNo;
|
|
|
dic["SettleBankName"] = userid_Users.SettleBankName;
|
|
|
@@ -336,7 +337,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
JsonData dr = list[i];
|
|
|
string itemJson = dr.ToJson();
|
|
|
string Id = itemJson.Contains("\"A\"") ? dr["A"].ToString() : "";
|
|
|
- string IsOk = itemJson.Contains("\"J\"") ? dr["J"].ToString() : "";
|
|
|
+ string IsOk = itemJson.Contains("\"L\"") ? dr["L"].ToString() : "";
|
|
|
if (IdList.Contains(Convert.ToInt32(Id)))
|
|
|
{
|
|
|
error += "以下操作失败" + Id + ',' + "该记录重复" + '\n';
|