liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/mark' into don

Browse Source
This commit is contained in:
Rosy-zhudan
2019-08-27 18:13:52 +08:00
parent a4de571a19 c8926056fb
commit 09298ad560
5 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
business/jxstore/cms/authz.go
View File

@@ -115,7 +115,14 @@ func TransferLegacyWeixins(mobile string) (err error) {
}
} else {
if mobile != "" {
api2.RoleMan.DeleteRole4User(user.GetID(), autils.NewRole(authz.StoreRoleBoss, v.JxStoreID))
rList, err2 := api2.RoleMan.GetUserRoleList(user.GetID())
if err = err2; err == nil {
for _, role := range rList {
if role.StoreID > 0 {
api2.RoleMan.DeleteRole4User(user.GetID(), autils.NewRole(authz.StoreRoleBoss, role.StoreID))
}
}
}
}
}
}

6
business/jxstore/cms/user2.go
View File

@@ -87,11 +87,13 @@ func RegisterUser(user *model.User, mobileVerifyCode string, inAuthInfo *auth2.A
mobileAuth, err2 := auth2.Login(auth2.AuthTypeMobile, user.Mobile, auth2.UserIDMobile, mobileVerifyCode)
if err = err2; err == nil {
if !mobileAuth.IsUserEmpty() {
return nil, jsonerr.New(mobileAuth, model.ErrCodeJsonActSkuConflict)
return nil, jsonerr.New(mobileAuth, model.ErrCodeJsonUserAlreadyExist)
}
user.Type = model.UserTypeConsumer | model.UserTypeBoss
user.Type = model.UserTypeConsumer
if inAuthInfo.AuthBindInfo.Type == dingding.AuthTypeStaff {
user.Type |= model.UserTypeOperator
} else {
user.Type |= model.UserTypeStoreBoss
}
if err = CreateUser(user, "RegisterUser"); err == nil {
if outAuthInfo, err = auth2.BindUser(mobileAuth, user); err == nil && inAuthInfo != nil {