Commit 92436a04 authored by 吴春's avatar 吴春

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

parents 3b6db890 1b93825f
...@@ -792,6 +792,7 @@ namespace Mall.Module.User ...@@ -792,6 +792,7 @@ namespace Mall.Module.User
var qlist = member_EquityRepository.GetList(new RB_Member_Equity_Extend() { GradeId = memberGradeId, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }); var qlist = member_EquityRepository.GetList(new RB_Member_Equity_Extend() { GradeId = memberGradeId, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId });
return ApiResult.Success("", new return ApiResult.Success("", new
{ {
gradeModel.Id,
GradeName = gradeModel.Name ?? "暂无等级", GradeName = gradeModel.Name ?? "暂无等级",
Icon = material_InfoRepository.GetEntity(gradeModel.Icon ?? 0)?.Path ?? "", Icon = material_InfoRepository.GetEntity(gradeModel.Icon ?? 0)?.Path ?? "",
BackgroundImage = material_InfoRepository.GetEntity(gradeModel.BackgroundImage ?? 0)?.Path ?? "", BackgroundImage = material_InfoRepository.GetEntity(gradeModel.BackgroundImage ?? 0)?.Path ?? "",
...@@ -799,6 +800,7 @@ namespace Mall.Module.User ...@@ -799,6 +800,7 @@ namespace Mall.Module.User
Grade = gradeModel.Grade ?? 0, Grade = gradeModel.Grade ?? 0,
IsCanBuyVip = (umodel.MemberGrade ?? 0) > 0 ? 2 : 1, IsCanBuyVip = (umodel.MemberGrade ?? 0) > 0 ? 2 : 1,
gradeModel.MemberSpecification, gradeModel.MemberSpecification,
gradeModel.MemberBuyMoney,
//获取权益列表 //获取权益列表
EquityList = qlist.Select(x => new EquityList = qlist.Select(x => new
{ {
......
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