pay
This commit is contained in:
@@ -3,6 +3,7 @@ package cms
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"git.rosy.net.cn/jx-callback/business/jxstore/event"
|
"git.rosy.net.cn/jx-callback/business/jxstore/event"
|
||||||
|
"github.com/astaxie/beego/client/orm"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@@ -86,6 +87,7 @@ func Pay(ctx *jxcontext.Context, orderID string, payType int, vendorPayType, app
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
var (
|
var (
|
||||||
|
txDB orm.TxOrmer
|
||||||
db = dao.GetDB()
|
db = dao.GetDB()
|
||||||
order = &model.Order{
|
order = &model.Order{
|
||||||
OrderID: orderID,
|
OrderID: orderID,
|
||||||
@@ -118,22 +120,22 @@ func Pay(ctx *jxcontext.Context, orderID string, payType int, vendorPayType, app
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debug("检验初始数据情况", order.OrderID, order.PayPrice, order.PayMethod)
|
globals.SugarLogger.Debug("检验初始数据情况", order.OrderID, order.PayPrice, order.PayMethod)
|
||||||
txdb, _ := dao.Begin(db)
|
//txDB, _ := dao.Begin(db)
|
||||||
defer func() {
|
//defer func() {
|
||||||
if r := recover(); r != nil {
|
// if r := recover(); r != nil {
|
||||||
panic(r)
|
// panic(r)
|
||||||
}
|
// }
|
||||||
}()
|
//}()
|
||||||
//微信支付实际金额更新到数据库
|
//微信支付实际金额更新到数据库
|
||||||
if _, err := dao.UpdateEntityTx(txdb, &order, "PayPrice"); err != nil {
|
if _, err := dao.UpdateEntityTx(txDB, &order); err != nil {
|
||||||
dao.Rollback(db, txdb)
|
//dao.Rollback(db, txDB)
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if _, err := dao.UpdateEntityTx(txdb, &order, "PayMethod"); err != nil {
|
//if _, err := dao.UpdateEntityTx(txDB, &order, "PayMethod"); err != nil {
|
||||||
dao.Rollback(db, txdb)
|
// dao.Rollback(db, txDB)
|
||||||
return nil, err
|
// return nil, err
|
||||||
}
|
//}
|
||||||
dao.Commit(db, txdb)
|
//dao.Commit(db, txDB)
|
||||||
globals.SugarLogger.Debug("经过更新操作后的数据after=========================", order.OrderID, order.PayPrice, order.PayMethod)
|
globals.SugarLogger.Debug("经过更新操作后的数据after=========================", order.OrderID, order.PayPrice, order.PayMethod)
|
||||||
globals.SugarLogger.Debugf("pay begin……")
|
globals.SugarLogger.Debugf("pay begin……")
|
||||||
err = dao.GetEntity(db, order, "OrderID")
|
err = dao.GetEntity(db, order, "OrderID")
|
||||||
|
|||||||
Reference in New Issue
Block a user