From 6bdc34889359f839eb1377e26f54dab4f619a8fc Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Fri, 29 May 2020 20:02:43 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=88=86=E7=B1=BB=E5=9B=9E=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 4cf6ad9cc..b9c194172 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -309,24 +309,24 @@ func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID in
 		if status == -1 {
 			return fmt.Errorf("京东商城店内分类创建失败！")
 		}
-		flag := false
-		for {
-			result, err := api.JdShopAPI.FindShopCategories()
-			if err != nil {
-				return err
-			}
-			for _, v := range result {
-				if v.Name == storeCat.Name {
-					storeCat.VendorCatID = utils.Int64ToStr(v.CID)
-					flag = true
-					break
-				}
-			}
-			time.Sleep(time.Second * 2)
-			if flag {
+		time.Sleep(time.Second * 2)
+		// flag := false
+		// for {
+		result, err := api.JdShopAPI.FindShopCategories()
+		if err != nil {
+			return err
+		}
+		for _, v := range result {
+			if v.Name == storeCat.Name {
+				storeCat.VendorCatID = utils.Int64ToStr(v.CID)
+				// flag = true
 				break
 			}
 		}
+		// 	if flag {
+		// 		break
+		// 	}
+		// }
 	}
 	return err
 }

From c5cf1c1d810e2caed1afdf751836c2ea29ce24e3 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Sun, 31 May 2020 10:27:53 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=BE=8E=E5=9B=A2=E9=85=8D=E9=80=81cookie?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/delivery/mtps/store.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/business/partner/delivery/mtps/store.go b/business/partner/delivery/mtps/store.go
index ff4acd128..9932bdcad 100644
--- a/business/partner/delivery/mtps/store.go
+++ b/business/partner/delivery/mtps/store.go
@@ -132,8 +132,8 @@ func (c *DeliveryHandler) IsErrStoreExist(err error) bool {
 }
 
 func (c *DeliveryHandler) UpdateStore(ctx *jxcontext.Context, storeDetail *dao.StoreDetail2) (err error) {
-	if globals.EnableStoreWrite {
-		err = api.MtpsAPI.PagePoiUpdate(storeDetail.VendorStoreID, storeDetail.PayeeName, storeDetail.Tel1, fakeContactEmail)
-	}
+	// if globals.EnableStoreWrite {
+	// 	err = api.MtpsAPI.PagePoiUpdate(storeDetail.VendorStoreID, storeDetail.PayeeName, storeDetail.Tel1, fakeContactEmail)
+	// }
 	return err
 }

From 39bf772dda15b0e514d516123bd99beab4f1624f Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Sun, 31 May 2020 11:16:03 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=97=A8=E5=BA=97?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index b9c194172..6360dc257 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -253,7 +253,7 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOr
 				storeSkus, err2 := dao.GetStoresSkusInfo(dao.GetDB(), []int{model.JdShopMainStoreID}, []int{v.SkuID})
 				err = err2
 				if len(storeSkus) > 0 {
-					if storeSkus[0].JdsID != 0 {
+					if storeSkus[0].JdsID != 0 && vendorStoreID != "" {
 						err = api.JdShopAPI.UpdateSkuSiteStock(storeSkus[0].JdsID, stock, utils.Str2Int(vendorStoreID))
 					}
 				}