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
fd17b763
Commit
fd17b763
authored
Aug 27, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
9e0ee2f6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
1 deletion
+21
-1
UserModule.cs
Mall.Module.User/UserModule.cs
+11
-1
AppletUserController.cs
Mall.WebApi/Controllers/User/AppletUserController.cs
+10
-0
No files found.
Mall.Module.User/UserModule.cs
View file @
fd17b763
...
...
@@ -3420,6 +3420,16 @@ namespace Mall.Module.User
};
}
/// <summary>
/// 获取用户列表
/// </summary>
/// <param name="dmodel"></param>
/// <returns></returns>
public
List
<
RB_Member_User_Extend
>
GetUserListExtModule
(
RB_Member_User_Extend
dmodel
)
{
return
member_UserRepository
.
GetListExtRepository
(
dmodel
);
}
/// <summary>
/// 获取团队成员详情
/// </summary>
...
...
@@ -3427,7 +3437,7 @@ namespace Mall.Module.User
/// <returns></returns>
public
object
GetTeamUserInfoModule
(
int
UserId
)
{
var
extModel
=
member_UserRepository
.
GetListExtRepository
(
new
RB_Member_User_Extend
()
{
UserIds
=
UserId
.
ToString
()
})?.
FirstOrDefault
();
var
extModel
=
GetUserListExtModule
(
new
RB_Member_User_Extend
()
{
UserIds
=
UserId
.
ToString
()
})?.
FirstOrDefault
();
List
<
RB_Member_User_Extend
>
totalList
=
new
List
<
RB_Member_User_Extend
>();
//本月佣金
List
<
RB_Member_User_Extend
>
currentMonthList
=
new
List
<
RB_Member_User_Extend
>();
...
...
Mall.WebApi/Controllers/User/AppletUserController.cs
View file @
fd17b763
...
...
@@ -1713,7 +1713,16 @@ namespace Mall.WebApi.Controllers.User
{
demodel
.
UserId
=
parms
.
GetInt
(
"NewUserId"
);
}
List
<
RB_Member_User_Extend
>
memberList
=
new
List
<
RB_Member_User_Extend
>();
var
list
=
userModule
.
GetOrderIntroductionPageList
(
pagelist
.
pageIndex
,
pagelist
.
pageSize
,
out
long
count
,
demodel
);
if
(
list
!=
null
&&
list
.
Count
>
0
)
{
var
userIds
=
string
.
Join
(
","
,
list
.
Select
(
qitem
=>
qitem
.
UserId
));
if
(!
string
.
IsNullOrWhiteSpace
(
userIds
))
{
memberList
=
userModule
.
GetUserListExtModule
(
new
RB_Member_User_Extend
()
{
UserIds
=
userIds
});
}
}
pagelist
.
count
=
Convert
.
ToInt32
(
count
);
pagelist
.
pageData
=
list
.
Select
(
x
=>
new
{
...
...
@@ -1732,6 +1741,7 @@ namespace Mall.WebApi.Controllers.User
y
.
Number
}),
x
.
UserId
,
Icon
=
memberList
?.
Where
(
qitem
=>
qitem
.
Id
==
x
.
UserId
)?.
FirstOrDefault
()?.
Icon
??
""
,
x
.
UserName
,
x
.
Photo
,
x
.
Mobile
,
...
...
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