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

- RegisterUser-->RegisterUserWithMobile

Browse Source
This commit is contained in:
gazebo
2019-09-04 17:44:20 +08:00
parent c2f76e38b6
commit 5105a00075
5 changed files with 58 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,6 @@
package cms package cms
import ( import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/auth2" "git.rosy.net.cn/jx-callback/business/auth2"
"git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin" "git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin"
"git.rosy.net.cn/jx-callback/business/authz" "git.rosy.net.cn/jx-callback/business/authz"
@@ -71,7 +70,7 @@ func TransferLegacyWeixins(mobile string) (err error) {
Remark: remark4Transfer, Remark: remark4Transfer,
} }
if user.Name == "" { if user.Name == "" {
user.Name = utils.Pointer2String(user.Mobile) user.Name = user.GetMobile()
} }
userList, _, err2 := dao.GetUsers(db, 0, "", nil, "", v.Tel, 0, -1) userList, _, err2 := dao.GetUsers(db, 0, "", nil, "", v.Tel, 0, -1)
if err = err2; err != nil { if err = err2; err != nil {

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

@@ -101,8 +101,8 @@ func init() {
auth2.Init(userProvider) auth2.Init(userProvider)
} }
func RegisterUser(ctx *jxcontext.Context, user *model.User, mobileVerifyCode string, inAuthInfo *auth2.AuthInfo) (outAuthInfo *auth2.AuthInfo, err error) { func RegisterUserWithMobile(ctx *jxcontext.Context, user *model.User, mobileVerifyCode string, inAuthInfo *auth2.AuthInfo) (outAuthInfo *auth2.AuthInfo, err error) {
mobileAuth, err2 := auth2.Login(auth2.AuthTypeMobile, utils.Pointer2String(user.Mobile), auth2.UserIDMobile, mobileVerifyCode) mobileAuth, err2 := auth2.Login(auth2.AuthTypeMobile, user.GetMobile(), auth2.UserIDMobile, mobileVerifyCode)
if err = err2; err == nil { if err = err2; err == nil {
if !mobileAuth.IsUserEmpty() { if !mobileAuth.IsUserEmpty() {
return nil, jsonerr.New(mobileAuth, model.ErrCodeJsonUserAlreadyExist) return nil, jsonerr.New(mobileAuth, model.ErrCodeJsonUserAlreadyExist)
@@ -124,6 +124,27 @@ func RegisterUser(ctx *jxcontext.Context, user *model.User, mobileVerifyCode str
return outAuthInfo, err return outAuthInfo, err
} }
func HandleOrder4Consignee(order *model.GoodsOrder) (err error) {
// user := &model.User{
// Mobile:&order.ConsigneeMobile2
// }
// user.Type = model.UserTypeConsumer
// if err = CreateUser(user, ctx.GetUserName()); err == nil {
// if vendorID >= 0 {
// authBind := &model.AuthBind{
// UserID: user.GetID(),
// BindType: model.AuthBindTypeID,
// AuthID: vendorUserID,
// Type: model.VendorNames[vendorID],
// }
// dao.WrapAddIDCULDEntity(authBind, ctx.GetUserName())
// authBind.Status = model.AuthBindStatusNormal
// err = dao.CreateEntity(nil, authBind)
// }
// }
return err
}
func GetUserBindAuthInfo(ctx *jxcontext.Context) (authList []*model.AuthBind, err error) { func GetUserBindAuthInfo(ctx *jxcontext.Context) (authList []*model.AuthBind, err error) {
authInfo, err := ctx.GetV2AuthInfo() authInfo, err := ctx.GetV2AuthInfo()
if err == nil { if err == nil {
@@ -133,7 +154,7 @@ func GetUserBindAuthInfo(ctx *jxcontext.Context) (authList []*model.AuthBind, er
} }
func CreateUser(user *model.User, creatorName string) (err error) { func CreateUser(user *model.User, creatorName string) (err error) {
if user == nil || user.UserID2 == "" || user.Name == "" || utils.Pointer2String(user.Mobile) == "" { if user == nil || user.UserID2 == "" || user.Name == "" || user.GetMobile() == "" {
return ErrUserIDAndNameMustGiven return ErrUserIDAndNameMustGiven
} }
dao.WrapAddIDCULDEntity(user, creatorName) dao.WrapAddIDCULDEntity(user, creatorName)

11
business/jxutils/jxutils.go
View File

@@ -663,3 +663,14 @@ func WriteFile(fileName string, binData []byte) error {
err := ioutil.WriteFile(fileName, binData, 0666) err := ioutil.WriteFile(fileName, binData, 0666)
return err return err
} }
// func GetRealMobile4Order(order *model.GoodsOrder) (mobileNumber string) {
// mobileNumber = order.ConsigneeMobile2
// if mobileNumber == "" {
// mobileNumber = order.ConsigneeMobile
// }
// if IsMobileFake(mobileNumber) {
// mobileNumber = ""
// }
// return mobileNumber
// }

21
business/model/dao/dao_user2.go
View File

@@ -2,6 +2,7 @@ package dao
import ( import (
"fmt" "fmt"
"time"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model"
@@ -64,3 +65,23 @@ func GetUsers(db *DaoDB, userType int, keyword string, userIDs []string, userID2
} }
return userList, totalCount, err return userList, totalCount, err
} }
func DeleteUsers(db *DaoDB, userIDs []string) (num int64, err error) {
if len(userIDs) > 0 {
sql := `
UPDATE user t1
JOIN auth_bind t2 ON t2.user_id = t1.user_id
SET
t1.deleted_at = ?,
t2.deleted_at = ?
WHERE t1.user_id IN (` + GenQuestionMarks(len(userIDs)) + ");"
now := time.Now()
sqlParams := []interface{}{
now,
now,
userIDs,
}
num, err = ExecuteSQL(db, sql, sqlParams...)
}
return num, err
}

2
controllers/cms_user2.go
View File

@@ -34,7 +34,7 @@ func (c *User2Controller) RegisterUser() {
if err == nil { if err == nil {
if err = jxutils.Strings2Objs(params.Payload, &user); err == nil { if err = jxutils.Strings2Objs(params.Payload, &user); err == nil {
user.Type = 0 user.Type = 0
retVal, err = cms.RegisterUser(params.Ctx, &user, params.MobileVerifyCode, inAuthInfo) retVal, err = cms.RegisterUserWithMobile(params.Ctx, &user, params.MobileVerifyCode, inAuthInfo)
} }
} }
return retVal, errCode, err return retVal, errCode, err