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

1

Browse Source
This commit is contained in:
邹宗楠
2022-05-26 09:50:23 +08:00
parent 48e8919377
commit d9d30a18f1
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/jxutils/jxcontext/jxcontext.go
View File

@@ -55,6 +55,9 @@ func New(notUsed interface{}, token string, w http.ResponseWriter, r *http.Reque
globals.SugarLogger.Debugf("jxcontext New, token:%s", token) globals.SugarLogger.Debugf("jxcontext New, token:%s", token)
if auth2.IsV2Token(token) { if auth2.IsV2Token(token) {
authInfo, err2 := auth2.GetTokenInfo(token) authInfo, err2 := auth2.GetTokenInfo(token)
globals.SugarLogger.Debug("authInfo==============",authInfo.Name)
globals.SugarLogger.Debug("authInfo==============",authInfo.UserID)
globals.SugarLogger.Debug("authInfo==============",err2)
if err = err2; err == nil { if err = err2; err == nil {
ctx.userInfo = authInfo ctx.userInfo = authInfo
globals.SugarLogger.Debugf("jxcontext New, V2 authInfo:%s", utils.Format4Output(authInfo, true)) globals.SugarLogger.Debugf("jxcontext New, V2 authInfo:%s", utils.Format4Output(authInfo, true))

4
business/partner/purchase/jx/localjx/tonglianpay.go
View File

@@ -3,6 +3,7 @@ package localjx
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"git.rosy.net.cn/jx-callback/business/auth2/authprovider/douyin"
"strings" "strings"
"time" "time"
@@ -40,7 +41,8 @@ func pay4OrderByTL(ctx *jxcontext.Context, order *model.GoodsOrder, payType int,
} }
if vendorPayType == tonglianpayapi.PayTypeWxXcx { if vendorPayType == tonglianpayapi.PayTypeWxXcx {
param.SubAppID = subAppID param.SubAppID = subAppID
if authInfo, err := ctx.GetV2AuthInfo(); err == nil && authInfo.GetAuthType() == weixin.AuthTypeMini && authInfo.GetAuthTypeID() == subAppID { authInfo, err := ctx.GetV2AuthInfo()
if err == nil && (authInfo.GetAuthType() == weixin.AuthTypeMini || authInfo.GetAuthID() == douyin.AuthTypeTiktokMini)&& authInfo.GetAuthTypeID() == subAppID {
param.Acct = authInfo.GetAuthID() param.Acct = authInfo.GetAuthID()
} }
} }