From 9aaf2a309eda57791b3ac2fe293f2821aaf03e6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 26 May 2022 14:44:26 +0800 Subject: [PATCH] 1 --- .../partner/purchase/jx/localjx/tonglianpay.go | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/business/partner/purchase/jx/localjx/tonglianpay.go b/business/partner/purchase/jx/localjx/tonglianpay.go index ae9466d0a..07c800dd7 100644 --- a/business/partner/purchase/jx/localjx/tonglianpay.go +++ b/business/partner/purchase/jx/localjx/tonglianpay.go @@ -3,7 +3,6 @@ package localjx import ( "encoding/json" "fmt" - "git.rosy.net.cn/jx-callback/business/auth2/authprovider/douyin" "strings" "time" @@ -42,13 +41,7 @@ func pay4OrderByTL(ctx *jxcontext.Context, order *model.GoodsOrder, payType int, if vendorPayType == tonglianpayapi.PayTypeWxXcx { param.SubAppID = subAppID authInfo, err := ctx.GetV2AuthInfo() - globals.SugarLogger.Debug("11111111111111111111", authInfo.GetAuthType(), err == nil && (authInfo.GetAuthType() == weixin.AuthTypeMini || authInfo.GetAuthType() == douyin.AuthTypeTiktokMini) && (authInfo.GetAuthTypeID() == subAppID || authInfo.GetAuthTypeID() == "tta6a1d01c399f264201")) - globals.SugarLogger.Debug("11111111111111111111", err) - globals.SugarLogger.Debug("11111111111111111111", authInfo.GetAuthTypeID()) - globals.SugarLogger.Debug("11111111111111111111", subAppID) - globals.SugarLogger.Debug("11111111111111111111", authInfo.GetAuthID()) - - if err == nil && (authInfo.GetAuthType() == weixin.AuthTypeMini || authInfo.GetAuthType() == douyin.AuthTypeTiktokMini) && (authInfo.GetAuthTypeID() == subAppID || authInfo.GetAuthTypeID() == "tta6a1d01c399f264201") { + if err == nil && authInfo.GetAuthType() == weixin.AuthTypeMini && authInfo.GetAuthTypeID() == subAppID { param.Acct = authInfo.GetAuthID() } } @@ -68,17 +61,13 @@ func pay4OrderByTL(ctx *jxcontext.Context, order *model.GoodsOrder, payType int, Charset: "UTF-8", } err = api.TLpayAPI.CreateH5UnitorderOrder(param2) + globals.SugarLogger.Debug("h5=========", err) } else { result, err := api.TLpayAPI.CreateUnitorderOrder(param) - globals.SugarLogger.Debug("222222222222222", err) - globals.SugarLogger.Debug("222222222222222", fmt.Sprintf("%+v", result)) if err == nil { var result2 tonglianpayapi.PayInfo json.Unmarshal([]byte(result.PayInfo), &result2) - globals.SugarLogger.Debug("222222222222222result2", fmt.Sprintf("%+v", result2)) prePayID := result2.Package[strings.LastIndex(result2.Package, "=")+1 : len(result2.Package)] - globals.SugarLogger.Debug("222222222222222prePayID", prePayID) - orderPay = &model.OrderPay{ PayOrderID: param.Reqsn, PayType: payType,