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 10:14:33 +08:00
parent d9d30a18f1
commit 2549082750
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,9 +55,6 @@ 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))

2
business/partner/purchase/jx/localjx/order.go
View File

@@ -236,8 +236,6 @@ func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64,
if jxOrder.OrderType == model.OrderTypeMatter { if jxOrder.OrderType == model.OrderTypeMatter {
checkMatterDeliveryAddress(deliveryAddress) checkMatterDeliveryAddress(deliveryAddress)
} }
globals.SugarLogger.Debug("outorder====", outJxOrder.TotalPrice, outJxOrder.FreightPrice)
globals.SugarLogger.Debug("jxOrder=====", jxOrder.TotalPrice, jxOrder.FreightPrice)
if createType == OrderCreateTypeNormal { if createType == OrderCreateTypeNormal {
if jxOrder.OrderType == model.OrderTypeDefendPrice && jxOrder.IsPriceDefend != model.YES { if jxOrder.OrderType == model.OrderTypeDefendPrice && jxOrder.IsPriceDefend != model.YES {
vendorOrderID := buildDefendPriceOrder(ctx, jxOrder, addressID) vendorOrderID := buildDefendPriceOrder(ctx, jxOrder, addressID)

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

@@ -42,7 +42,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
authInfo, err := ctx.GetV2AuthInfo() authInfo, err := ctx.GetV2AuthInfo()
if err == nil && (authInfo.GetAuthType() == weixin.AuthTypeMini || authInfo.GetAuthID() == douyin.AuthTypeTiktokMini)&& authInfo.GetAuthTypeID() == subAppID { globals.SugarLogger.Debug("11111111111111111111",authInfo.GetAuthType(),)
if err == nil && (authInfo.GetAuthType() == weixin.AuthTypeMini || authInfo.GetAuthType() == douyin.AuthTypeTiktokMini)&& authInfo.GetAuthTypeID() == subAppID {
param.Acct = authInfo.GetAuthID() param.Acct = authInfo.GetAuthID()
} }
} }