diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index 3eea6ae23..2d96e8e5e 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -286,7 +286,7 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string if authType == "weixinmini" || authType == "weixinapp" { appID := strings.Split(authSecret, ",")[0] // 菜市商家 // // // 京西商城 - if appID == "wx08a5c2a8581414ff" || appID == "wx2d6949f724b2541d" || appID == "wx18111a41fd17f24f" || appID == "wx4b5930c13f8b1170" { //菜市或者果园 + if appID == model.JXC4BusinessAppId || appID == "wx2d6949f724b2541d" || appID == "wx18111a41fd17f24f" || appID == model.JXC4AppId { //菜市或者果园 if authInfo.AuthBindInfo.UserID != "" { binds, err := dao.GetUserBindAuthInfo(dao.GetDB(), authInfo.AuthBindInfo.UserID, 0, nil, "", "", []string{"wx2bb99eb5d2c9b82c", "wx4b5930c13f8b1170"}) if err != nil { diff --git a/business/model/const.go b/business/model/const.go index 63892f57b..0089be0f6 100644 --- a/business/model/const.go +++ b/business/model/const.go @@ -498,3 +498,9 @@ func IsAfsOrderFinalStatus(status int) bool { func IsWaybillFinalStatus(status int) bool { return status >= WaybillStatusEndBegin && status <= WaybillStatusEndEnd } + +const ( + JXC4AppId = "wx4b5930c13f8b1170" // 京西菜市appId + JXC4BusinessAppId = "wx08a5c2a8581414ff" // 京西商家appId + JXC4TiktokAppId = "tta6a1d01c399f264201" // 抖音appID +) diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index c80bfd436..8e928914f 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -3,6 +3,7 @@ package localjx import ( "errors" "fmt" + "git.rosy.net.cn/baseapi/platformapi/tiktok" "math" "regexp" "strings" @@ -325,6 +326,9 @@ func Pay4Order(ctx *jxcontext.Context, orderID int64, payType int, vendorPayType err = dao.CreateEntity(dao.GetDB(), orderPay) } case model.PayTypeTL: + if subAppID == tiktok.TiktokAppId { + subAppID = model.JXC4AppId // 京西商城 + } if orderPay, err = pay4OrderByTL(ctx, order, payType, vendorPayType, subAppID); err == nil && orderPay != nil { dao.WrapAddIDCULDEntity(orderPay, ctx.GetUserName()) err = dao.CreateEntity(dao.GetDB(), orderPay)