From 5504b43d4f9f14290e10d8a1ec5324c5170aa7a5 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Tue, 24 Dec 2019 17:47:22 +0800
Subject: [PATCH] =?UTF-8?q?ebai.CreateStoreSkus=E4=B8=AD=EF=BC=8C=E9=A5=BF?=
 =?UTF-8?q?=E7=99=BE=E5=B9=B3=E5=8F=B0=E6=9C=89BUG=EF=BC=8C=E4=BC=9A?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=96=B0=E5=BB=BA=E4=B8=80=E4=B8=AA=E4=B9=8B?=
 =?UTF-8?q?=E5=89=8D=E5=88=A0=E9=99=A4=E7=9A=84=E5=95=86=E5=93=81=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=A1=E6=81=AF=E4=B8=8D=E4=BC=9A=E5=8F=8A=E6=97=B6?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=8C=E5=BC=BA=E5=88=B6=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E4=B8=80=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/ebai/store_sku2.go | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/business/partner/purchase/ebai/store_sku2.go b/business/partner/purchase/ebai/store_sku2.go
index ec7e619d8..afaa0132a 100644
--- a/business/partner/purchase/ebai/store_sku2.go
+++ b/business/partner/purchase/ebai/store_sku2.go
@@ -113,19 +113,25 @@ func (p *PurchaseHandler) IsErrSkuNotExist(err error) (isNotExist bool) {
 	return ebaiapi.IsErrSkuNotExist(err)
 }
 
-func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (successList []*dao.StoreSkuSyncInfo, err error) {
+func (p *PurchaseHandler) updateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo, isNeedMapCat bool) (successList []*dao.StoreSkuSyncInfo, err error) {
 	storeSku := storeSkuList[0]
 	strStoreID := utils.Int2Str(storeID)
 	params := genSkuParamsFromStoreSkuInfo2(storeSku, false)
 	if globals.EnableEbaiStoreWrite {
 		_, err = api.EbaiAPI.SkuUpdate(ctx.GetTrackInfo(), strStoreID, utils.Str2Int64(storeSku.VendorSkuID), params)
-		utils.CallFuncAsync(func() {
-			api.EbaiAPI.SkuShopCategoryMap(strStoreID, utils.Str2Int64(storeSku.VendorSkuID), "", utils.Str2Int64(storeSku.VendorCatID), genSkuCatRank(storeSku))
-		})
+		if isNeedMapCat {
+			utils.CallFuncAsync(func() {
+				api.EbaiAPI.SkuShopCategoryMap(strStoreID, utils.Str2Int64(storeSku.VendorSkuID), "", utils.Str2Int64(storeSku.VendorCatID), genSkuCatRank(storeSku))
+			})
+		}
 	}
 	return nil, err
 }
 
+func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (successList []*dao.StoreSkuSyncInfo, err error) {
+	return p.updateStoreSkus(ctx, storeID, vendorStoreID, storeSkuList, true)
+}
+
 // 对于多门店平台来说，storeSkuList中只有SkuID与VendorSkuID有意义
 func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (successList []*dao.StoreSkuSyncInfo, err error) {
 	storeSku := storeSkuList[0]
@@ -136,6 +142,9 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
 		if vendorSkuID, err = api.EbaiAPI.SkuCreate(ctx.GetTrackInfo(), strStoreID, storeSku.SkuID, params); err == nil {
 			utils.AfterFuncWithRecover(5*time.Second, func() {
 				api.EbaiAPI.SkuShopCategoryMap(strStoreID, vendorSkuID, "", utils.Str2Int64(storeSku.VendorCatID), genSkuCatRank(storeSku))
+				// 饿百平台有BUG，会导致新建一个之前删除的商品时，信息不会及时更新，强制刷新一下
+				// 比如门店：100887, skuID：33805，订单：1577176719141226065
+				p.updateStoreSkus(ctx, storeID, vendorStoreID, storeSkuList, false)
 			})
 		}
 	} else {