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
4beb7fc7
Commit
4beb7fc7
authored
Dec 12, 2024
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
bbf3b6b5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
3 deletions
+11
-3
AppletTradeController.cs
...WebApi/Controllers/TradePavilion/AppletTradeController.cs
+10
-2
YBTradeController.cs
Mall.WebApi/Controllers/TradePavilion/YBTradeController.cs
+1
-1
No files found.
Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs
View file @
4beb7fc7
...
@@ -763,6 +763,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -763,6 +763,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// 获取新闻前几条
/// 获取新闻前几条
/// </summary>
/// </summary>
/// <returns></returns>
/// <returns></returns>
[
HttpGet
]
[
HttpPost
]
public
ApiResult
GetNewsPage
()
public
ApiResult
GetNewsPage
()
{
{
ResultPageModel
pageModel
=
JsonConvert
.
DeserializeObject
<
ResultPageModel
>(
RequestParm
.
msg
.
ToString
());
ResultPageModel
pageModel
=
JsonConvert
.
DeserializeObject
<
ResultPageModel
>(
RequestParm
.
msg
.
ToString
());
...
@@ -772,9 +774,13 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -772,9 +774,13 @@ namespace Mall.WebApi.Controllers.TradePavilion
Title
=
parms
.
GetStringValue
(
"Title"
),
Title
=
parms
.
GetStringValue
(
"Title"
),
Type
=
parms
.
GetInt
(
"Type"
)
Type
=
parms
.
GetInt
(
"Type"
)
};
};
var
userInfo
=
AppletUserInfo
;
// var userInfo = AppletUserInfo;
// query.MallBaseId = RequestParm.MallBaseId;
// query.TenantId = userInfo?.TenantId ?? 0;
query
.
MallBaseId
=
RequestParm
.
MallBaseId
;
query
.
MallBaseId
=
RequestParm
.
MallBaseId
;
query
.
TenantId
=
userInfo
?.
TenantId
??
0
;
query
.
TenantId
=
RequestParm
.
TenantId
;
var
list
=
commerceNewsModule
.
GetCommerceNewsPageListModule
(
pageModel
.
pageIndex
,
pageModel
.
pageSize
,
out
long
rowsCount
,
query
);
var
list
=
commerceNewsModule
.
GetCommerceNewsPageListModule
(
pageModel
.
pageIndex
,
pageModel
.
pageSize
,
out
long
rowsCount
,
query
);
pageModel
.
count
=
Convert
.
ToInt32
(
rowsCount
);
pageModel
.
count
=
Convert
.
ToInt32
(
rowsCount
);
pageModel
.
pageData
=
list
;
pageModel
.
pageData
=
list
;
...
@@ -785,6 +791,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -785,6 +791,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// 获取新闻信息详情
/// 获取新闻信息详情
/// </summary>
/// </summary>
/// <returns></returns>
/// <returns></returns>
[
HttpGet
]
[
HttpPost
]
public
ApiResult
GetCommerceNews
()
public
ApiResult
GetCommerceNews
()
{
{
JObject
parms
=
JObject
.
Parse
(
RequestParm
.
msg
.
ToString
());
JObject
parms
=
JObject
.
Parse
(
RequestParm
.
msg
.
ToString
());
...
...
Mall.WebApi/Controllers/TradePavilion/YBTradeController.cs
View file @
4beb7fc7
...
@@ -252,7 +252,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -252,7 +252,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
[
HttpPost
]
[
HttpPost
]
public
ApiResult
GetBuildingExportEnumList
()
public
ApiResult
GetBuildingExportEnumList
()
{
{
var
list
=
EnumHelper
.
GetEnumList
(
typeof
(
Common
.
Enum
.
TradePavilion
.
SZT
Carrier
ExportEnum
));
var
list
=
EnumHelper
.
GetEnumList
(
typeof
(
Common
.
Enum
.
TradePavilion
.
SZT
Build
ExportEnum
));
return
ApiResult
.
Success
(
""
,
list
.
Select
(
x
=>
new
return
ApiResult
.
Success
(
""
,
list
.
Select
(
x
=>
new
{
{
Name
=
x
.
Key
,
Name
=
x
.
Key
,
...
...
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