修改冲突

2022-07-26 11:40:30 +08:00
parent fa903fe325
commit 1d2c5e7cb3
1 changed files with 0 additions and 4 deletions
--- a/business/jxstore/financial/financial.go
+++ b/business/jxstore/financial/financial.go
@@ -296,13 +296,9 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) {
 			if call.TrxStatus == tonglianpayapi.TrxStatusSuccess {
 				switch order.OrderType {
 				case model.PayType4Express:
-<<<<<<< HEAD
-					err = q_bida.CreateOrder2QBiDa(&userOrder)
-=======
 					err = q_bida.CreateOrder2QBiDa(&userOrder, order.OrderID)
 				case model.PayType4Member, model.PayType4Recharge:
 					err = OnPayFinished(order)
->>>>>>> 273aa3164fbc887ac30837bd4ce1b25410ca498c
 				}
 			}
 			return err