From 5ce66681853b9f6efe0f4ae454021e08d1b69468 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Fri, 26 Feb 2021 21:08:48 +0800
Subject: [PATCH 1/2] aa

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

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index b656cdfa3..1feb65f08 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -1190,14 +1190,16 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
 			return nil, fmt.Errorf("必须指定平台分账号信息")
 		}
 		if handler := CurVendorSync.GetStoreHandler(vendorID); handler != nil {
-			store, err2 := handler.ReadStore(ctx, vendorOrgCode, storeMap.VendorStoreID)
-			if err = err2; err == nil || storeMap.IsSync == 0 {
-				if store != nil {
-					storeMap.DeliveryType = store.DeliveryType
-					storeMap.Status = store.Status
+			if vendorOrgCode != "5873" {
+				store, err2 := handler.ReadStore(ctx, vendorOrgCode, storeMap.VendorStoreID)
+				if err = err2; err == nil || storeMap.IsSync == 0 {
+					if store != nil {
+						storeMap.DeliveryType = store.DeliveryType
+						storeMap.Status = store.Status
+					}
+					err = nil
+					storeMap.SyncStatus = model.SyncFlagModifiedMask | model.SyncFlagStoreName | model.SyncFlagStoreAddress // 新增绑定门店是修改的概念
 				}
-				err = nil
-				storeMap.SyncStatus = model.SyncFlagModifiedMask | model.SyncFlagStoreName | model.SyncFlagStoreAddress // 新增绑定门店是修改的概念
 			}
 		} else {
 			err = ErrCanNotFindVendor

From 2060998750dc9bbc832cebcae9c7690fb0ebca44 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Fri, 26 Feb 2021 21:26:28 +0800
Subject: [PATCH 2/2] aa

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

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 1feb65f08..8be7abc60 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -18,8 +18,10 @@ import (
 
 	"git.rosy.net.cn/jx-callback/business/authz"
 
+	"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
 	"git.rosy.net.cn/baseapi/platformapi/yinbaoapi"
 
+	"git.rosy.net.cn/jx-callback/globals/api/apimanager"
 	"git.rosy.net.cn/jx-callback/globals/refutil"
 
 	"github.com/360EntSecGroup-Skylar/excelize"
@@ -1278,13 +1280,13 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
 	} else if vendorID == model.VendorIDMTWM {
 		//如果是绑的美团超市，要去更新token
 		if outStoreMap.VendorOrgCode == globals.Mtwm2Code {
-			// mtapi := apimanager.CurAPIManager.GetAPI(model.VendorIDMTWM, outStoreMap.VendorOrgCode).(*mtwmapi.API)
-			// if result, err := mtapi.GetOAuthCode(outStoreMap.VendorStoreID); result != nil && err == nil {
-			// 	if token, err := mtapi.GetAccessToken(result.(string)); err == nil && token != nil {
-			// 		outStoreMap.MtwmToken = token.(string)
-			// 		dao.UpdateEntity(db, outStoreMap, "MtwmToken")
-			// 	}
-			// }
+			mtapi := apimanager.CurAPIManager.GetAPI(model.VendorIDMTWM, outStoreMap.VendorOrgCode).(*mtwmapi.API)
+			if result, err := mtapi.GetOAuthCode(outStoreMap.VendorStoreID); result != nil && err == nil {
+				if token, err := mtapi.GetAccessToken(result.(string)); err == nil && token != nil {
+					outStoreMap.MtwmToken = token.(string)
+					dao.UpdateEntity(db, outStoreMap, "MtwmToken")
+				}
+			}
 		}
 	}
 	if globals.IsAddEvent {