|
|
@@ -236,7 +236,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
|
|
|
[Authorize]
|
|
|
public JsonResult Logout(string value)
|
|
|
{
|
|
|
- value = PublicFunction.DesDecrypt(value); ;
|
|
|
+ value = PublicFunction.DesDecrypt(value);
|
|
|
JsonData data = JsonMapper.ToObject(value);
|
|
|
AppResultJson result = LogoutDo(value);
|
|
|
return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
|
|
|
@@ -247,20 +247,21 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
|
|
|
Dictionary<string, object> Obj = new Dictionary<string, object>();
|
|
|
int Id = int.Parse(function.CheckInt(data["Id"].ToString()));
|
|
|
function.WriteLog(DateTime.Now.ToString(), "注销商户日志");
|
|
|
+ function.WriteLog(Id.ToString(), "注销商户日志");
|
|
|
MerchantInfo info = main2db.MerchantInfo.FirstOrDefault(m => m.Id == Id);
|
|
|
if(info != null)
|
|
|
{
|
|
|
- function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(info));
|
|
|
+ function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(info), "注销商户日志");
|
|
|
main2db.MerchantInfo.Remove(info);
|
|
|
}
|
|
|
MerchantAddInfo addInfo = main2db.MerchantAddInfo.FirstOrDefault(m => m.Id == Id);
|
|
|
if(addInfo != null)
|
|
|
{
|
|
|
- function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(addInfo));
|
|
|
+ function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(addInfo), "注销商户日志");
|
|
|
main2db.MerchantAddInfo.Remove(addInfo);
|
|
|
}
|
|
|
main2db.SaveChanges();
|
|
|
- function.WriteLog("\n\n", "注销商户日志");
|
|
|
+ function.WriteLog("end\n\n", "注销商户日志");
|
|
|
return new AppResultJson() { Status = "1", Info = "", Data = Obj };
|
|
|
}
|
|
|
#endregion
|