amendAndPruneStoreStuff中,以VendorSkuID来做判断(原来是用的SkuID)
This commit is contained in:
@@ -610,24 +610,24 @@ func amendAndPruneStoreStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, v
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
localSkuMap := make(map[int]*dao.StoreSkuSyncInfo)
|
localSkuMap := make(map[string]*dao.StoreSkuSyncInfo)
|
||||||
for _, v := range localSkuList {
|
for _, v := range localSkuList {
|
||||||
localSkuMap[v.SkuID] = v
|
localSkuMap[v.VendorSkuID] = v
|
||||||
}
|
}
|
||||||
|
|
||||||
remoteSkuList, err2 := handler.GetStoreSkusFullInfo(ctx, task, storeID, vendorStoreID, nil)
|
remoteSkuList, err2 := handler.GetStoreSkusFullInfo(ctx, task, storeID, vendorStoreID, nil)
|
||||||
if err = err2; err == nil {
|
if err = err2; err == nil {
|
||||||
remoteSkuMap := make(map[int]int)
|
remoteSkuMap := make(map[string]int)
|
||||||
for _, v := range remoteSkuList {
|
for _, v := range remoteSkuList {
|
||||||
if skuID := v.SkuList[0].SkuID; skuID > 0 {
|
if vendorSkuID := v.SkuList[0].VendorSkuID; vendorSkuID != "" {
|
||||||
if localSkuMap[skuID] == nil ||
|
if localSkuMap[vendorSkuID] == nil ||
|
||||||
remoteSkuMap[skuID] == 1 /*skuID在平台重复,典型的是美团可能会出现此类情况*/ {
|
remoteSkuMap[vendorSkuID] == 1 /*skuID在平台重复,典型的是美团可能会出现此类情况*/ {
|
||||||
sku2Delete = append(sku2Delete, &partner.StoreSkuInfo{
|
sku2Delete = append(sku2Delete, &partner.StoreSkuInfo{
|
||||||
SkuID: skuID,
|
SkuID: v.SkuList[0].SkuID,
|
||||||
VendorSkuID: v.SkuList[0].VendorSkuID,
|
VendorSkuID: vendorSkuID,
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
remoteSkuMap[skuID] = 1
|
remoteSkuMap[vendorSkuID] = 1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -636,7 +636,7 @@ func amendAndPruneStoreStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, v
|
|||||||
for _, v := range localSkuList {
|
for _, v := range localSkuList {
|
||||||
if !model.IsSyncStatusDelete(v.StoreSkuSyncStatus) && v.BindID != 0 {
|
if !model.IsSyncStatusDelete(v.StoreSkuSyncStatus) && v.BindID != 0 {
|
||||||
syncStatus := 0
|
syncStatus := 0
|
||||||
if remoteSkuMap[v.SkuID] == 0 {
|
if remoteSkuMap[v.VendorSkuID] == 0 {
|
||||||
if !model.IsSyncStatusNew(v.StoreSkuSyncStatus) {
|
if !model.IsSyncStatusNew(v.StoreSkuSyncStatus) {
|
||||||
syncStatus = model.SyncFlagNewMask
|
syncStatus = model.SyncFlagNewMask
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user