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-07-07 16:33:09 +08:00
parent e83f055590
commit 32ac1c6a01
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/auth2/auth2.go
View File

@@ -286,7 +286,7 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string
if authType == "weixinmini" || authType == "weixinapp" { if authType == "weixinmini" || authType == "weixinapp" {
appID := strings.Split(authSecret, ",")[0] 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 != "" { if authInfo.AuthBindInfo.UserID != "" {
binds, err := dao.GetUserBindAuthInfo(dao.GetDB(), authInfo.AuthBindInfo.UserID, 0, nil, "", "", []string{"wx2bb99eb5d2c9b82c", "wx4b5930c13f8b1170"}) binds, err := dao.GetUserBindAuthInfo(dao.GetDB(), authInfo.AuthBindInfo.UserID, 0, nil, "", "", []string{"wx2bb99eb5d2c9b82c", "wx4b5930c13f8b1170"})
if err != nil { if err != nil {

6
business/model/const.go
View File

@@ -498,3 +498,9 @@ func IsAfsOrderFinalStatus(status int) bool {
func IsWaybillFinalStatus(status int) bool { func IsWaybillFinalStatus(status int) bool {
return status >= WaybillStatusEndBegin && status <= WaybillStatusEndEnd return status >= WaybillStatusEndBegin && status <= WaybillStatusEndEnd
} }
const (
JXC4AppId = "wx4b5930c13f8b1170" // 京西菜市appId
JXC4BusinessAppId = "wx08a5c2a8581414ff" // 京西商家appId
JXC4TiktokAppId = "tta6a1d01c399f264201" // 抖音appID
)

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

@@ -3,6 +3,7 @@ package localjx
import ( import (
"errors" "errors"
"fmt" "fmt"
"git.rosy.net.cn/baseapi/platformapi/tiktok"
"math" "math"
"regexp" "regexp"
"strings" "strings"
@@ -325,6 +326,9 @@ func Pay4Order(ctx *jxcontext.Context, orderID int64, payType int, vendorPayType
err = dao.CreateEntity(dao.GetDB(), orderPay) err = dao.CreateEntity(dao.GetDB(), orderPay)
} }
case model.PayTypeTL: case model.PayTypeTL:
if subAppID == tiktok.TiktokAppId {
subAppID = model.JXC4AppId // 京西商城
}
if orderPay, err = pay4OrderByTL(ctx, order, payType, vendorPayType, subAppID); err == nil && orderPay != nil { if orderPay, err = pay4OrderByTL(ctx, order, payType, vendorPayType, subAppID); err == nil && orderPay != nil {
dao.WrapAddIDCULDEntity(orderPay, ctx.GetUserName()) dao.WrapAddIDCULDEntity(orderPay, ctx.GetUserName())
err = dao.CreateEntity(dao.GetDB(), orderPay) err = dao.CreateEntity(dao.GetDB(), orderPay)