|
@@ -110,7 +110,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
Dictionary<string, object> Obj = InfoDo(value);
|
|
|
return Json(new AppResultJson() { Status = "1", Info = "", Data = Obj });
|
|
|
}
|
|
|
- private Dictionary<string, object> InfoDo(string value)
|
|
|
+ public Dictionary<string, object> InfoDo(string value)
|
|
|
{
|
|
|
JsonData data = JsonMapper.ToObject(value);
|
|
|
int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString())); //商户Id
|
|
@@ -121,9 +121,9 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
var query = new MerchantDepositOrderService().QueryByMerchantId(MerchantId);
|
|
|
if (query.Id > 0)
|
|
|
{
|
|
|
- CreateDate = DateTime.Parse(query.CreateDate.ToString()).Year + "年" + DateTime.Parse(query.CreateDate.ToString()).Month + "月" + DateTime.Parse(query.CreateDate.ToString()).Day + "日";
|
|
|
- StartDate = DateTime.Parse(query.CreateDate.ToString()).AddMonths(1).Year + "年" + DateTime.Parse(query.CreateDate.ToString()).AddMonths(1).Month + "月";
|
|
|
- EndDate = DateTime.Parse(query.CreateDate.ToString()).AddMonths(11).Year + "年" + DateTime.Parse(query.CreateDate.ToString()).AddMonths(11).Month + "月";
|
|
|
+ CreateDate = DateTime.Parse(query.UpdateDate.ToString()).Year + "年" + DateTime.Parse(query.UpdateDate.ToString()).Month + "月" + DateTime.Parse(query.UpdateDate.ToString()).Day + "日";
|
|
|
+ StartDate = DateTime.Parse(query.UpdateDate.ToString()).AddMonths(1).Year + "年" + DateTime.Parse(query.UpdateDate.ToString()).AddMonths(1).Month + "月";
|
|
|
+ EndDate = DateTime.Parse(query.UpdateDate.ToString()).AddMonths(11).Year + "年" + DateTime.Parse(query.UpdateDate.ToString()).AddMonths(11).Month + "月";
|
|
|
}
|
|
|
Obj.Add("CreateDate", CreateDate); //参与时间
|
|
|
Obj.Add("StartDate", StartDate); //考核开始时间
|