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
148eb76f
Commit
148eb76f
authored
Mar 29, 2021
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交代码
parent
7482234d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
AppletTradeController.cs
...WebApi/Controllers/TradePavilion/AppletTradeController.cs
+2
-0
TradeController.cs
Mall.WebApi/Controllers/TradePavilion/TradeController.cs
+5
-4
No files found.
Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs
View file @
148eb76f
...
@@ -1134,6 +1134,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -1134,6 +1134,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
{
{
extModel
.
BannerList
=
new
List
<
string
>();
extModel
.
BannerList
=
new
List
<
string
>();
}
}
extModel
.
ProjectName
=
extModel
.
ClassName
;
if
(
req
.
UserId
>
0
&&
extModel
.
ID
>
0
)
if
(
req
.
UserId
>
0
&&
extModel
.
ID
>
0
)
{
//判断是否已经关注过
{
//判断是否已经关注过
var
collectModel
=
carrierModule
.
GetList
(
new
RB_Collect_Extend
{
Status
=
0
,
Type
=
2
,
UserId
=
req
.
UserId
,
SourceId
=
extModel
.
ID
,
MallBaseId
=
query
.
MallBaseId
,
TenantId
=
query
.
TenantId
}).
FirstOrDefault
();
var
collectModel
=
carrierModule
.
GetList
(
new
RB_Collect_Extend
{
Status
=
0
,
Type
=
2
,
UserId
=
req
.
UserId
,
SourceId
=
extModel
.
ID
,
MallBaseId
=
query
.
MallBaseId
,
TenantId
=
query
.
TenantId
}).
FirstOrDefault
();
...
...
Mall.WebApi/Controllers/TradePavilion/TradeController.cs
View file @
148eb76f
...
@@ -1068,10 +1068,10 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -1068,10 +1068,10 @@ namespace Mall.WebApi.Controllers.TradePavilion
{
{
return
ApiResult
.
Failed
(
"请输入开发商"
);
return
ApiResult
.
Failed
(
"请输入开发商"
);
}
}
//if (query.BannerList == null ||
query.BannerList.Any())
if
(
query
.
BannerList
==
null
||
!
query
.
BannerList
.
Any
())
//
{
{
//
return ApiResult.Failed("请上传介绍图");
return
ApiResult
.
Failed
(
"请上传介绍图"
);
//
}
}
if
(
query
.
BannerList
!=
null
&&
query
.
BannerList
.
Any
())
if
(
query
.
BannerList
!=
null
&&
query
.
BannerList
.
Any
())
{
{
query
.
Banner
=
JsonConvert
.
SerializeObject
(
query
.
BannerList
);
query
.
Banner
=
JsonConvert
.
SerializeObject
(
query
.
BannerList
);
...
@@ -1254,6 +1254,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -1254,6 +1254,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
var
list
=
carrierModule
.
GetBrandPageList
(
pageModel
.
pageIndex
,
pageModel
.
pageSize
,
out
long
rowsCount
,
query
);
var
list
=
carrierModule
.
GetBrandPageList
(
pageModel
.
pageIndex
,
pageModel
.
pageSize
,
out
long
rowsCount
,
query
);
foreach
(
var
item
in
list
)
foreach
(
var
item
in
list
)
{
{
item
.
ProjectName
=
item
.
ClassName
;
if
(!
string
.
IsNullOrWhiteSpace
(
item
.
Banner
))
if
(!
string
.
IsNullOrWhiteSpace
(
item
.
Banner
))
{
{
item
.
BannerList
=
JsonConvert
.
DeserializeObject
<
List
<
string
>>(
item
.
Banner
);
item
.
BannerList
=
JsonConvert
.
DeserializeObject
<
List
<
string
>>(
item
.
Banner
);
...
...
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