Commit 6742a15b authored by 吴春's avatar 吴春

Merge branch 'sdzq-ld' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq

parents 99b3a7d3 45380d63
......@@ -563,6 +563,7 @@ namespace Mall.Module.Product
RList = list;
}
else {
demodel.GoodsId = 0;
list = goodsRepository.GetAppletGoodsPageList(pageIndex, pageSize, out long count, demodel);
RList = list;
}
......@@ -710,6 +711,7 @@ namespace Mall.Module.Product
}
else
{
demodel.GoodsId = 0;
list = goodsRepository.GetAppletGoodsPageList(pageIndex, pageSize, out long count, demodel);
RList = list;
}
......
......@@ -4017,9 +4017,35 @@ namespace Mall.Module.User
if (mymodel == null) {
return ApiResult.ParamIsNull("用户不存在");
}
string userIds = member_UserRepository.GetMyUserHierarchicalRelationList(userId1, userId2);
List<object> RList = new List<object>();
if (!string.IsNullOrEmpty(userIds)) {
var list = member_UserRepository.GetList(new RB_Member_User_Extend() { UserIds = userIds });
int pId = userId1;
for (var i = 1; i <= list.Count(); i++) {
var member = list.Where(x => x.Id == pId).FirstOrDefault();
if (member != null)
{
RList.Add(new
{
Sort = i,
MySelf = member.Id == userId2 ? true : false,
UserInfo = new
{
member.Name,
CreateDate = member.CreateDate.HasValue ? member.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
member.Photo
}
});
pId = member.SuperiorId ?? 0;
}
else {
break;
}
}
}
return ApiResult.Success();
return ApiResult.Success("", RList);
}
/// <summary>
......
......@@ -1152,5 +1152,25 @@ FROM
", where);
return Get<RB_Member_User_Extend>(builder.ToString()).ToList();
}
/// <summary>
/// 获取用户层级
/// </summary>
/// <param name="userId1"></param>
/// <param name="userId2"></param>
/// <returns></returns>
public string GetMyUserHierarchicalRelationList(int userId1, int userId2)
{
string sql = $@"SELECT GetMemberParentrenList_MyRelation({userId1},'{userId2}')";
var obj = ExecuteScalar(sql);
if (obj != null)
{
return obj.ToString();
}
else
{
return "";
}
}
}
}
......@@ -468,9 +468,7 @@ namespace Mall.WebApi.Controllers.MallBase
x.MallBaseId,
x.SmallShopsId,
x.SmallShopsName,
CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
TripETime = x.TripETime.HasValue ? x.TripETime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
TripSTime = x.TripSTime.HasValue ? x.TripSTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
});
return ApiResult.Success("", pagelist);
}
......
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