From 7a1972680bc3db037384d3e6f59e538e5932d9c9 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Fri, 1 Nov 2019 21:02:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=BB=B7=E6=A0=BC=E5=8C=85=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E7=94=A8=E4=BA=8B=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/cms.go | 3 +--
 business/model/dao/dao.go   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go
index 8d6dc1eae..9aa2f3da6 100644
--- a/business/jxstore/cms/cms.go
+++ b/business/jxstore/cms/cms.go
@@ -336,15 +336,14 @@ func UpdateConfig(ctx *jxcontext.Context, key, configType, value string) (hint s
 			dao.Rollback(db)
 			return "", err
 		}
+		dao.Commit(db)
 		for _, v := range storeMapList {
 			if _, err = dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, &model.StoreSkuBind{}, nil, ctx.GetUserName(), map[string]interface{}{
 				model.FieldStoreID: v.StoreID,
 			}, dao.GetSyncStatusStructField(model.VendorNames[v.VendorID]), model.SyncFlagPriceMask); err != nil {
-				dao.Rollback(db)
 				return "", err
 			}
 		}
-		dao.Commit(db)
 	case model.ConfigTypeFreightPack:
 		dao.Commit(db)
 		storeMapList, err := dao.GetStoresMapList(db, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, "")
diff --git a/business/model/dao/dao.go b/business/model/dao/dao.go
index 45f76a448..f3c3803f8 100644
--- a/business/model/dao/dao.go
+++ b/business/model/dao/dao.go
@@ -13,7 +13,7 @@ import (
 
 const (
 	useGetRowsWhenGetRow      = true
-	transactionWarningSeconds = 2 * 60 // 5分钟
+	transactionWarningSeconds = 10 * 60 // 5分钟
 )
 
 type DaoDB struct {