Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mall.oytour.com
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄奎
mall.oytour.com
Commits
72b93555
Commit
72b93555
authored
Apr 01, 2022
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
8627257f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
31 additions
and
32 deletions
+31
-32
AppletEducationController.cs
...WebApi/Controllers/Education/AppletEducationController.cs
+31
-32
No files found.
Mall.WebApi/Controllers/Education/AppletEducationController.cs
View file @
72b93555
...
@@ -1731,7 +1731,8 @@ namespace Mall.WebApi.Controllers.Education
...
@@ -1731,7 +1731,8 @@ namespace Mall.WebApi.Controllers.Education
/// </summary>
/// </summary>
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
public
ApiResult
GetActivityPage
()
public
ApiResult
GetActivityPage
()
{
{
var
req
=
RequestParm
;
var
req
=
RequestParm
;
...
@@ -1858,7 +1859,8 @@ namespace Mall.WebApi.Controllers.Education
...
@@ -1858,7 +1859,8 @@ namespace Mall.WebApi.Controllers.Education
/// <param name="request"></param>
/// <param name="request"></param>
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
public
ApiResult
GetActivityDetial
()
public
ApiResult
GetActivityDetial
()
{
{
var
req
=
RequestParm
;
var
req
=
RequestParm
;
...
@@ -2380,7 +2382,8 @@ namespace Mall.WebApi.Controllers.Education
...
@@ -2380,7 +2382,8 @@ namespace Mall.WebApi.Controllers.Education
return
ApiResult
.
Failed
(
"未查询到您正在学习的课程,无法绑定信息"
);
return
ApiResult
.
Failed
(
"未查询到您正在学习的课程,无法绑定信息"
);
}
}
}
}
else
{
else
{
return
ApiResult
.
Failed
(
"类型错误"
);
return
ApiResult
.
Failed
(
"类型错误"
);
}
}
...
@@ -2474,15 +2477,12 @@ namespace Mall.WebApi.Controllers.Education
...
@@ -2474,15 +2477,12 @@ namespace Mall.WebApi.Controllers.Education
#
region
甲小鹤活动
#
region
甲小鹤活动
/// <summary>
/// <summary>
/// 获取商会活动分页列表
/// 获取商会活动分页列表
/// </summary>
/// </summary>
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
public
ApiResult
GetActivityPageJXH
()
public
ApiResult
GetActivityPageJXH
()
{
{
...
@@ -2516,8 +2516,8 @@ namespace Mall.WebApi.Controllers.Education
...
@@ -2516,8 +2516,8 @@ namespace Mall.WebApi.Controllers.Education
};
};
}
}
catch
catch
{
{
}
}
query
.
IsQueryCoverImage
=
"1"
;
query
.
IsQueryCoverImage
=
"1"
;
query
.
SelectStartTimeStr
=
System
.
DateTime
.
Now
.
ToString
(
"yyyy-MM-dd"
);
query
.
SelectStartTimeStr
=
System
.
DateTime
.
Now
.
ToString
(
"yyyy-MM-dd"
);
...
@@ -2564,18 +2564,15 @@ namespace Mall.WebApi.Controllers.Education
...
@@ -2564,18 +2564,15 @@ namespace Mall.WebApi.Controllers.Education
return
ApiResult
.
Success
(
data
:
pageModel
);
return
ApiResult
.
Success
(
data
:
pageModel
);
}
}
/// <summary>
/// <summary>
/// 获取商会活动分页列表
/// 获取商会活动分页列表
/// </summary>
/// </summary>
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
public
ApiResult
GetUserActivityListJXH
()
public
ApiResult
GetUserActivityListJXH
()
{
{
// var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
var
req
=
RequestParm
;
var
req
=
RequestParm
;
var
userInfo
=
AppletUserInfo
;
var
userInfo
=
AppletUserInfo
;
if
(
userInfo
==
null
)
if
(
userInfo
==
null
)
...
@@ -2595,9 +2592,6 @@ namespace Mall.WebApi.Controllers.Education
...
@@ -2595,9 +2592,6 @@ namespace Mall.WebApi.Controllers.Education
ActivityName
=
jObj
.
GetStringValue
(
"ActivityName"
),
ActivityName
=
jObj
.
GetStringValue
(
"ActivityName"
),
ActivityType
=
jObj
.
GetInt
(
"ActivityType"
,
0
),
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
.
TenantId
=
userInfo
.
TenantId
;
query
.
MallBaseId
=
userInfo
.
MallBaseId
;
query
.
MallBaseId
=
userInfo
.
MallBaseId
;
query
.
EduStudentId
=
userInfo
.
EduStudentId
;
query
.
EduStudentId
=
userInfo
.
EduStudentId
;
...
@@ -2634,7 +2628,8 @@ namespace Mall.WebApi.Controllers.Education
...
@@ -2634,7 +2628,8 @@ namespace Mall.WebApi.Controllers.Education
/// <param name="request"></param>
/// <param name="request"></param>
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
public
ApiResult
GetActivityDetialJXH
()
public
ApiResult
GetActivityDetialJXH
()
{
{
var
req
=
RequestParm
;
var
req
=
RequestParm
;
...
@@ -2656,8 +2651,8 @@ namespace Mall.WebApi.Controllers.Education
...
@@ -2656,8 +2651,8 @@ namespace Mall.WebApi.Controllers.Education
Id
=
parm
.
GetInt
(
"Id"
);
Id
=
parm
.
GetInt
(
"Id"
);
}
}
catch
catch
{
{
}
}
if
(
Id
==
0
)
if
(
Id
==
0
)
{
{
...
@@ -2695,7 +2690,6 @@ namespace Mall.WebApi.Controllers.Education
...
@@ -2695,7 +2690,6 @@ namespace Mall.WebApi.Controllers.Education
fileGroup
.
Add
(
new
fileGroup
.
Add
(
new
{
{
Key
=
i
,
Key
=
i
,
// groupList = group.Where(x => x.Type == item.Key).ToList(),
groupList
=
fileObjectList
groupList
=
fileObjectList
});
});
}
}
...
@@ -2757,14 +2751,13 @@ namespace Mall.WebApi.Controllers.Education
...
@@ -2757,14 +2751,13 @@ namespace Mall.WebApi.Controllers.Education
}
}
}
}
/// <summary>
/// <summary>
/// 取消报名
/// 取消报名
/// </summary>
/// </summary>
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
public
ApiResult
CancelCommerceConsultJXH
()
public
ApiResult
CancelCommerceConsultJXH
()
{
{
bool
flag
=
false
;
bool
flag
=
false
;
...
@@ -2832,19 +2825,20 @@ namespace Mall.WebApi.Controllers.Education
...
@@ -2832,19 +2825,20 @@ namespace Mall.WebApi.Controllers.Education
/// </summary>
/// </summary>
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
public
ApiResult
GetUserJoinActivityPageListJXH
()
public
ApiResult
GetUserJoinActivityPageListJXH
()
{
{
JObject
jObj
=
JObject
.
Parse
(
RequestParm
.
msg
.
ToString
());
JObject
jObj
=
JObject
.
Parse
(
RequestParm
.
msg
.
ToString
());
ResultPageModel
pageModel
=
new
ResultPageModel
()
ResultPageModel
pageModel
=
new
ResultPageModel
()
{
{
pageSize
=
jObj
.
GetInt
(
"pageSize"
),
pageSize
=
jObj
.
GetInt
(
"pageSize"
),
pageIndex
=
jObj
.
GetInt
(
"pageIndex"
),
pageIndex
=
jObj
.
GetInt
(
"pageIndex"
),
};
};
RB_Education_Consult_Extend
dmodel
=
new
RB_Education_Consult_Extend
()
RB_Education_Consult_Extend
dmodel
=
new
RB_Education_Consult_Extend
()
{
{
EnrollState
=
jObj
.
GetInt
(
"EnrollState"
),
EnrollState
=
jObj
.
GetInt
(
"EnrollState"
),
LinkMan
=
jObj
.
GetStringValue
(
"LinkMan"
),
LinkMan
=
jObj
.
GetStringValue
(
"LinkMan"
),
};
};
var
userInfo
=
AppletUserInfo
;
var
userInfo
=
AppletUserInfo
;
if
(
userInfo
==
null
)
if
(
userInfo
==
null
)
...
@@ -2928,7 +2922,8 @@ namespace Mall.WebApi.Controllers.Education
...
@@ -2928,7 +2922,8 @@ namespace Mall.WebApi.Controllers.Education
/// </summary>
/// </summary>
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
public
ApiResult
GetEduReceiptInfo
()
{
public
ApiResult
GetEduReceiptInfo
()
{
var
userInfo
=
base
.
AppletUserInfo
;
var
userInfo
=
base
.
AppletUserInfo
;
JObject
parms
=
JObject
.
Parse
(
base
.
RequestParm
.
msg
.
ToString
());
JObject
parms
=
JObject
.
Parse
(
base
.
RequestParm
.
msg
.
ToString
());
int
FinanceId
=
parms
.
GetInt
(
"FinanceId"
,
0
);
int
FinanceId
=
parms
.
GetInt
(
"FinanceId"
,
0
);
...
@@ -2959,15 +2954,18 @@ namespace Mall.WebApi.Controllers.Education
...
@@ -2959,15 +2954,18 @@ namespace Mall.WebApi.Controllers.Education
/// </summary>
/// </summary>
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
public
ApiResult
SetEduReceiptClaim
()
{
public
ApiResult
SetEduReceiptClaim
()
{
var
userInfo
=
base
.
AppletUserInfo
;
var
userInfo
=
base
.
AppletUserInfo
;
JObject
parms
=
JObject
.
Parse
(
base
.
RequestParm
.
msg
.
ToString
());
JObject
parms
=
JObject
.
Parse
(
base
.
RequestParm
.
msg
.
ToString
());
int
ReceiptId
=
parms
.
GetInt
(
"ReceiptId"
,
0
);
//收据ID
int
ReceiptId
=
parms
.
GetInt
(
"ReceiptId"
,
0
);
//收据ID
int
ClaimCode
=
parms
.
GetInt
(
"ClaimCode"
,
0
);
//认领码
int
ClaimCode
=
parms
.
GetInt
(
"ClaimCode"
,
0
);
//认领码
if
(
ReceiptId
<=
0
)
{
if
(
ReceiptId
<=
0
)
{
return
ApiResult
.
ParamIsNull
();
return
ApiResult
.
ParamIsNull
();
}
}
if
(
ClaimCode
<=
0
)
{
if
(
ClaimCode
<=
0
)
{
return
ApiResult
.
ParamIsNull
();
return
ApiResult
.
ParamIsNull
();
}
}
...
@@ -2976,7 +2974,8 @@ namespace Mall.WebApi.Controllers.Education
...
@@ -2976,7 +2974,8 @@ namespace Mall.WebApi.Controllers.Education
{
{
return
ApiResult
.
Success
();
return
ApiResult
.
Success
();
}
}
else
{
else
{
return
ApiResult
.
Failed
(
msg
);
return
ApiResult
.
Failed
(
msg
);
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment