aa

business/jxstore/financial/pay.go

@@ -40,10 +40,10 @@ func OnPayFinished(order *model.Order) (err error) {
 		db = dao.GetDB()
 	)
 	globals.SugarLogger.Debugf("OnPayFinished begin modify account order: %v", utils.Format4Output(order, false))
-	dao.Begin(db)
+	txDB, _ := dao.Begin(db)
 	defer func() {
 		if r := recover(); r != nil {
-			dao.Rollback(db)
+			dao.Rollback(db, txDB)
 			panic(r)
 		}
 	}()
@@ -59,13 +59,13 @@ func OnPayFinished(order *model.Order) (err error) {
 		//如果是账户充值（发布任务等）
 		//账户收入
 		if err = AddIncomeUpdateAccount(db, userBill, model.BillTypeInvest, order.PayPrice, 0); err != nil {
-			dao.Rollback(db)
+			dao.Rollback(db, txDB)
 		}
 	default:
 		globals.SugarLogger.Debugf("OnPayFinished 暂不支持此订单类型 order: %v", utils.Format4Output(order, false))
 		return fmt.Errorf("暂不支持此订单类型！")
 	}
-	dao.Commit(db)
+	dao.Commit(db, txDB)
 	globals.SugarLogger.Debugf("OnPayFinished end modify account ...")
 	return err
 }
@@ -75,10 +75,10 @@ func OnCashFinished(order *model.Order) (err error) {
 		db = dao.GetDB()
 	)
 	globals.SugarLogger.Debugf("OnCashFinished begin modify account order: %v", utils.Format4Output(order, false))
-	dao.Begin(db)
+	txDB, _ := dao.Begin(db)
 	defer func() {
 		if r := recover(); r != nil {
-			dao.Rollback(db)
+			dao.Rollback(db, txDB)
 			panic(r)
 		}
 	}()
@@ -94,13 +94,13 @@ func OnCashFinished(order *model.Order) (err error) {
 		//如果是账户提现
 		//账户支出
 		if err = AddExpendUpdateAccount(db, userBill, model.BillTypeCash, order.PayPrice, 0); err != nil {
-			dao.Rollback(db)
+			dao.Rollback(db, txDB)
 		}
 	default:
 		globals.SugarLogger.Debugf("OnPayFinished 暂不支持此订单类型 order: %v", utils.Format4Output(order, false))
 		return fmt.Errorf("暂不支持此订单类型！")
 	}
-	dao.Commit(db)
+	dao.Commit(db, txDB)
 	globals.SugarLogger.Debugf("OnCashFinished end modify account ...")
 	return err
 }