aa

business/jxstore/event/event.go

@@ -67,45 +67,45 @@ func AddOperateEvent(ctx *jxcontext.Context, accessUUID, jsonData string, errCod
 		ErrMsg:       errMsg,
 		UseTime:      useTime,
 	}
-	dao.Begin(db)
+	txDB , _ := dao.Begin(db)
 	defer func() {
 		if r := recover(); r != nil {
-			dao.Rollback(db)
+			dao.Rollback(db, txDB)
 			panic(r)
 		}
 	}()
 	err = dao.CreateEntity(db, event)
-	dao.Commit(db)
+	dao.Commit(db, txDB)
 	return err
 }
 
 func AddOperateEventDetail(db *dao.DaoDB, operateEventDetail *model.OperateEventDetail) (err error) {
-	dao.Begin(db)
+	txDB , _ := dao.Begin(db)
 	defer func() {
 		if r := recover(); r != nil {
-			dao.Rollback(db)
+			dao.Rollback(db, txDB)
 			panic(r)
 		}
 	}()
 	operateEventDetail.BeforeData = utils.LimitUTF8StringLen(operateEventDetail.BeforeData, 3200)
 	operateEventDetail.AfterData = utils.LimitUTF8StringLen(operateEventDetail.AfterData, 3200)
 	err = dao.CreateEntity(db, operateEventDetail)
-	dao.Commit(db)
+	dao.Commit(db, txDB)
 	return err
 }
 
 func DeleteOperateEventAndDetail(ctx *jxcontext.Context, deleteTime time.Time) (err error) {
 	db := dao.GetDB()
-	dao.Begin(db)
+	txDB , _ := dao.Begin(db)
 	defer func() {
 		if r := recover(); r != nil {
-			dao.Rollback(db)
+			dao.Rollback(db, txDB)
 			panic(r)
 		}
 	}()
 	dao.DeleteOperateEventDetail(db, deleteTime)
 	dao.DeleteOperateEvent(db, deleteTime)
-	dao.Commit(db)
+	dao.Commit(db, txDB)
 	return err
 }