liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改冲突

Browse Source
This commit is contained in:
邹宗楠
2022-07-26 11:40:30 +08:00
parent fa903fe325
commit 1d2c5e7cb3
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxstore/financial/financial.go
View File

@@ -296,13 +296,9 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) {
if call.TrxStatus == tonglianpayapi.TrxStatusSuccess { if call.TrxStatus == tonglianpayapi.TrxStatusSuccess {
switch order.OrderType { switch order.OrderType {
case model.PayType4Express: case model.PayType4Express:
<<<<<<< HEAD
err = q_bida.CreateOrder2QBiDa(&userOrder)
=======
err = q_bida.CreateOrder2QBiDa(&userOrder, order.OrderID) err = q_bida.CreateOrder2QBiDa(&userOrder, order.OrderID)
case model.PayType4Member, model.PayType4Recharge: case model.PayType4Member, model.PayType4Recharge:
err = OnPayFinished(order) err = OnPayFinished(order)
>>>>>>> 273aa3164fbc887ac30837bd4ce1b25410ca498c
} }
} }
return err return err