1
This commit is contained in:
@@ -5,6 +5,7 @@ import (
|
|||||||
"git.rosy.net.cn/baseapi/utils"
|
"git.rosy.net.cn/baseapi/utils"
|
||||||
"git.rosy.net.cn/jx-callback/business/model"
|
"git.rosy.net.cn/jx-callback/business/model"
|
||||||
"git.rosy.net.cn/jx-callback/business/model/dao"
|
"git.rosy.net.cn/jx-callback/business/model/dao"
|
||||||
|
"git.rosy.net.cn/jx-callback/globals"
|
||||||
"git.rosy.net.cn/jx-callback/globals/api"
|
"git.rosy.net.cn/jx-callback/globals/api"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -38,29 +39,30 @@ func SendPayInfo2Ali(payOrder *model.WithdrawalRecord, param *model.AddWithdrawa
|
|||||||
func UpdateUserMoney(payOrder *model.WithdrawalRecord, userBill *model.UserBill) error {
|
func UpdateUserMoney(payOrder *model.WithdrawalRecord, userBill *model.UserBill) error {
|
||||||
// 如果支付成功
|
// 如果支付成功
|
||||||
db := dao.GetDB()
|
db := dao.GetDB()
|
||||||
tx, _ := dao.Begin(db)
|
//tx, _ := dao.Begin(db)
|
||||||
defer func() {
|
//defer func() {
|
||||||
if r := recover(); r != nil {
|
// if r := recover(); r != nil {
|
||||||
panic(r)
|
// panic(r)
|
||||||
}
|
// }
|
||||||
dao.Commit(db, tx)
|
// dao.Commit(db, tx)
|
||||||
}()
|
//}()
|
||||||
|
|
||||||
switch payOrder.OrderStatus {
|
switch payOrder.OrderStatus {
|
||||||
case model.WithdrawalRecordPaySuccess:
|
case model.WithdrawalRecordPaySuccess:
|
||||||
userBill.AccountBalance = userBill.AccountBalance - payOrder.WithdrawalMoney
|
userBill.AccountBalance = userBill.AccountBalance - payOrder.WithdrawalMoney
|
||||||
bill := &userBill
|
bill := &userBill
|
||||||
if _, err := dao.UpdateEntityTx(tx, bill, "AccountBalance"); err != nil {
|
if _, err := dao.UpdateEntity(db, bill, "AccountBalance"); err != nil {
|
||||||
dao.Rollback(db, tx)
|
globals.SugarLogger.Debug("err=======", err)
|
||||||
|
//dao.Rollback(db, tx)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := dao.CreateEntityTx(tx, payOrder); err != nil {
|
if err := dao.CreateEntity(db, payOrder); err != nil {
|
||||||
dao.Rollback(db, tx)
|
// dao.Rollback(db, tx)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
case model.WithdrawalWaitRecord, model.WithdrawalRecordFail, model.WithdrawalRecordPayFail:
|
case model.WithdrawalWaitRecord, model.WithdrawalRecordFail, model.WithdrawalRecordPayFail:
|
||||||
if err := dao.CreateEntityTx(tx, payOrder); err != nil {
|
if err := dao.CreateEntity(db, payOrder); err != nil {
|
||||||
dao.Rollback(db, tx)
|
// dao.Rollback(db, tx)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user