From c38a2dbc869fc089824bf14e550d8439ff37b4d3 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 22 Aug 2022 17:09:06 +0800 Subject: [PATCH] =?UTF-8?q?wx=E6=B3=A8=E5=86=8C=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/auth2/auth2.go | 1 + business/jxcallback/scheduler/defsch/defsch.go | 1 + controllers/auth2.go | 5 +++++ 3 files changed, 7 insertions(+) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index bdcc9d794..3666fe313 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -282,6 +282,7 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string } } authInfo = createAuthInfo(user, authBindEx) + globals.SugarLogger.Debug("authInfo==================", authInfo) if user != nil && user.GetID() != "" { userProvider.UpdateLastLogin(user.GetID(), authType, ctx.GetRealRemoteIP()) } diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 781b3dd43..87da90454 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -1038,6 +1038,7 @@ func (s *DefScheduler) swtich2SelfDeliverWithRetry(savedOrderInfo *WatchOrderInf if retryCount > 0 { utils.AfterFuncWithRecover(duration, func() { jxutils.CallMsgHandlerAsync(func() { + s.SelfDeliverDelivering(order, "非专送、快送、混合送订单，转自送失败，调用deriving转自送") s.swtich2SelfDeliverWithRetry(savedOrderInfo, bill, retryCount-1, duration) }, jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID)) }) diff --git a/controllers/auth2.go b/controllers/auth2.go index 16dd72bdd..dcf855b97 100644 --- a/controllers/auth2.go +++ b/controllers/auth2.go @@ -116,6 +116,7 @@ func (c *Auth2Controller) TiktokDecrypt() { // @router /Login [post] func (c *Auth2Controller) Login() { c.callLogin(func(params *tAuth2LoginParams) (retVal interface{}, errCode string, err error) { + globals.SugarLogger.Debug("params.AuthType==============", params.AuthType) if params.AuthType == auth2.AuthTypeMobile { params.AuthIDType = auth2.UserIDMobile } else if params.AuthType == auth2.AuthTypeEmail { @@ -133,14 +134,18 @@ func (c *Auth2Controller) Login() { params.AuthSecret = GetComposedCode2(&c.Controller, params.AuthSecret) } ctx := auth2.NewContext(c.Ctx.ResponseWriter, c.Ctx.Request) + globals.SugarLogger.Debug("params.AuthType, params.AuthID, params.AuthIDType, params.AuthSecret==============", params.AuthType, params.AuthID, params.AuthIDType, params.AuthSecret) authInfo, err := auth2.Login(ctx, params.AuthType, params.AuthID, params.AuthIDType, params.AuthSecret) + globals.SugarLogger.Debug("authInfo==============", authInfo) // TODO 兼容没有取到authid2的错误 if err == nil && authInfo.AuthBindInfo != nil { if authInfo.AuthBindInfo.AuthID2 == "" { + globals.SugarLogger.Debug("fgfggggggg") authInfo.AuthBindInfo.AuthID2 = authInfo.AuthBindInfo.AuthID } retVal = authInfo } + globals.SugarLogger.Debug("retVal==============", retVal) return retVal, "", err }) }