Commit fd17b763 authored by 黄奎's avatar 黄奎

页面修改

parent 9e0ee2f6
...@@ -3420,6 +3420,16 @@ namespace Mall.Module.User ...@@ -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>
/// 获取团队成员详情 /// 获取团队成员详情
/// </summary> /// </summary>
...@@ -3427,7 +3437,7 @@ namespace Mall.Module.User ...@@ -3427,7 +3437,7 @@ namespace Mall.Module.User
/// <returns></returns> /// <returns></returns>
public object GetTeamUserInfoModule(int UserId) 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> totalList = new List<RB_Member_User_Extend>();
//本月佣金 //本月佣金
List<RB_Member_User_Extend> currentMonthList = new List<RB_Member_User_Extend>(); List<RB_Member_User_Extend> currentMonthList = new List<RB_Member_User_Extend>();
......
...@@ -1713,7 +1713,16 @@ namespace Mall.WebApi.Controllers.User ...@@ -1713,7 +1713,16 @@ namespace Mall.WebApi.Controllers.User
{ {
demodel.UserId = parms.GetInt("NewUserId"); 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); 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.count = Convert.ToInt32(count);
pagelist.pageData = list.Select(x => new pagelist.pageData = list.Select(x => new
{ {
...@@ -1732,6 +1741,7 @@ namespace Mall.WebApi.Controllers.User ...@@ -1732,6 +1741,7 @@ namespace Mall.WebApi.Controllers.User
y.Number y.Number
}), }),
x.UserId, x.UserId,
Icon= memberList?.Where(qitem=>qitem.Id==x.UserId)?.FirstOrDefault()?.Icon??"",
x.UserName, x.UserName,
x.Photo, x.Photo,
x.Mobile, x.Mobile,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment