From 169a5bd3746546c6f1fc45b2aae6de8ac3eab7cc Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 31 Oct 2018 21:10:14 +0800
Subject: [PATCH] - fix possible transaction bug in UpdateStore

---
 business/jxstore/cms/store.go | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index ee9ddfb72..c0e12c133 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -262,10 +262,7 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa
 		db := dao.GetDB()
 		dao.Begin(db)
 		defer func() {
-			if r := recover(); r != nil {
-				dao.Rollback(db)
-				panic(r)
-			}
+			dao.Rollback(db)
 		}()
 		if num, err = dao.UpdateEntityLogically(db, store, valid, userName, nil); err == nil && num == 1 {
 			dummy := &model.StoreMap{}
@@ -277,9 +274,6 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa
 				_, err = CurVendorSync.SyncStore(ctx, db, -1, store.ID, false, userName)
 			}
 		}
-		if err != nil {
-			dao.Rollback(db)
-		}
 	}
 	return num, err
 }