From edd0e8c2827888ff1e5b76344cf816350183f9f6 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 9 Sep 2019 14:23:37 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E9=A5=BF=E7=99=BE=E5=B0=86=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E5=88=86=E7=B1=BB=E9=87=8D=E5=A4=8D=E6=94=B9=E5=90=8D?=
 =?UTF-8?q?=EF=BC=8C=E4=B9=9F=E4=BC=9A=E6=8A=A5=E5=88=86=E7=B1=BB=E5=90=8D?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E9=94=99=EF=BC=8C=E7=89=B9=E6=AE=8A=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E4=B8=80=E4=B8=8B=EF=BC=8C=E4=B8=8D=E8=BF=87=E5=9B=A0?=
 =?UTF-8?q?=E4=B8=BAGetStoreCategory=E5=85=B6=E5=AE=9E=E4=BC=9A=E6=8B=89?=
 =?UTF-8?q?=E5=8F=96=E6=89=80=E6=9C=89=E7=9A=84=E9=97=A8=E5=BA=97=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=EF=BC=8C=E6=98=AF=E6=AF=94=E8=BE=83=E8=80=97=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/ebai/store_sku2.go | 8 ++++++++
 controllers/cms_sync.go                      | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/business/partner/purchase/ebai/store_sku2.go b/business/partner/purchase/ebai/store_sku2.go
index 7c1046bd5..d08d63e93 100644
--- a/business/partner/purchase/ebai/store_sku2.go
+++ b/business/partner/purchase/ebai/store_sku2.go
@@ -83,6 +83,14 @@ func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID in
 func (p *PurchaseHandler) UpdateStoreCategory(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeCat *dao.SkuStoreCatInfo) (err error) {
 	if globals.EnableEbaiStoreWrite {
 		err = api.EbaiAPI.ShopCategoryUpdate(utils.Int2Str(storeID), utils.Str2Int64WithDefault(storeCat.VendorCatID, 0), formatCatName(storeCat.Name), jxCatSeq2Ebai(storeCat.Seq))
+		// todo, 饿百将一个分类重复改名，也会报分类名重复错，特殊处理一下，不过因为GetStoreCategory其实会拉取所有的门店分类，是比较耗时的操作
+		if utils.IsErrMatch(err, "1", []string{"分类名称已经存在"}) {
+			if cat, err2 := p.GetStoreCategory(ctx, storeID, vendorStoreID, storeCat.Name); err2 == nil {
+				if cat.VendorCatID == storeCat.VendorCatID {
+					err = nil
+				}
+			}
+		}
 	}
 	return err
 }
diff --git a/controllers/cms_sync.go b/controllers/cms_sync.go
index e14381286..079ae7e04 100644
--- a/controllers/cms_sync.go
+++ b/controllers/cms_sync.go
@@ -36,8 +36,8 @@ func (c *SyncController) SyncStoresSkus() {
 	})
 }
 
-// @Title 同步商家商品信息
-// @Description 同步商家商品信息
+// @Title 同步商家分类信息
+// @Description 同步商家分类信息
 // @Param	token			header		string	true	"认证token"
 // @Param	storeIDs		formData	string	true	"门店ID列表"
 // @Param	vendorIDs		formData	string	true	"厂商ID列表"