From 512df1942a010fea665255979dcf89ef2a6403cd Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Thu, 4 Jul 2019 18:24:59 +0800
Subject: [PATCH] =?UTF-8?q?-=20UpdateStoreVendorMap=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84ReadStore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 88c942ff4..7e8fdeaa1 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -799,23 +799,23 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
 	if db == nil {
 		db = dao.GetDB()
 	}
-	if vendorStoreID := utils.Interface2String(payload["vendorStoreID"]); vendorStoreID != "" {
+	storeMap := &model.StoreMap{
+		StoreID:  storeID,
+		VendorID: vendorID,
+	}
+	storeMap.DeletedAt = utils.DefaultTimeValue
+	if err = dao.GetEntity(db, storeMap, model.FieldStoreID, model.FieldVendorID, model.FieldDeletedAt); err != nil {
+		return 0, err
+	}
+	valid := dao.StrictMakeMapByStructObject(payload, storeMap, userName)
+	if vendorStoreID := utils.Interface2String(valid["vendorStoreID"]); vendorStoreID != "" {
 		vendorStoreInfo, err2 := storeHandler.ReadStore(vendorStoreID)
 		if err = err2; err == nil {
-			payload["deliveryType"] = vendorStoreInfo.DeliveryType
+			valid["deliveryType"] = vendorStoreInfo.DeliveryType
 		}
 		err = nil // todo 忽略读不到DeliveryType的错误
 	}
 	if err == nil {
-		storeMap := &model.StoreMap{
-			StoreID:  storeID,
-			VendorID: vendorID,
-		}
-		storeMap.DeletedAt = utils.DefaultTimeValue
-		if err = dao.GetEntity(db, storeMap, model.FieldStoreID, model.FieldVendorID, model.FieldDeletedAt); err != nil {
-			return 0, err
-		}
-		valid := dao.StrictMakeMapByStructObject(payload, storeMap, userName)
 		// globals.SugarLogger.Debug(utils.Format4Output(valid, false))
 		if len(valid) > 0 {
 			dao.Begin(db)