From 55ecbdc6c2dae6e877fce86761a8d9eb5504ba9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Mon, 13 Apr 2020 09:12:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=B3=A8=E5=86=8Ctoken?= =?UTF-8?q?=E8=BF=87=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store.go | 2 +- business/jxstore/cms/user2.go | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index aa514fb58..4838fac4e 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -3044,7 +3044,7 @@ func DisabledStoreWithoutVendor(ctx *jxcontext.Context, isContinueWhenError, isA db = dao.GetDB() ) stores, err := dao.GetStoreList(db, nil, nil, []int{model.StoreStatusClosed, model.StoreStatusHaveRest, model.StoreStatusOpened}, nil, "") - task := tasksch.NewParallelTask("RefreshOrdersPriceInfo", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx, + task := tasksch.NewParallelTask("DisabledStoreWithoutVendor", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { store := batchItemList[0].(*model.Store) storeMaps, err := dao.GetStoresMapList(db, []int{model.VendorIDYB, model.VendorIDJD, model.VendorIDJX, model.VendorIDEBAI, model.VendorIDMTWM}, []int{store.ID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "") diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go index 19f029bac..8c8716b69 100644 --- a/business/jxstore/cms/user2.go +++ b/business/jxstore/cms/user2.go @@ -179,7 +179,12 @@ func RegisterUserWithMobile(ctx *jxcontext.Context, user *model.User, mobileVeri return nil, err } if mobileAuth != nil && !mobileAuth.IsUserEmpty() { - return nil, jsonerr.New(mobileAuth, model.ErrCodeJsonUserAlreadyExist) + auth2.RemoveUserInfo(mobileAuth.Token) + if newAuthInfo, err := auth2.BindUser(mobileAuth, user); err == nil { + return nil, jsonerr.New(newAuthInfo, model.ErrCodeJsonUserAlreadyExist) + } else { + return nil, err + } } } else if inAuthInfo != nil { user.Mobile = nil