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

清token退回

Browse Source
This commit is contained in:
苏尹岚
2020-04-13 10:05:51 +08:00
parent e4b11a73cb
commit 81d63e1741
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/jxstore/cms/sku.go
View File

@@ -1720,6 +1720,7 @@ func SendNoCatSkusToOperater(ctx *jxcontext.Context) (err error) {
db = dao.GetDB() db = dao.GetDB()
skuNames []*model.SkuName skuNames []*model.SkuName
) )
globals.SugarLogger.Debugf("SendNoCatSkusToOperater")
sql := ` sql := `
SELECT * FROM sku_name WHERE deleted_at = ? AND (category_id = ? OR img = ?) AND unit <> ? SELECT * FROM sku_name WHERE deleted_at = ? AND (category_id = ? OR img = ?) AND unit <> ?
` `

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

@@ -179,13 +179,15 @@ func RegisterUserWithMobile(ctx *jxcontext.Context, user *model.User, mobileVeri
return nil, err return nil, err
} }
if mobileAuth != nil && !mobileAuth.IsUserEmpty() { if mobileAuth != nil && !mobileAuth.IsUserEmpty() {
auth2.RemoveUserInfo(mobileAuth.Token) return nil, jsonerr.New(mobileAuth, model.ErrCodeJsonUserAlreadyExist)
if newAuthInfo, err := auth2.BindUser(mobileAuth, user); err == nil {
globals.SugarLogger.Debugf("testRegisterUserWithMobile", utils.Format4Output(mobileAuth, false), utils.Format4Output(newAuthInfo, false)) // auth2.RemoveUserInfo(mobileAuth.Token)
return nil, jsonerr.New(newAuthInfo, model.ErrCodeJsonUserAlreadyExist) // if newAuthInfo, err := auth2.BindUser(mobileAuth, user); err == nil {
} else { // globals.SugarLogger.Debugf("testRegisterUserWithMobile", utils.Format4Output(mobileAuth, false), utils.Format4Output(newAuthInfo, false))
return nil, err // return nil, jsonerr.New(newAuthInfo, model.ErrCodeJsonUserAlreadyExist)
} // } else {
// return nil, err
// }
} }
} else if inAuthInfo != nil { } else if inAuthInfo != nil {
user.Mobile = nil user.Mobile = nil