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
e30d75e8
Commit
e30d75e8
authored
Mar 19, 2021
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交代码
parent
4e4c4895
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
10 deletions
+22
-10
AppletMiaiController.cs
Mall.WebApi/Controllers/Miai/AppletMiaiController.cs
+22
-10
No files found.
Mall.WebApi/Controllers/Miai/AppletMiaiController.cs
View file @
e30d75e8
...
...
@@ -120,7 +120,8 @@ namespace Mall.WebApi.Controllers.MallBase
{
return
ApiResult
.
ParamIsNull
();
}
if
(
userInfo
==
null
)
{
if
(
userInfo
==
null
)
{
userInfo
=
new
AppletUserInfo
{
UserId
=
0
,
...
...
@@ -654,7 +655,7 @@ namespace Mall.WebApi.Controllers.MallBase
[
HttpPost
]
public
ApiResult
GetMiaiMessageCenter
()
{
var
userInfo
=
AppletUserInfo
;
var
userInfo
=
AppletUserInfo
;
var
list
=
miaiModule
.
GetMiaiMessageCenter
(
userInfo
.
UserId
,
userInfo
.
TenantId
,
userInfo
.
MallBaseId
);
return
ApiResult
.
Success
(
""
,
list
);
}
...
...
@@ -664,7 +665,8 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetMiaiMessageVisitorStatistics
()
{
public
ApiResult
GetMiaiMessageVisitorStatistics
()
{
var
userInfo
=
AppletUserInfo
;
var
parms
=
JObject
.
Parse
(
RequestParm
.
msg
.
ToString
());
int
Type
=
parms
.
GetInt
(
"Type"
,
1
);
// 类型 1谁看过我 2我看过谁
...
...
@@ -678,7 +680,8 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetMiaiMessageVisitorPageList
()
{
public
ApiResult
GetMiaiMessageVisitorPageList
()
{
var
parms
=
RequestParm
;
var
userInfo
=
AppletUserInfo
;
ResultPageModel
pagelist
=
JsonConvert
.
DeserializeObject
<
ResultPageModel
>(
parms
.
msg
.
ToString
());
...
...
@@ -690,7 +693,8 @@ namespace Mall.WebApi.Controllers.MallBase
{
demodel
.
UserId
=
userInfo
.
UserId
;
}
else
{
else
{
demodel
.
CreateBy
=
userInfo
.
UserId
;
}
var
list
=
miaiModule
.
GetMiaiMessageVisitorPageList
(
pagelist
.
pageIndex
,
pagelist
.
pageSize
,
out
long
count
,
demodel
);
...
...
@@ -912,8 +916,16 @@ namespace Mall.WebApi.Controllers.MallBase
int
MyFollowId
=
0
;
int
OtherFollowId
=
0
;
if
(
userInfo
!=
null
)
if
(
userInfo
==
null
)
{
userInfo
=
new
AppletUserInfo
{
UserId
=
RequestParm
.
UserId
,
MallBaseId
=
RequestParm
.
MallBaseId
,
TenantId
=
RequestParm
.
TenantId
};
}
if
(
userInfo
!=
null
&&
userInfo
.
UserId
>
0
)
{
var
oldList
=
miaiModule
.
GetFollowMemberList
(
new
RB_MiAi_FollowMember_Extend
{
Status
=
0
,
UserId
=
userId
,
CreateBy
=
userInfo
.
UserId
,
MallBaseId
=
userInfo
.
MallBaseId
,
TenantId
=
userInfo
.
TenantId
});
var
oldOtherList
=
miaiModule
.
GetFollowMemberList
(
new
RB_MiAi_FollowMember_Extend
{
Status
=
0
,
UserId
=
userInfo
.
UserId
,
CreateBy
=
userId
,
MallBaseId
=
userInfo
.
MallBaseId
,
TenantId
=
userInfo
.
TenantId
});
...
...
@@ -959,11 +971,11 @@ namespace Mall.WebApi.Controllers.MallBase
}
}
var
oldUserInfo
=
miaiModule
.
GetMemberUserInfo
(
userId
);
var
oldBaseInfo
=
miaiModule
.
GetBaseInfoList
(
new
RB_MiAi_BaseInfo_Extend
{
UserId
=
userId
,
TenantId
=
RequestParm
.
TenantId
,
MallBaseId
=
RequestParm
.
MallBaseId
}).
FirstOrDefault
();
if
(
oldUserInfo
!=
null
&&
oldUserInfo
.
Id
>
0
)
{
...
...
@@ -1287,7 +1299,7 @@ namespace Mall.WebApi.Controllers.MallBase
return
ApiResult
.
Failed
(
"发布内容检测失败,请稍后再试"
);
}
}
#
endregion
article
.
CreateTime
=
DateTime
.
Now
;
article
.
CreateBy
=
userInfo
.
UserId
;
...
...
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