From 37d6458cb8496837d8f08c59c64a4c0691035bec Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Tue, 4 Feb 2020 10:19:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E7=95=99isSync=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8=E6=94=B9=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 8b3c58128..f71cc6186 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -698,10 +698,6 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa
 	if payload["autoEnableAt"] != nil {
 		payload["autoEnableAt"] = utils.Time2Date(utils.Str2Time(utils.Interface2String(payload["autoEnableAt"])))
 	}
-	// 暂时不开放isSync
-	if payload["isSync"] != nil {
-		delete(payload, "isSync")
-	}
 	valid := dao.StrictMakeMapByStructObject2(payload, store, &outStore, userName)
 	if err = checkStoreDeliveryRange(utils.Interface2String(valid["deliveryRange"])); err != nil {
 		return 0, err
@@ -1077,7 +1073,6 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
 	storeMap.Status = model.StoreStatusOpened
 	storeMap.DeliveryType = model.StoreDeliveryTypeByStore
 	storeMap.SyncStatus = 0
-	storeMap.IsSync = 1 // 暂时禁用isSync
 	if vendorID != model.VendorIDJX {
 		if storeMap.VendorOrgCode == "" {
 			return nil, fmt.Errorf("必须指定平台分账号信息")
@@ -1171,6 +1166,10 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
 			return 0, ErrCanNotFindVendor
 		}
 	}
+	// 暂时不开放isSync
+	if payload["isSync"] != nil {
+		payload["isSync"] = 1
+	}
 	if db == nil {
 		db = dao.GetDB()
 	}