1

platformapi/jdapi/jdapi.go

@@ -62,7 +62,7 @@ const (
 
 const (
 	JdVendorOrgCodeVagetable = "320406" // 菜市默认京东code
-	JdVendorOrgCodeFruit     = "339032" // 水果默认京东code
+	JdVendorOrgCodeFruit     = "379599" // 水果默认京东code
 	JdVendorOrgCodePet       = "390558" // 百货默认京东code
 )
 

platformapi/jdapi/jdapi_test.go

@@ -36,9 +36,9 @@ func init() {
 	// 果切 379599
 	//api = New("8a843f5c-6c75-4604-9976-04c1aae3decc", "f2ed33075faf4773a47e065acd79532b", "aed14cbbecac4456843570e90c5f46ec")
 	// 李氏水果 346254
-	api = New("c7c41cb6-6db4-4f67-a864-ca5f524653d0", "13493b4a951945f689dcc989b6693631", "7e28a37be43a430bb5928c835e482fe2")
+	//api = New("c7c41cb6-6db4-4f67-a864-ca5f524653d0", "13493b4a951945f689dcc989b6693631", "7e28a37be43a430bb5928c835e482fe2")
 	// 381564
-	//api = New("4d0c707a-54eb-4f05-8187-6cedf95827c7", "d2d1e2e3213d4320bc2712a684307831", "1750f5b9848d4a6492c1c20b487074da")
+	api = New("4d0c707a-54eb-4f05-8187-6cedf95827c7", "d2d1e2e3213d4320bc2712a684307831", "1750f5b9848d4a6492c1c20b487074da")
 	// 390558
 	//api = New("9053e4fd-4e0e-4e9e-8ab1-f348e5cbf3e7", "4602bd4b84984186815dbc03299c7094", "386ab19719d9470487011217d0c57349")
 

platformapi/jdapi/sku_test.go

@@ -1,18 +1,13 @@
 package jdapi
 
 import (
-	"fmt"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/globals"
+	"strings"
 	"testing"
 	"time"
 )
 
-func TestQueryPageBrandInfo(t *testing.T) {
-	fmt.Println((3 & 1) != 0)
-	fmt.Println(0&256 == 0)
-}
-
 func TestQueryCategoriesByOrgCode(t *testing.T) {
 	result, err := api.QueryCategoriesByOrgCode()
 	if err != nil {
@@ -29,9 +24,11 @@ func TestChangeShopCategoryOrder(t *testing.T) {
 }
 
 func TestGetSkuCategoryByName(t *testing.T) {
-	data, err := api.GetSkuCategoryBySkuName("十一特惠七天【榴莲水果捞 榴莲肉]敲好吃约500g")
+	data, err := api.GetSkuCategoryBySkuName("喜之郎蒟蒻果冻草莓味")
+	data2 := strings.Contains("[outSkuId:6100591], 类目ID不存在 level:1, code:11003", "类目ID不存在")
 	globals.SugarLogger.Debugf("data:=%s", utils.Format4Output(data, false))
 	globals.SugarLogger.Debugf("data:=%v", err)
+	globals.SugarLogger.Debugf("data2:=%v", data2)
 }
 
 func TestGetSpuSaleAttr(t *testing.T) {
@@ -50,9 +47,42 @@ func TestGetSkuStatus(t *testing.T) {
 	t.Log(utils.Format4Output(result, false))
 }
 
+func TestAddsku(t *testing.T) {
+	result, err := api.AddSku2(&OpSkuParam{
+		TraceID:        "679DBC742F0611F0B322525400E86DC0,18981810340",
+		OutSkuID:       "6099680",
+		ShopCategories: []int64{37839055},
+		CategoryID:     37090,
+		BrandID:        35247,
+		SkuName:        "双汇王中王 火腿肠 50g*10根500g/袋",
+		SkuPrice:       2460,
+		Weight:         0.5,
+		FixedStatus:    1,
+		IsSale:         -1,
+		Upc:            "6666060996802",
+		Images:         []string{"https://image.jxc4.com/image/5d4f19b5e2a282e9bf88325ac06d7ec3.jpg"},
+		IfViewDesc:     0,
+	})
+	globals.SugarLogger.Debugf("--------result := %s", utils.Format4Output(result, false))
+	globals.SugarLogger.Debugf("--------result := %v", err)
+}
+
+func TestQueryPageBrandInfo(t *testing.T) {
+	brandList, _, err := api.QueryPageBrandInfo(1, 20, 0, "锐澳 海盐荔枝伏特加味鸡尾酒")
+	globals.SugarLogger.Debugf("--------result := %s", utils.Format4Output(brandList, false))
+	globals.SugarLogger.Debugf("--------result := %v", err)
+}
+
 func TestDelete(t *testing.T) {
-	for i := 0; i < 15; i++ {
+	var searchAfterSkuId string = ""
-		idList, _ := api.AuerySkuInfoList(int64(i), 20)
+	for i := 0; i < 130; i++ {
+		idList, afterSkuId, err := api.AuerySkuInfoList(int64(i), 20, searchAfterSkuId)
+		if err != nil {
+			globals.SugarLogger.Debugf("--------err:%v", err)
+			return
+		}
+		time.Sleep(time.Second * 5)
+		searchAfterSkuId = utils.Int64ToStr(afterSkuId)
 		if len(idList) != 0 {
 			globals.SugarLogger.Debugf("------len := %d", len(idList))
 		}
@@ -65,6 +95,8 @@ func TestDelete(t *testing.T) {
 			delSkuId, err := api.UpdateSku2(param)
 			if err != nil {
 				globals.SugarLogger.Debugf("---skuId := %s,err  := %v", delSkuId, err)
+			} else {
+				globals.SugarLogger.Debugf("---skuId2 := %s", delSkuId)
 			}
 		}
 	}

platformapi/jdapi/store_sku.go

@@ -335,12 +335,19 @@ func (a *API) DelVipPrice(outStationNo string, skuIds []*SkuIdEntity) (err error
 }
 
 // 	AuerySkuInfoList 查询已经上传的商品列表
-func (a *API) AuerySkuInfoList(pageNo, pageSize int64) ([]string, error) {
+func (a *API) AuerySkuInfoList(pageNo, pageSize int64, searchAfterSkuId string) ([]string, int64, error) {
 	jdParams := map[string]interface{}{
-		"pageNo":   pageNo,
+		//"pageNo":   pageNo,
 		"pageSize":    pageSize,
+		"isFilterDel": "0",
+	}
+	if searchAfterSkuId != "" {
+		jdParams["searchAfterSkuId"] = searchAfterSkuId
 	}
 	data, err := a.AccessAPINoPage("pms/querySkuInfoList", jdParams, nil, nil, genNoPageResultParser("code", "msg", "result", "0"))
+	if data == nil {
+		return nil, 0, err
+	}
 	skuList := data.(map[string]interface{})["result"]
 
 	sku := make([]*JDSkuList, 0, 0)
@@ -352,7 +359,8 @@ func (a *API) AuerySkuInfoList(pageNo, pageSize int64) ([]string, error) {
 			skuId = append(skuId, list.OutSkuId)
 		}
 	}
-	return skuId, err
+	afterSkuId, _ := data.(map[string]interface{})["searchAfterSkuId"].(json.Number).Int64()
+	return skuId, afterSkuId, err
 }
 
 type JDSkuList struct {

platformapi/jdapi/store_sku_test.go

@@ -170,11 +170,3 @@ func (t *Object2222) getParam(key string) int {
 	defer t.RUnlock()
 	return t.Clients[key]
 }
-
-func TestGetSkuList(t *testing.T) {
-	api.AuerySkuInfoList(0, 100)
-}
-
-func TestUnBindStoreGoods(t *testing.T) {
-	api.UnBindStoreGoods(31985)
-}