Fixed trans

LyricTian · Nov 5, 2019 · 42d19f1 · 42d19f1
1 parent 94c410a
commit 42d19f1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/internal/app/bll/impl/internal/b_common.go b/internal/app/bll/impl/internal/b_common.go
@@ -39,6 +39,13 @@ func ExecTrans(ctx context.Context, transModel model.ITrans, fn TransFunc) error
 		return err
 	}
 
+	defer func() {
+		if r := recover(); r != nil {
+			_ = transModel.Rollback(ctx, trans)
+			panic(r)
+		}
+	}()
+
 	err = fn(icontext.NewTrans(ctx, trans))
 	if err != nil {
 		_ = transModel.Rollback(ctx, trans)

diff --git a/internal/app/model/impl/gorm/internal/model/model.go b/internal/app/model/impl/gorm/internal/model/model.go
@@ -23,6 +23,13 @@ func ExecTrans(ctx context.Context, db *gorm.DB, fn TransFunc) error {
 		return err
 	}
 
+	defer func() {
+		if r := recover(); r != nil {
+			_ = transModel.Rollback(ctx, trans)
+			panic(r)
+		}
+	}()
+
 	ctx = icontext.NewTrans(ctx, trans)
 	err = fn(ctx)
 	if err != nil {