Skip to content

M
mall.oytour.com
Commit 72b93555 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 8627257f
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 32 deletions
Mall.WebApi/Controllers/Education/AppletEducationController.cs
View file @ 72b93555
......@@ -1731,7 +1731,8 @@ namespace Mall.WebApi.Controllers.Education
/// </summary>
/// <returns></returns>
[HttpPost]
[AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
[AllowAnonymous]
[RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
public ApiResult GetActivityPage()
{
var req = RequestParm;
......@@ -1858,7 +1859,8 @@ namespace Mall.WebApi.Controllers.Education
/// <param name="request"></param>
/// <returns></returns>
[HttpPost]
[AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
[AllowAnonymous]
[RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
public ApiResult GetActivityDetial()
{
var req = RequestParm;
......@@ -2380,7 +2382,8 @@ namespace Mall.WebApi.Controllers.Education
return ApiResult.Failed("未查询到您正在学习的课程，无法绑定信息");
}
}
else {
else
{
return ApiResult.Failed("类型错误");
}
......@@ -2474,15 +2477,12 @@ namespace Mall.WebApi.Controllers.Education
#region 甲小鹤活动
/// <summary>
/// 获取商会活动分页列表
/// </summary>
/// <returns></returns>
[HttpPost]
[AllowAnonymous]
[AllowAnonymous]
[RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
public ApiResult GetActivityPageJXH()
{
......@@ -2516,8 +2516,8 @@ namespace Mall.WebApi.Controllers.Education
};
}
catch
{
{
}
query.IsQueryCoverImage = "1";
query.SelectStartTimeStr = System.DateTime.Now.ToString("yyyy-MM-dd");
......@@ -2564,18 +2564,15 @@ namespace Mall.WebApi.Controllers.Education
return ApiResult.Success(data: pageModel);
}
/// <summary>
/// 获取商会活动分页列表
/// </summary>
/// <returns></returns>
[HttpPost]
[AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
[AllowAnonymous]
[RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
public ApiResult GetUserActivityListJXH()
{
// var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
var req = RequestParm;
var userInfo = AppletUserInfo;
if (userInfo == null)
......@@ -2595,9 +2592,6 @@ namespace Mall.WebApi.Controllers.Education
ActivityName = jObj.GetStringValue("ActivityName"),
ActivityType = jObj.GetInt("ActivityType", 0),
};
// query.SelectStartTimeStr = System.DateTime.Now.ToString("yyyy-MM-dd");
// query.SelectEndTimeStr = System.DateTime.Now.AddDays(60).ToString("yyyy-MM-dd");
// query.OrderByStr = "StartTime";
query.TenantId = userInfo.TenantId;
query.MallBaseId = userInfo.MallBaseId;
query.EduStudentId = userInfo.EduStudentId;
......@@ -2634,7 +2628,8 @@ namespace Mall.WebApi.Controllers.Education
/// <param name="request"></param>
/// <returns></returns>
[HttpPost]
[AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
[AllowAnonymous]
[RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
public ApiResult GetActivityDetialJXH()
{
var req = RequestParm;
......@@ -2656,8 +2651,8 @@ namespace Mall.WebApi.Controllers.Education
Id = parm.GetInt("Id");
}
catch
{
{
}
if (Id == 0)
{
......@@ -2695,7 +2690,6 @@ namespace Mall.WebApi.Controllers.Education
fileGroup.Add(new
{
Key = i,
// groupList = group.Where(x => x.Type == item.Key).ToList(),
groupList = fileObjectList
});
}
......@@ -2757,14 +2751,13 @@ namespace Mall.WebApi.Controllers.Education
}
}
/// <summary>
/// 取消报名
/// </summary>
/// <returns></returns>
[HttpPost]
[AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
[AllowAnonymous]
[RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
public ApiResult CancelCommerceConsultJXH()
{
bool flag = false;
......@@ -2832,19 +2825,20 @@ namespace Mall.WebApi.Controllers.Education
/// </summary>
/// <returns></returns>
[HttpPost]
[AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
[AllowAnonymous]
[RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
public ApiResult GetUserJoinActivityPageListJXH()
{
JObject jObj = JObject.Parse(RequestParm.msg.ToString());
ResultPageModel pageModel = new ResultPageModel()
{
pageSize= jObj.GetInt("pageSize"),
pageSize = jObj.GetInt("pageSize"),
pageIndex = jObj.GetInt("pageIndex"),
};
RB_Education_Consult_Extend dmodel = new RB_Education_Consult_Extend()
{
EnrollState = jObj.GetInt("EnrollState"),
LinkMan=jObj.GetStringValue("LinkMan"),
LinkMan = jObj.GetStringValue("LinkMan"),
};
var userInfo = AppletUserInfo;
if (userInfo == null)
......@@ -2928,7 +2922,8 @@ namespace Mall.WebApi.Controllers.Education
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetEduReceiptInfo() {
public ApiResult GetEduReceiptInfo()
{
var userInfo = base.AppletUserInfo;
JObject parms = JObject.Parse(base.RequestParm.msg.ToString());
int FinanceId = parms.GetInt("FinanceId", 0);
......@@ -2959,15 +2954,18 @@ namespace Mall.WebApi.Controllers.Education
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetEduReceiptClaim() {
public ApiResult SetEduReceiptClaim()
{
var userInfo = base.AppletUserInfo;
JObject parms = JObject.Parse(base.RequestParm.msg.ToString());
int ReceiptId = parms.GetInt("ReceiptId", 0);//收据ID
int ClaimCode = parms.GetInt("ClaimCode", 0);//认领码
if (ReceiptId <= 0) {
if (ReceiptId <= 0)
{
return ApiResult.ParamIsNull();
}
if (ClaimCode <= 0) {
if (ClaimCode <= 0)
{
return ApiResult.ParamIsNull();
}
......@@ -2976,7 +2974,8 @@ namespace Mall.WebApi.Controllers.Education
{
return ApiResult.Success();
}
else {
else
{
return ApiResult.Failed(msg);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment