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
8bf1b121
Commit
8bf1b121
authored
Mar 16, 2021
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
相亲 不登录查看
parent
46a72eb7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
7 deletions
+2
-7
AppletMiaiController.cs
Mall.WebApi/Controllers/Miai/AppletMiaiController.cs
+2
-6
AppletTradeController.cs
...WebApi/Controllers/TradePavilion/AppletTradeController.cs
+0
-1
No files found.
Mall.WebApi/Controllers/Miai/AppletMiaiController.cs
View file @
8bf1b121
...
@@ -48,8 +48,6 @@ namespace Mall.WebApi.Controllers.MallBase
...
@@ -48,8 +48,6 @@ namespace Mall.WebApi.Controllers.MallBase
{
{
var
req
=
base
.
RequestParm
;
var
req
=
base
.
RequestParm
;
RB_Miai_Forum_Extend
demodel
=
JsonConvert
.
DeserializeObject
<
RB_Miai_Forum_Extend
>(
req
.
msg
.
ToString
());
RB_Miai_Forum_Extend
demodel
=
JsonConvert
.
DeserializeObject
<
RB_Miai_Forum_Extend
>(
req
.
msg
.
ToString
());
demodel
.
TenantId
=
req
.
TenantId
;
demodel
.
MallBaseId
=
req
.
MallBaseId
;
demodel
.
MallBaseId
=
req
.
MallBaseId
;
demodel
.
IsShow
=
1
;
demodel
.
IsShow
=
1
;
var
list
=
miaiModule
.
GetForumList
(
demodel
);
var
list
=
miaiModule
.
GetForumList
(
demodel
);
...
@@ -75,7 +73,6 @@ namespace Mall.WebApi.Controllers.MallBase
...
@@ -75,7 +73,6 @@ namespace Mall.WebApi.Controllers.MallBase
var
parms
=
RequestParm
;
var
parms
=
RequestParm
;
ResultPageModel
pagelist
=
JsonConvert
.
DeserializeObject
<
ResultPageModel
>(
parms
.
msg
.
ToString
());
ResultPageModel
pagelist
=
JsonConvert
.
DeserializeObject
<
ResultPageModel
>(
parms
.
msg
.
ToString
());
RB_Miai_Activity_Extend
demodel
=
JsonConvert
.
DeserializeObject
<
RB_Miai_Activity_Extend
>(
parms
.
msg
.
ToString
());
RB_Miai_Activity_Extend
demodel
=
JsonConvert
.
DeserializeObject
<
RB_Miai_Activity_Extend
>(
parms
.
msg
.
ToString
());
demodel
.
TenantId
=
parms
.
TenantId
;
demodel
.
MallBaseId
=
parms
.
MallBaseId
;
demodel
.
MallBaseId
=
parms
.
MallBaseId
;
var
list
=
miaiModule
.
GetActivityPageList
(
pagelist
.
pageIndex
,
pagelist
.
pageSize
,
out
long
count
,
demodel
);
var
list
=
miaiModule
.
GetActivityPageList
(
pagelist
.
pageIndex
,
pagelist
.
pageSize
,
out
long
count
,
demodel
);
pagelist
.
count
=
Convert
.
ToInt32
(
count
);
pagelist
.
count
=
Convert
.
ToInt32
(
count
);
...
@@ -127,7 +124,6 @@ namespace Mall.WebApi.Controllers.MallBase
...
@@ -127,7 +124,6 @@ namespace Mall.WebApi.Controllers.MallBase
userInfo
=
new
AppletUserInfo
userInfo
=
new
AppletUserInfo
{
{
UserId
=
0
,
UserId
=
0
,
TenantId
=
RequestParm
.
TenantId
,
MallBaseId
=
RequestParm
.
MallBaseId
MallBaseId
=
RequestParm
.
MallBaseId
};
};
}
}
...
@@ -272,6 +268,7 @@ namespace Mall.WebApi.Controllers.MallBase
...
@@ -272,6 +268,7 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// </summary>
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
public
ApiResult
GetActivityDiscussPageList
()
public
ApiResult
GetActivityDiscussPageList
()
{
{
var
parms
=
RequestParm
;
var
parms
=
RequestParm
;
...
@@ -281,7 +278,6 @@ namespace Mall.WebApi.Controllers.MallBase
...
@@ -281,7 +278,6 @@ namespace Mall.WebApi.Controllers.MallBase
{
{
return
ApiResult
.
ParamIsNull
(
"请传递活动id"
);
return
ApiResult
.
ParamIsNull
(
"请传递活动id"
);
}
}
demodel
.
TenantId
=
parms
.
TenantId
;
demodel
.
MallBaseId
=
parms
.
MallBaseId
;
demodel
.
MallBaseId
=
parms
.
MallBaseId
;
var
list
=
miaiModule
.
GetActivityDiscussPageList
(
pagelist
.
pageIndex
,
pagelist
.
pageSize
,
out
long
count
,
demodel
);
var
list
=
miaiModule
.
GetActivityDiscussPageList
(
pagelist
.
pageIndex
,
pagelist
.
pageSize
,
out
long
count
,
demodel
);
pagelist
.
count
=
Convert
.
ToInt32
(
count
);
pagelist
.
count
=
Convert
.
ToInt32
(
count
);
...
@@ -317,6 +313,7 @@ namespace Mall.WebApi.Controllers.MallBase
...
@@ -317,6 +313,7 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// </summary>
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
public
ApiResult
GetActivityReplyPageList
()
public
ApiResult
GetActivityReplyPageList
()
{
{
var
parms
=
RequestParm
;
var
parms
=
RequestParm
;
...
@@ -326,7 +323,6 @@ namespace Mall.WebApi.Controllers.MallBase
...
@@ -326,7 +323,6 @@ namespace Mall.WebApi.Controllers.MallBase
{
{
return
ApiResult
.
ParamIsNull
(
"请传递上级id"
);
return
ApiResult
.
ParamIsNull
(
"请传递上级id"
);
}
}
demodel
.
TenantId
=
parms
.
TenantId
;
demodel
.
MallBaseId
=
parms
.
MallBaseId
;
demodel
.
MallBaseId
=
parms
.
MallBaseId
;
var
list
=
miaiModule
.
GetActivityReplyPageList
(
pagelist
.
pageIndex
,
pagelist
.
pageSize
,
out
long
count
,
demodel
);
var
list
=
miaiModule
.
GetActivityReplyPageList
(
pagelist
.
pageIndex
,
pagelist
.
pageSize
,
out
long
count
,
demodel
);
pagelist
.
count
=
Convert
.
ToInt32
(
count
);
pagelist
.
count
=
Convert
.
ToInt32
(
count
);
...
...
Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs
View file @
8bf1b121
...
@@ -349,7 +349,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -349,7 +349,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
ActivityType
=
jObj
.
GetInt
(
"ActivityType"
)
ActivityType
=
jObj
.
GetInt
(
"ActivityType"
)
};
};
query
.
MallBaseId
=
RequestParm
.
MallBaseId
;
query
.
MallBaseId
=
RequestParm
.
MallBaseId
;
query
.
TenantId
=
RequestParm
.
TenantId
;
var
list
=
activityModule
.
GetCommerceActivityPageListModule
(
pageModel
.
pageIndex
,
pageModel
.
pageSize
,
out
long
rowsCount
,
query
);
var
list
=
activityModule
.
GetCommerceActivityPageListModule
(
pageModel
.
pageIndex
,
pageModel
.
pageSize
,
out
long
rowsCount
,
query
);
pageModel
.
count
=
Convert
.
ToInt32
(
rowsCount
);
pageModel
.
count
=
Convert
.
ToInt32
(
rowsCount
);
pageModel
.
pageData
=
list
;
pageModel
.
pageData
=
list
;
...
...
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