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
d870a3d8
Commit
d870a3d8
authored
Feb 26, 2021
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vip普通用户
parent
c89512a6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
56 additions
and
4 deletions
+56
-4
AppletUserInfo.cs
Mall.Common/API/AppletUserInfo.cs
+1
-1
UserModule.cs
Mall.Module.User/UserModule.cs
+37
-2
AppletLoginController.cs
Mall.WebApi/Controllers/User/AppletLoginController.cs
+2
-1
AppletUserController.cs
Mall.WebApi/Controllers/User/AppletUserController.cs
+16
-0
No files found.
Mall.Common/API/AppletUserInfo.cs
View file @
d870a3d8
...
@@ -136,6 +136,6 @@ namespace Mall.Common
...
@@ -136,6 +136,6 @@ namespace Mall.Common
/// <summary>
/// <summary>
/// 普通会员等级
/// 普通会员等级
/// </summary>
/// </summary>
public
int
MemberGrade
;
public
int
MemberGrade
Id
{
get
;
set
;
}
}
}
}
}
\ No newline at end of file
Mall.Module.User/UserModule.cs
View file @
d870a3d8
...
@@ -768,6 +768,38 @@ namespace Mall.Module.User
...
@@ -768,6 +768,38 @@ namespace Mall.Module.User
};
};
}
}
/// <summary>
/// 获取普通用户购买vip介绍
/// </summary>
/// <param name="userInfo"></param>
/// <returns></returns>
public
ApiResult
GetUserMemberVipGradeInfo
(
int
memberGradeId
,
AppletUserInfo
userInfo
)
{
var
umodel
=
member_UserRepository
.
GetEntity
(
userInfo
.
UserId
);
if
(
umodel
==
null
)
{
return
ApiResult
.
Failed
(
"用户不存在"
);
}
var
gradeModel
=
member_GradeRepository
.
GetEntity
(
memberGradeId
);
if
(
gradeModel
==
null
)
{
return
ApiResult
.
Failed
(
"会员等级不存在"
);
}
if
((
gradeModel
.
IsMemberBuy
??
0
)
!=
1
)
{
return
ApiResult
.
Failed
(
"该等级无法购买"
);
}
var
qlist
=
member_EquityRepository
.
GetList
(
new
RB_Member_Equity_Extend
()
{
GradeId
=
memberGradeId
,
TenantId
=
userInfo
.
TenantId
,
MallBaseId
=
userInfo
.
MallBaseId
});
return
ApiResult
.
Success
(
""
,
new
{
GradeName
=
gradeModel
.
Name
??
"暂无等级"
,
Icon
=
material_InfoRepository
.
GetEntity
(
gradeModel
.
Icon
??
0
)?.
Path
??
""
,
BackgroundImage
=
material_InfoRepository
.
GetEntity
(
gradeModel
.
BackgroundImage
??
0
)?.
Path
??
""
,
Discount
=
gradeModel
.
Discount
??
0
,
Grade
=
gradeModel
.
Grade
??
0
,
IsCanBuyVip
=
(
umodel
.
MemberGrade
??
0
)
>
0
?
2
:
1
,
gradeModel
.
MemberSpecification
,
//获取权益列表
EquityList
=
qlist
.
Select
(
x
=>
new
{
x
.
Id
,
x
.
Title
,
x
.
ImagePath
,
x
.
Content
,
})
});
}
/// <summary>
/// <summary>
/// 验证会员等级是否存在
/// 验证会员等级是否存在
/// </summary>
/// </summary>
...
@@ -4577,7 +4609,9 @@ namespace Mall.Module.User
...
@@ -4577,7 +4609,9 @@ namespace Mall.Module.User
MemberGradeIcon
=
miniConfig
?.
MemberBgImg
??
""
;
MemberGradeIcon
=
miniConfig
?.
MemberBgImg
??
""
;
}
}
//会员等级是否可购买
//会员等级是否可购买
bool
IsMemberBuy
=
member_GradeRepository
.
GetList
(
new
RB_Member_Grade_Extend
()
{
TenantId
=
umodel
.
TenantId
,
MallBaseId
=
umodel
.
MallBaseId
,
IsMemberBuy
=
1
,
Enabled
=
1
}).
Any
();
var
memberGradeList
=
member_GradeRepository
.
GetList
(
new
RB_Member_Grade_Extend
()
{
TenantId
=
umodel
.
TenantId
,
MallBaseId
=
umodel
.
MallBaseId
,
IsMemberBuy
=
1
,
Enabled
=
1
});
bool
IsMemberBuy
=
memberGradeList
.
Any
();
int
memberVipGradeId
=
memberGradeList
.
FirstOrDefault
()?.
Id
??
0
;
objData
=
new
objData
=
new
{
{
...
@@ -4611,7 +4645,8 @@ namespace Mall.Module.User
...
@@ -4611,7 +4645,8 @@ namespace Mall.Module.User
level_name
=
MemberGrade
,
level_name
=
MemberGrade
,
level_icon
=
MemberGradeIcon
,
level_icon
=
MemberGradeIcon
,
is_admin
=
0
,
is_admin
=
0
,
is_member_buy
=
IsMemberBuy
is_member_vipbuy
=
IsMemberBuy
,
member_vipgrade_Id
=
memberVipGradeId
},
},
MyOrder
=
new
MyOrder
=
new
{
{
...
...
Mall.WebApi/Controllers/User/AppletLoginController.cs
View file @
d870a3d8
...
@@ -222,6 +222,7 @@ namespace Mall.WebApi.Controllers.User
...
@@ -222,6 +222,7 @@ namespace Mall.WebApi.Controllers.User
Name
=
demodel
.
Name
,
Name
=
demodel
.
Name
,
OpenId
=
demodel
.
OpenId
,
OpenId
=
demodel
.
OpenId
,
Photo
=
demodel
.
Photo
,
Photo
=
demodel
.
Photo
,
MemberGradeId
=
demodel
.
MemberGrade
??
0
,
Source
=
demodel
.
Source
,
Source
=
demodel
.
Source
,
SecretKey
=
demodel
.
SecretKey
,
SecretKey
=
demodel
.
SecretKey
,
SuperiorId
=
demodel
.
SuperiorId
??
0
,
SuperiorId
=
demodel
.
SuperiorId
??
0
,
...
@@ -307,7 +308,7 @@ namespace Mall.WebApi.Controllers.User
...
@@ -307,7 +308,7 @@ namespace Mall.WebApi.Controllers.User
Name
=
umodel
.
Name
,
Name
=
umodel
.
Name
,
OpenId
=
umodel
.
OpenId
,
OpenId
=
umodel
.
OpenId
,
Photo
=
umodel
.
Photo
,
Photo
=
umodel
.
Photo
,
MemberGrade
=
umodel
.
MemberGrade
??
0
,
MemberGrade
Id
=
umodel
.
MemberGrade
??
0
,
Source
=
demodel
.
Source
,
Source
=
demodel
.
Source
,
SecretKey
=
umodel
.
SecretKey
,
SecretKey
=
umodel
.
SecretKey
,
SuperiorId
=
umodel
.
SuperiorId
??
0
,
SuperiorId
=
umodel
.
SuperiorId
??
0
,
...
...
Mall.WebApi/Controllers/User/AppletUserController.cs
View file @
d870a3d8
...
@@ -901,6 +901,22 @@ namespace Mall.WebApi.Controllers.User
...
@@ -901,6 +901,22 @@ namespace Mall.WebApi.Controllers.User
return
ApiResult
.
Success
(
""
,
Robj
);
return
ApiResult
.
Success
(
""
,
Robj
);
}
}
/// <summary>
/// 获取用户会员vip购买介绍
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetUserMemberVipGradeInfo
()
{
var
userInfo
=
AppletUserInfo
;
var
parms
=
JObject
.
Parse
(
RequestParm
.
msg
.
ToString
());
int
MemberGradeId
=
parms
.
GetInt
(
"MemberGradeId"
,
0
);
if
(
MemberGradeId
<=
0
)
{
return
ApiResult
.
ParamIsNull
();
}
return
userModule
.
GetUserMemberVipGradeInfo
(
MemberGradeId
,
userInfo
);
}
/// <summary>
/// <summary>
/// 用户升级会员信息
/// 用户升级会员信息
/// </summary>
/// </summary>
...
...
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