1
This commit is contained in:
@@ -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 {
|
||||
|
||||
@@ -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
|
||||
)
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user