diff --git a/business/partner/purchase/jd/store_sku2.go b/business/partner/purchase/jd/store_sku2.go index 7318cae85..9c2a24ab6 100644 --- a/business/partner/purchase/jd/store_sku2.go +++ b/business/partner/purchase/jd/store_sku2.go @@ -48,16 +48,16 @@ func (p *PurchaseHandler) getStoreSkusBareInfoLimitSize(ctx *jxcontext.Context, tasksch.HandleTask(task, parentTask, false).Run() _, err = task.GetResult(0) if err == nil { - storeSkuMap := make(map[int64]*partner.StoreSkuInfo) - for _, v := range inStoreSkuList { - storeSkuMap[utils.Str2Int64(v.VendorSkuID)] = v - } + storeSkuMap := putils.StoreSkuList2MapByVendorSkuID(inStoreSkuList) for _, v := range stockInfo { - outStoreSkuList = append(outStoreSkuList, storeSkuMap[v.SkuID]) - storeSkuMap[v.SkuID].Status = jdStoreSkuStatus2Jx(v.Vendibility) + sku := storeSkuMap[utils.Int64ToStr(v.SkuID)] + sku.Status = jdStoreSkuStatus2Jx(v.Vendibility) + sku.Stock = v.UsableQty + outStoreSkuList = append(outStoreSkuList, sku) } for _, v := range priceInfo { - storeSkuMap[v.SkuID].VendorPrice = v.Price + sku := storeSkuMap[utils.Int64ToStr(v.SkuID)] + sku.VendorPrice = v.Price } } } diff --git a/business/partner/purchase/jd/store_sku2_test.go b/business/partner/purchase/jd/store_sku2_test.go index d854873ff..5d067beb3 100644 --- a/business/partner/purchase/jd/store_sku2_test.go +++ b/business/partner/purchase/jd/store_sku2_test.go @@ -3,6 +3,7 @@ package jd import ( "testing" + "git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/business/partner/putils" "git.rosy.net.cn/baseapi/utils" @@ -12,11 +13,11 @@ import ( func TestGetStoreSkusBareInfo(t *testing.T) { // list := []*partner.StoreSkuInfo{ // &partner.StoreSkuInfo{ - // SkuID: 5246, - // VendorSkuID: "2023747677", + // SkuID: 2212, + // VendorSkuID: "2019458103", // }, // } - // for i := 0; i < 3000; i++ { + // for i := 0; i < 30-1; i++ { // list = append(list, list[0]) // } skuNameList, err := curPurchaseHandler.GetSkus(jxcontext.AdminCtx, 0, "", "") @@ -24,10 +25,17 @@ func TestGetStoreSkusBareInfo(t *testing.T) { t.Fatal(err) } list := putils.StoreSkuFullList2Bare(skuNameList) + storeSkuList, err := curPurchaseHandler.GetStoreSkusBareInfo(jxcontext.AdminCtx, nil, 2, "11053496", list) if err != nil { t.Fatal(err.Error()) } - t.Log(utils.Format4Output(storeSkuList, false)) - t.Log(len(storeSkuList)) + var focusedStoreSkuList []*partner.StoreSkuInfo + for _, v := range storeSkuList { + if v.Stock > 0 { + focusedStoreSkuList = append(focusedStoreSkuList, v) + } + } + t.Log(utils.Format4Output(focusedStoreSkuList, false)) + t.Log(len(focusedStoreSkuList)) }