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
a5c7bfbd
Commit
a5c7bfbd
authored
Mar 08, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
0836e93e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
7 deletions
+13
-7
AppletTradeController.cs
...WebApi/Controllers/TradePavilion/AppletTradeController.cs
+13
-7
No files found.
Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs
View file @
a5c7bfbd
...
@@ -325,6 +325,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -325,6 +325,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// 获取商会活动类型列表
/// 获取商会活动类型列表
/// </summary>
/// </summary>
/// <returns></returns>
/// <returns></returns>
[
AllowAnonymous
]
public
ApiResult
GetCommerceActivityTypeList
()
public
ApiResult
GetCommerceActivityTypeList
()
{
{
var
query
=
new
RB_Commerce_ActivityType_Extend
();
var
query
=
new
RB_Commerce_ActivityType_Extend
();
...
@@ -339,6 +340,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -339,6 +340,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// 获取商会活动分页列表
/// 获取商会活动分页列表
/// </summary>
/// </summary>
/// <returns></returns>
/// <returns></returns>
[
AllowAnonymous
]
public
ApiResult
GetCommerceActivityPage
()
public
ApiResult
GetCommerceActivityPage
()
{
{
ResultPageModel
pageModel
=
JsonConvert
.
DeserializeObject
<
ResultPageModel
>(
RequestParm
.
msg
.
ToString
());
ResultPageModel
pageModel
=
JsonConvert
.
DeserializeObject
<
ResultPageModel
>(
RequestParm
.
msg
.
ToString
());
...
@@ -361,6 +363,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -361,6 +363,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// 获取商会活动详情
/// 获取商会活动详情
/// </summary>
/// </summary>
/// <returns></returns>
/// <returns></returns>
[
AllowAnonymous
]
public
ApiResult
GetCommerceActivity
()
public
ApiResult
GetCommerceActivity
()
{
{
JObject
parms
=
JObject
.
Parse
(
RequestParm
.
msg
.
ToString
());
JObject
parms
=
JObject
.
Parse
(
RequestParm
.
msg
.
ToString
());
...
@@ -370,14 +373,17 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -370,14 +373,17 @@ namespace Mall.WebApi.Controllers.TradePavilion
if
(
extModel
!=
null
&&
extModel
.
CreateBy
>
0
)
if
(
extModel
!=
null
&&
extModel
.
CreateBy
>
0
)
{
{
extModel
.
CreateByName
=
UserReidsCache
.
GetUserLoginInfo
(
extModel
.
CreateBy
)?.
Name
??
""
;
extModel
.
CreateByName
=
UserReidsCache
.
GetUserLoginInfo
(
extModel
.
CreateBy
)?.
Name
??
""
;
var
list
=
consultModule
.
GetCommerceConsultListModule
(
new
RB_Commerce_Consult_Extend
()
{
ActivityId
=
Id
,
UserId
=
userInfo
.
UserId
});
if
(
userInfo
!=
null
&&
userInfo
.
UserId
>
0
)
if
(
list
!=
null
&&
list
.
Count
>
0
)
{
{
extModel
.
IsJoinActivity
=
1
;
var
list
=
consultModule
.
GetCommerceConsultListModule
(
new
RB_Commerce_Consult_Extend
()
{
ActivityId
=
Id
,
UserId
=
userInfo
.
UserId
});
}
if
(
list
!=
null
&&
list
.
Count
>
0
)
else
{
{
extModel
.
IsJoinActivity
=
1
;
extModel
.
IsJoinActivity
=
0
;
}
else
{
extModel
.
IsJoinActivity
=
0
;
}
}
}
}
}
return
ApiResult
.
Success
(
data
:
extModel
);
return
ApiResult
.
Success
(
data
:
extModel
);
...
...
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