From 853fd7c84660f5ba46870238720e3840cd2fc644 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Tue, 23 Oct 2018 21:39:02 +0800
Subject: [PATCH] - wrong use and implementation of  GetMultiStoreHandler

---
 business/jxstore/cms/store.go | 4 ++--
 business/jxstore/cms/sync.go  | 8 ++++----
 controllers/cms_store.go      | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 9ed21768c..462b1fa66 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -291,7 +291,7 @@ func GetStoreVendorMaps(ctx *jxcontext.Context, db *dao.DaoDB, storeID int, vend
 }
 
 func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendorID int, storeMap *model.StoreMap, userName string) (outStoreMap *model.StoreMap, err error) {
-	if handler := CurVendorSync.GetMultiStoreHandler(vendorID); handler != nil {
+	if handler := CurVendorSync.GetStoreHandler(vendorID); handler != nil {
 		store, err2 := handler.ReadStore(storeMap.VendorStoreID)
 		if err = err2; err == nil {
 			dao.WrapAddIDCULDEntity(storeMap, userName)
@@ -347,7 +347,7 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
 		db = dao.GetDB()
 	}
 	if vendorStoreID := utils.Interface2String(payload["vendorStoreID"]); vendorStoreID != "" {
-		if handler := CurVendorSync.GetMultiStoreHandler(vendorID); handler != nil {
+		if handler := CurVendorSync.GetStoreHandler(vendorID); handler != nil {
 			jdStore, err2 := handler.ReadStore(vendorStoreID)
 			if err = err2; err == nil {
 				payload["deliveryType"] = jdStore.DeliveryType
diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go
index 5dff79bfd..3ecb269ab 100644
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -107,15 +107,15 @@ func (v *VendorSync) GetStoreHandler(vendorID int) partner.IPurchasePlatformHand
 }
 
 func (v *VendorSync) GetMultiStoreHandler(vendorID int) partner.IMultipleStoresHandler {
-	if v.PurchaseHandlers[vendorID] != nil {
-		return v.PurchaseHandlers[vendorID].(partner.IMultipleStoresHandler)
+	if handler, ok := v.PurchaseHandlers[vendorID].(partner.IMultipleStoresHandler); ok {
+		return handler
 	}
 	return nil
 }
 
 func (v *VendorSync) GetSingleStoreHandler(vendorID int) partner.ISingleStoreHandler {
-	if v.PurchaseHandlers[vendorID] != nil {
-		return v.PurchaseHandlers[vendorID].(partner.ISingleStoreHandler)
+	if handler, ok := v.PurchaseHandlers[vendorID].(partner.ISingleStoreHandler); ok {
+		return handler
 	}
 	return nil
 }
diff --git a/controllers/cms_store.go b/controllers/cms_store.go
index bcbd2bf01..e11db43cc 100644
--- a/controllers/cms_store.go
+++ b/controllers/cms_store.go
@@ -120,8 +120,8 @@ func (c *StoreController) GetStoreVendorMaps() {
 // @Title 修改门店映射信息
 // @Description 修改门店映射信息
 // @Param	token			header		string	true	"认证token"
-// @Param	storeID			query		int		true	"门店ID，payload中的相应字段会被忽略"
-// @Param	vendorID		query		int		true	"厂商ID，payload中的相应字段会被忽略"
+// @Param	storeID			query		int		true	"门店ID"
+// @Param	vendorID		query		int		true	"厂商ID"
 // @Param	payload			formData	string	true	"json数据，storeMap对象"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult