diff --git a/business/jxstore/cms/authz.go b/business/jxstore/cms/authz.go index 482d4d942..e8cd10646 100644 --- a/business/jxstore/cms/authz.go +++ b/business/jxstore/cms/authz.go @@ -1,7 +1,6 @@ package cms import ( - "git.rosy.net.cn/baseapi/utils" "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/authz" @@ -71,7 +70,7 @@ func TransferLegacyWeixins(mobile string) (err error) { Remark: remark4Transfer, } if user.Name == "" { - user.Name = utils.Pointer2String(user.Mobile) + user.Name = user.GetMobile() } userList, _, err2 := dao.GetUsers(db, 0, "", nil, "", v.Tel, 0, -1) if err = err2; err != nil { diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go index e2a896953..869c1f577 100644 --- a/business/jxstore/cms/user2.go +++ b/business/jxstore/cms/user2.go @@ -101,8 +101,8 @@ func init() { auth2.Init(userProvider) } -func RegisterUser(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) +func RegisterUserWithMobile(ctx *jxcontext.Context, user *model.User, mobileVerifyCode string, inAuthInfo *auth2.AuthInfo) (outAuthInfo *auth2.AuthInfo, err error) { + mobileAuth, err2 := auth2.Login(auth2.AuthTypeMobile, user.GetMobile(), auth2.UserIDMobile, mobileVerifyCode) if err = err2; err == nil { if !mobileAuth.IsUserEmpty() { return nil, jsonerr.New(mobileAuth, model.ErrCodeJsonUserAlreadyExist) @@ -124,6 +124,27 @@ func RegisterUser(ctx *jxcontext.Context, user *model.User, mobileVerifyCode str 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) { authInfo, err := ctx.GetV2AuthInfo() 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) { - if user == nil || user.UserID2 == "" || user.Name == "" || utils.Pointer2String(user.Mobile) == "" { + if user == nil || user.UserID2 == "" || user.Name == "" || user.GetMobile() == "" { return ErrUserIDAndNameMustGiven } dao.WrapAddIDCULDEntity(user, creatorName) diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go index b8590ff84..aea8b72ec 100644 --- a/business/jxutils/jxutils.go +++ b/business/jxutils/jxutils.go @@ -663,3 +663,14 @@ func WriteFile(fileName string, binData []byte) error { err := ioutil.WriteFile(fileName, binData, 0666) return err } + +// func GetRealMobile4Order(order *model.GoodsOrder) (mobileNumber string) { +// mobileNumber = order.ConsigneeMobile2 +// if mobileNumber == "" { +// mobileNumber = order.ConsigneeMobile +// } +// if IsMobileFake(mobileNumber) { +// mobileNumber = "" +// } +// return mobileNumber +// } diff --git a/business/model/dao/dao_user2.go b/business/model/dao/dao_user2.go index ca95345eb..5c9ba1b41 100644 --- a/business/model/dao/dao_user2.go +++ b/business/model/dao/dao_user2.go @@ -2,6 +2,7 @@ package dao import ( "fmt" + "time" "git.rosy.net.cn/baseapi/utils" "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 } + +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 +} diff --git a/controllers/cms_user2.go b/controllers/cms_user2.go index 2e5308206..9c8f21948 100644 --- a/controllers/cms_user2.go +++ b/controllers/cms_user2.go @@ -34,7 +34,7 @@ func (c *User2Controller) RegisterUser() { if err == nil { if err = jxutils.Strings2Objs(params.Payload, &user); err == nil { 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