Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

2022-08-19 11:38:57 +08:00
parent 5bddb01dfa 389e35399e
commit eba79d9399
13 changed files with 107 additions and 59 deletions
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -326,7 +326,7 @@ func Pay4Order(ctx *jxcontext.Context, orderID int64, payType int, vendorPayType
 				err = dao.CreateEntity(dao.GetDB(), orderPay)
 			}
 		case model.PayTypeTL:
-			if subAppID == tiktok.TiktokAppId {
+			if subAppID == tiktok.TiktokAppId || subAppID == tiktok.TiktokJXDJAppID {
 				subAppID = model.JXC4AppId // 京西商城
 			}
 			if orderPay, err = pay4OrderByTL(ctx, order, payType, vendorPayType, subAppID); err == nil && orderPay != nil {