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
6284ab08
Commit
6284ab08
authored
Mar 16, 2021
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交代码
parent
07cd2b23
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
6 deletions
+11
-6
RB_Miniprogram_Template_Extend.cs
.../Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs
+4
-0
MiniprogramTemplateModule.cs
Mall.Module.MarketingCenter/MiniprogramTemplateModule.cs
+1
-0
EducationController.cs
Mall.WebApi/Controllers/Education/EducationController.cs
+1
-0
MallController.cs
Mall.WebApi/Controllers/Mall/MallController.cs
+2
-3
MallHelper.cs
Mall.WebApi/Controllers/Mall/MallHelper.cs
+3
-3
No files found.
Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs
View file @
6284ab08
...
...
@@ -3049,6 +3049,10 @@ namespace Mall.Model.Extend.MarketingCenter
public
int
addUserType
{
get
;
set
;
}
/// <summary>
/// 用户添加方式(0-默认,1-男神,2-女神)
/// </summary>
public
int
sexType
{
get
;
set
;
}
/// <summary>
/// 浏览权重
...
...
Mall.Module.MarketingCenter/MiniprogramTemplateModule.cs
View file @
6284ab08
...
...
@@ -639,6 +639,7 @@ namespace Mall.Module.MarketingCenter
miaiUserItem
.
PaddingRight
=
driveData
?.
PaddingRight
??
"0"
;
miaiUserItem
.
SearchFilletPX
=
driveData
?.
SearchFilletPX
??
0
;
miaiUserItem
.
goodsLength
=
driveData
.
goodsLength
;
miaiUserItem
.
sexType
=
driveData
?.
sexType
??
0
;
miaiUserItem
.
BrowseRate
=
miaiUserItem
.
addUserType
==
2
?
(
miaiUserItem
.
BrowseRate
==
0
?
1
:
miaiUserItem
.
BrowseRate
)
:
0
;
miaiUserItem
.
FollowRate
=
miaiUserItem
.
addUserType
==
2
?
(
miaiUserItem
.
FollowRate
==
0
?
1
:
miaiUserItem
.
FollowRate
)
:
0
;
miaiUserItem
.
list
=
new
List
<
miaiUserDetail
>();
...
...
Mall.WebApi/Controllers/Education/EducationController.cs
View file @
6284ab08
...
...
@@ -1790,6 +1790,7 @@ namespace Mall.WebApi.Controllers.Education
/// 获取新闻信息详情
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetSetEducationTalk
()
{
var
qequest
=
RequestParm
;
...
...
Mall.WebApi/Controllers/Mall/MallController.cs
View file @
6284ab08
...
...
@@ -103,8 +103,7 @@ namespace Mall.WebApi.Controllers.MallBase
int
storeId
=
parms
.
GetInt
(
"StoreId"
,
0
);
//用户id
int
userId
=
RequestParm
.
UserId
;
//用户性别
int
sex
=
parms
.
GetInt
(
"Sex"
,
0
);
//首页数据
var
homePage
=
new
object
();
//底部导航
...
...
@@ -181,7 +180,7 @@ namespace Mall.WebApi.Controllers.MallBase
{
foreach
(
var
subItem
in
templateModel
.
ComponentDataList
)
{
templateData
.
data
.
Add
(
MallHelper
.
PlusDataToObject
(
subItem
,
(
miniProgram
?.
TenantId
??
0
),
miniProgram
.
MallBaseId
,
RequestParm
.
SmallShopsId
,
isOpenSchool
,
sex
,
storeId
,
userId
));
templateData
.
data
.
Add
(
MallHelper
.
PlusDataToObject
(
subItem
,
(
miniProgram
?.
TenantId
??
0
),
miniProgram
.
MallBaseId
,
RequestParm
.
SmallShopsId
,
isOpenSchool
,
storeId
,
userId
));
}
}
var
tempObj
=
new
...
...
Mall.WebApi/Controllers/Mall/MallHelper.cs
View file @
6284ab08
...
...
@@ -106,7 +106,7 @@ namespace Mall.WebApi.Controllers
/// </summary>
/// <param name="item"></param>
/// <returns></returns>
public
static
object
PlusDataToObject
(
ComponentItem
subItem
,
int
TenantId
,
int
MallBaseId
,
int
SmallShopsId
,
int
IsOpenSchool
,
int
StoreId
,
int
SexInfo
,
int
UserId
=
0
)
public
static
object
PlusDataToObject
(
ComponentItem
subItem
,
int
TenantId
,
int
MallBaseId
,
int
SmallShopsId
,
int
IsOpenSchool
,
int
StoreId
,
int
UserId
=
0
)
{
var
obj
=
new
object
();
switch
(
subItem
.
Id
)
...
...
@@ -1311,9 +1311,9 @@ namespace Mall.WebApi.Controllers
}
}
}
if
(
SexInfo
>
0
)
if
(
miAiUserItem
.
sexType
>
0
)
{
Sex
=
SexInfo
==
1
?
2
:
(
SexInfo
==
2
?
1
:
0
);
Sex
=
miAiUserItem
.
sexType
==
1
?
2
:
(
miAiUserItem
.
sexType
==
2
?
1
:
0
);
}
}
...
...
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