1
This commit is contained in:
@@ -257,6 +257,7 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) {
|
|||||||
order.PayFinishedAt = t1
|
order.PayFinishedAt = t1
|
||||||
order.OriginalData = utils.Format4Output(call, true)
|
order.OriginalData = utils.Format4Output(call, true)
|
||||||
payStatus := 0
|
payStatus := 0
|
||||||
|
order.PayMethod = 2 // 通联微信支付
|
||||||
if call.TrxStatus == tonglianpayapi.TrxStatusSuccess {
|
if call.TrxStatus == tonglianpayapi.TrxStatusSuccess {
|
||||||
order.Status = model.OrderStatusFinished
|
order.Status = model.OrderStatusFinished
|
||||||
payStatus = model.OrderStatusSuccessPay
|
payStatus = model.OrderStatusSuccessPay
|
||||||
|
|||||||
@@ -227,9 +227,7 @@ func CancelWayOrder(ctx *jxcontext.Context, userId string, param *bida.CancelOrd
|
|||||||
tx.Commit()
|
tx.Commit()
|
||||||
case model.OrderStatusSuccessPay: // 支付成功,取消三方订单,本地转取消状态,,原路退款
|
case model.OrderStatusSuccessPay: // 支付成功,取消三方订单,本地转取消状态,,原路退款
|
||||||
// 发起QBiDa取消,过去取消通过,则取消本地!不通过,则不予取消!
|
// 发起QBiDa取消,过去取消通过,则取消本地!不通过,则不予取消!
|
||||||
if err := api.QBiDaAPI.CancelOrder(param); err != nil {
|
api.QBiDaAPI.CancelOrder(param)
|
||||||
return err
|
|
||||||
}
|
|
||||||
// 暂时考虑余额支付渠道,加载order表判断支付渠道方式
|
// 暂时考虑余额支付渠道,加载order表判断支付渠道方式
|
||||||
orderWay := &model.Order{OrderID: param.OrderNo, UserID: userId}
|
orderWay := &model.Order{OrderID: param.OrderNo, UserID: userId}
|
||||||
if err := dao.GetEntity(dao.GetDB(), orderWay, "OrderID", "UserID"); err != nil {
|
if err := dao.GetEntity(dao.GetDB(), orderWay, "OrderID", "UserID"); err != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user