From b26fa0b5f46e33e2582e2dcc0b1f45145b423304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 8 Nov 2022 10:51:28 +0800 Subject: [PATCH] 1 --- business/jxstore/cms/sync2.go | 8 ++++++-- business/jxstore/cms/sync_store_sku.go | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/business/jxstore/cms/sync2.go b/business/jxstore/cms/sync2.go index e78c5c654..800ca15cf 100644 --- a/business/jxstore/cms/sync2.go +++ b/business/jxstore/cms/sync2.go @@ -72,7 +72,9 @@ func syncCategories(ctx *jxcontext.Context, db *dao.DaoDB, parentTask tasksch.IT err = multiStoresHandler.UpdateCategory2(ctx, catVendorInfo) } } else { - err = fmt.Errorf("平台:%d不合法", catVendorInfo.VendorID) + if catVendorInfo.VendorID != model.VendorIDDD { + err = fmt.Errorf("平台:%d不合法", catVendorInfo.VendorID) + } } if err = OnThingSync(ctx, dao.GetDB(), SkuCategoryVendor2ThingMap(catVendorInfo), err); err == nil { retVal = []int{1} @@ -187,7 +189,9 @@ func SyncSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorIDs []int, } } } else { - err = fmt.Errorf("平台:%d不合法", skuVendorInfo.VendorID) + if skuVendorInfo.VendorID != model.VendorIDDD { + err = fmt.Errorf("平台:%d不合法", skuVendorInfo.VendorID) + } } if len(failedList) > 0 { task.AddFailedList(failedList) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index d33bcb2a2..a00194706 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -553,7 +553,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag isAdded2Update := false // 修改商品信息时不改价(以免活动引起的失败),而用单独的改价来改 if (model.IsSyncStatusUpdate(sku.SkuSyncStatus) || (model.IsSyncStatusSeq(sku.SkuSyncStatus) && reorderHandler == nil)) && singleStoreHandler != nil { - if dao.IsVendorThingIDEmpty(sku.VendorCatID) && !strings.Contains(sku.StoreName, model.ExdStoreName) && vendorID != model.VendorIDYB { + if dao.IsVendorThingIDEmpty(sku.VendorCatID) && !strings.Contains(sku.StoreName, model.ExdStoreName) && vendorID != model.VendorIDYB && vendorID != model.VendorIDDD { globals.SugarLogger.Warnf("syncStoreSkuNew 修改门店:%d商品:%d,但没有平台分类ID", storeID, sku.SkuID) } else { isAdded2Update = true