From cf89a98a6f6f79a43d36825336c3ed2a5c9a8a96 Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 24 Oct 2019 18:38:48 +0800 Subject: [PATCH] =?UTF-8?q?amendAndPruneStoreStuff=E4=B8=AD=EF=BC=8C?= =?UTF-8?q?=E4=BB=A5VendorSkuID=E6=9D=A5=E5=81=9A=E5=88=A4=E6=96=AD?= =?UTF-8?q?=EF=BC=88=E5=8E=9F=E6=9D=A5=E6=98=AF=E7=94=A8=E7=9A=84SkuID?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/sync_store_sku.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index ed53f3799..550e64cd0 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -610,24 +610,24 @@ func amendAndPruneStoreStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, v if err != nil { return nil, err } - localSkuMap := make(map[int]*dao.StoreSkuSyncInfo) + localSkuMap := make(map[string]*dao.StoreSkuSyncInfo) for _, v := range localSkuList { - localSkuMap[v.SkuID] = v + localSkuMap[v.VendorSkuID] = v } remoteSkuList, err2 := handler.GetStoreSkusFullInfo(ctx, task, storeID, vendorStoreID, nil) if err = err2; err == nil { - remoteSkuMap := make(map[int]int) + remoteSkuMap := make(map[string]int) for _, v := range remoteSkuList { - if skuID := v.SkuList[0].SkuID; skuID > 0 { - if localSkuMap[skuID] == nil || - remoteSkuMap[skuID] == 1 /*skuID在平台重复，典型的是美团可能会出现此类情况*/ { + if vendorSkuID := v.SkuList[0].VendorSkuID; vendorSkuID != "" { + if localSkuMap[vendorSkuID] == nil || + remoteSkuMap[vendorSkuID] == 1 /*skuID在平台重复，典型的是美团可能会出现此类情况*/ { sku2Delete = append(sku2Delete, &partner.StoreSkuInfo{ - SkuID: skuID, - VendorSkuID: v.SkuList[0].VendorSkuID, + SkuID: v.SkuList[0].SkuID, + VendorSkuID: vendorSkuID, }) } else { - remoteSkuMap[skuID] = 1 + remoteSkuMap[vendorSkuID] = 1 } } } @@ -636,7 +636,7 @@ func amendAndPruneStoreStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, v for _, v := range localSkuList { if !model.IsSyncStatusDelete(v.StoreSkuSyncStatus) && v.BindID != 0 { syncStatus := 0 - if remoteSkuMap[v.SkuID] == 0 { + if remoteSkuMap[v.VendorSkuID] == 0 { if !model.IsSyncStatusNew(v.StoreSkuSyncStatus) { syncStatus = model.SyncFlagNewMask }