aa

business/model/dao/dao.go

@@ -8,7 +8,7 @@ import (
 
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/globals"
-	"github.com/astaxie/beego/adapter/orm"
+	"github.com/astaxie/beego/client/orm"
 )
 
 const (
@@ -65,15 +65,15 @@ func GetDB() *DaoDB {
 	return &DaoDB{Db: orm.NewOrm()}
 }
 
-func Begin(db *DaoDB) (err error) {
+func Begin(db *DaoDB) (txDB orm.TxOrmer, err error) {
 	if db.transactionLevel == 0 {
-		err = db.Db.Begin()
+		txDB, err = db.Db.Begin()
 		if err == nil {
 			db.startWatchTransaction()
 		}
 	}
 	db.transactionLevel++
-	return err
+	return txDB, err
 }
 
 func (db *DaoDB) startWatchTransaction() {
@@ -93,11 +93,11 @@ func (db *DaoDB) stopWatchTransaction() {
 	}
 }
 
-func Commit(db *DaoDB) (err error) {
+func Commit(db *DaoDB, txDB orm.TxOrmer) (err error) {
 	if db.transactionLevel == 1 {
 		db.stopWatchTransaction()
-
-		err = db.Db.Commit()
+		err = txDB.Commit()
+		// err = db.Db.Commit()
 		db.transactionLevel = 0
 	} else if db.transactionLevel > 1 {
 		db.transactionLevel--
@@ -105,11 +105,11 @@ func Commit(db *DaoDB) (err error) {
 	return err
 }
 
-func Rollback(db *DaoDB) (err error) {
+func Rollback(db *DaoDB, txDB orm.TxOrmer) (err error) {
 	if db.transactionLevel > 0 {
 		db.stopWatchTransaction()
-
-		err = db.Db.Rollback()
+		err = txDB.Rollback()
+		// err = db.Db.Rollback()
 	}
 	db.transactionLevel = 0
 	return err