删除旧充值方式

This commit is contained in:
richboo111
2022-07-25 11:00:56 +08:00
4 changed files with 31 additions and 12 deletions

View File

@@ -283,7 +283,7 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) {
return err
}
userOrder := model.UserVendorOrder{LocalWayBill: order.OrderID}
if err := dao.GetEntity(db, &userOrder, `LocalWayBill`); err != nil {
if err := dao.GetEntity(db, &userOrder, "LocalWayBill"); err != nil {
dao.Rollback(db, txdb)
return err
}
@@ -296,7 +296,13 @@ 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