From ebe0fcb15c6c551d1f089d398bf916b41a3b128d Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 17 Apr 2019 12:32:55 +0800 Subject: [PATCH] =?UTF-8?q?-=20mtwm=E4=B8=8Eebai=E5=9C=A8=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E9=97=A8=E5=BA=97=E5=88=86=E7=B1=BB=E6=88=96=E5=95=86?= =?UTF-8?q?=E5=93=81=E4=BF=A1=E6=81=AF=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E6=98=AF=E6=B2=A1=E6=9C=89=E5=88=9B=E5=BB=BA=E7=9A=84=EF=BC=8C?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E5=BF=BD=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/ebai/store_sku.go | 4 ++-- business/partner/purchase/mtwm/store_sku.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/business/partner/purchase/ebai/store_sku.go b/business/partner/purchase/ebai/store_sku.go index 427adb1ce..f10b25247 100644 --- a/business/partner/purchase/ebai/store_sku.go +++ b/business/partner/purchase/ebai/store_sku.go @@ -247,7 +247,7 @@ func (p *PurchaseHandler) SyncStoreSkus(ctx *jxcontext.Context, parentTask tasks updateFields := []string{model.FieldEbaiSyncStatus} if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite { if storeSku.EbaiSyncStatus&model.SyncFlagDeletedMask != 0 { - if storeSku.EbaiSyncStatus&model.SyncFlagNewMask == 0 { + if storeSku.EbaiSyncStatus&model.SyncFlagNewMask == 0 && storeSku.EbaiID != 0 { err = api.EbaiAPI.SkuDelete(strStoreID, utils.Int64ToStr(storeSku.EbaiID)) } } else if storeSku.EbaiSyncStatus&model.SyncFlagNewMask != 0 { @@ -507,7 +507,7 @@ func (p *PurchaseHandler) SyncStoreCategory(ctx *jxcontext.Context, parentTask t // globals.SugarLogger.Debug(utils.Format4Output(catInfo, false)) if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite { if catInfo.EbaiSyncStatus&model.SyncFlagDeletedMask != 0 { // 删除 - if catInfo.EbaiSyncStatus&model.SyncFlagNewMask == 0 { + if catInfo.EbaiSyncStatus&model.SyncFlagNewMask == 0 && catInfo.EbaiID != 0 { err = api.EbaiAPI.ShopCategoryDelete(strStoreID, catInfo.EbaiID) } } else if catInfo.EbaiSyncStatus&model.SyncFlagNewMask != 0 { // 新增 diff --git a/business/partner/purchase/mtwm/store_sku.go b/business/partner/purchase/mtwm/store_sku.go index 4fbab416a..70f2d192c 100644 --- a/business/partner/purchase/mtwm/store_sku.go +++ b/business/partner/purchase/mtwm/store_sku.go @@ -37,7 +37,7 @@ func (p *PurchaseHandler) SyncStoreCategory(ctx *jxcontext.Context, parentTask t catInfo := batchItemList[0].(*dao.StoreCatSyncInfo) if globals.EnableStoreWrite && globals.EnableMtwmStoreWrite { if catInfo.MtwmSyncStatus&model.SyncFlagDeletedMask != 0 { // 删除 - if catInfo.MtwmSyncStatus&model.SyncFlagNewMask == 0 { + if catInfo.MtwmSyncStatus&model.SyncFlagNewMask == 0 && catInfo.MtwmID != "" { globals.SugarLogger.Debugf("RetailCatDelete vendorStoreID:%s, MtwmID:%s", vendorStoreID, catInfo.MtwmID) err = api.MtwmAPI.RetailCatDelete(vendorStoreID, catInfo.MtwmID) } @@ -256,7 +256,7 @@ func (p *PurchaseHandler) SyncStoreSkus(ctx *jxcontext.Context, parentTask tasks storeSkuBind := &model.StoreSkuBind{} storeSkuBind.ID = skuItem.BindID if skuItem.SkuSyncStatus&model.SyncFlagDeletedMask != 0 { - if skuItem.SkuSyncStatus&model.SyncFlagNewMask == 0 { + if skuItem.SkuSyncStatus&model.SyncFlagNewMask == 0 && skuItem.ID != 0 { err = api.MtwmAPI.RetailDelete(vendorStoreID, utils.Int2Str(skuItem.ID)) } } else if skuItem.SkuSyncStatus&(model.SyncFlagModifiedMask|model.SyncFlagNewMask) != 0 {