From d16115b415ce9627dc86590ee8594f8f8d7c5408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 16 Feb 2023 14:20:16 +0800 Subject: [PATCH 1/8] =?UTF-8?q?elm=20=E5=B9=B3=E5=8F=B0id=E5=92=8C?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E9=97=A8=E5=BA=97id=E6=98=A0=E5=B0=84?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platformapi/ebaiapi/shop_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformapi/ebaiapi/shop_test.go b/platformapi/ebaiapi/shop_test.go index 96089050..07d0ce04 100644 --- a/platformapi/ebaiapi/shop_test.go +++ b/platformapi/ebaiapi/shop_test.go @@ -122,7 +122,7 @@ func TestShopStatusGet(t *testing.T) { //todo 修改ebai平台与本地映射 func TestShopIDBatchUpdate(t *testing.T) { - err := api.ShopIDBatchUpdate([]string{utils.Int2Str(2235877567)}, []string{"100920"}) + err := api.ShopIDBatchUpdate([]string{utils.Int2Str(2235877567)}, []string{"668815"}) if err != nil { t.Fatal(err) } From bd0809ac40365d6dbe0c7441f02d3f61b776c23e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 16 Feb 2023 16:33:08 +0800 Subject: [PATCH 2/8] 1 --- platformapi/tiktok_shop/tiktok_api/sku.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/platformapi/tiktok_shop/tiktok_api/sku.go b/platformapi/tiktok_shop/tiktok_api/sku.go index 588aa531..9f2890f3 100644 --- a/platformapi/tiktok_shop/tiktok_api/sku.go +++ b/platformapi/tiktok_shop/tiktok_api/sku.go @@ -145,6 +145,7 @@ func (a *API) SyncStockBatch(param *sku_syncStockBatch_request.SkuSyncStockBatch // EditStoreCommodity 编辑商品 func (a *API) EditStoreCommodity(sku *product_editV2_request.ProductEditV2Param) error { + globals.SugarLogger.Debugf("EditStoreCommodity ========") request := product_editV2_request.New() request.Param = sku @@ -154,6 +155,7 @@ func (a *API) EditStoreCommodity(sku *product_editV2_request.ProductEditV2Param) return err } if result.Code != RequestSuccessCode { + globals.SugarLogger.Debugf("result err := %s", utils.Format4Output(result, false)) return errors.New(result.SubMsg) } return nil From a0e5cfaaf4a44375c35a156ad6aa39f5939430ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 20 Feb 2023 14:55:32 +0800 Subject: [PATCH 3/8] 1 --- platformapi/jdapi/jdapi_test.go | 2 +- platformapi/jdapi/store_test.go | 25 ++++++++----------------- platformapi/mtwmapi/retail_test.go | 8 ++++---- 3 files changed, 13 insertions(+), 22 deletions(-) diff --git a/platformapi/jdapi/jdapi_test.go b/platformapi/jdapi/jdapi_test.go index 45c6c561..b64837f0 100644 --- a/platformapi/jdapi/jdapi_test.go +++ b/platformapi/jdapi/jdapi_test.go @@ -34,7 +34,7 @@ func init() { //api = New("0e12f461-2e6b-49ca-bce6-935c6672362d", "f2ed33075faf4773a47e065acd79532b", "aed14cbbecac4456843570e90c5f46ec") // 京东超市 381564 - api = New("f99d25b8-33a6-4251-a97c-5e24b80b0005", "d2d1e2e3213d4320bc2712a684307831", "1750f5b9848d4a6492c1c20b487074da") + api = New("fe07cad2-d366-424b-8e85-9b81d7987cba", "8376b3071c5b49fb96a4c82be0dbc104", "a55b47042d5845018834f42d42ffafb7") //prod zs // api = New("6f8d3290-0120-4ad7-8b53-943c67c84f3f", "789279b9ae814ba091ac52815566b54d", "5d668cd227644637bb0fd73ed8118ec8") // const cookieValue = "YYJV3NHVBPHLD36FWP6F3EM5PTXJ2XZQS7U4HWRIDPP4IWGUKUIB4XG5N26CZRDLDF7PKOXBPD6BNTUAJLETLZOIWMCVFI3K6MYZIY4QBIXIMXYDJNUKFGJVQTN5356SAD6WPCIHWNQAG7DDMF7L7S3SHCT3RM3CQG7IJIPUQ3THS5UIUYWMKINM7ETUOQB7OBPOPZVCT3ZJY55243TDVXLO25PP4UYSPTTPMNQ7HPMWOJKJ3BJWGVHD243MXH7NZWW264TKN5UOCJBSSSOKD2QQII" diff --git a/platformapi/jdapi/store_test.go b/platformapi/jdapi/store_test.go index 63cee7d4..e7ab8f71 100644 --- a/platformapi/jdapi/store_test.go +++ b/platformapi/jdapi/store_test.go @@ -32,23 +32,14 @@ import ( // t.Log(utils.Format4Output(result, false)) //} // -//func TestGetStationsByVenderId(t *testing.T) { -// result, err := api.GetStationsByVenderId() -// if err != nil { -// t.Fatal(err) -// } -// findStore := false -// for _, v := range result { -// if v == mustExistStoreID { -// findStore = true -// break -// } -// } -// if !findStore { -// baseapi.SugarLogger.Fatalf("result have no store:%s", mustExistStoreID) -// } -//} -// +func TestGetStationsByVenderId(t *testing.T) { + result, err := api.GetStationsByVenderId() + if err != nil { + t.Fatal(err) + } + t.Log(utils.Format4Output(result, false)) +} + func TestGetStoreInfoByStationNo(t *testing.T) { result, err := api.GetStoreInfoByStationNo2("12535376") if err != nil { diff --git a/platformapi/mtwmapi/retail_test.go b/platformapi/mtwmapi/retail_test.go index 1f817942..e86c3a5b 100644 --- a/platformapi/mtwmapi/retail_test.go +++ b/platformapi/mtwmapi/retail_test.go @@ -11,7 +11,7 @@ import ( ) func TestRetailCatList(t *testing.T) { - result, err := api.RetailCatList("8694203 ") + result, err := api.RetailCatList("16690980") if err != nil { t.Fatal(err) } @@ -19,9 +19,9 @@ func TestRetailCatList(t *testing.T) { } func TestRetailCatUpdate(t *testing.T) { - err := api.RetailCatUpdate("8694203", "时令鲜蔬", &Param4UpdateCat{ - CategoryNameOrigin: "1", - CategoryCodeOrigin: "1", + err := api.RetailCatUpdate("16690980", "咸菜罐头", &Param4UpdateCat{ + CategoryNameOrigin: "咸菜罐头", + CategoryCodeOrigin: "", CategoryCode: "1", Sequence: 3, }) From bd311cec1ee2100b93c607a5218478b4dccb3de5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 20 Feb 2023 15:08:06 +0800 Subject: [PATCH 4/8] 1 --- platformapi/mtwmapi/retail.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/platformapi/mtwmapi/retail.go b/platformapi/mtwmapi/retail.go index e30e3cdb..aee4e669 100644 --- a/platformapi/mtwmapi/retail.go +++ b/platformapi/mtwmapi/retail.go @@ -184,6 +184,8 @@ func (a *API) RetailCatUpdate(poiCode, catName string, updateParams *Param4Updat // 删除商品分类 // 当分类下存在子级分类或商品时，不允许直接删除此分类。 func (a *API) RetailCatDelete(poiCode, code, name string) (err error) { + globals.SugarLogger.Debugf("RetailCatDelete======poiCode %s", poiCode) + globals.SugarLogger.Debugf("RetailCatDelete======name %s", name) params := map[string]interface{}{ KeyAppPoiCode: poiCode, } @@ -193,6 +195,9 @@ func (a *API) RetailCatDelete(poiCode, code, name string) (err error) { params["category_name"] = name } _, err = a.AccessAPI("retailCat/delete", false, params) + if err != nil { + globals.SugarLogger.Debugf("RetailCatDelete======err %s", err.Error()) + } return err } From 8cdc3078be2fe2fc2c07a205e3c3e1f906345de4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 20 Feb 2023 15:28:33 +0800 Subject: [PATCH 5/8] 1 --- platformapi/mtwmapi/retail.go | 1 + 1 file changed, 1 insertion(+) diff --git a/platformapi/mtwmapi/retail.go b/platformapi/mtwmapi/retail.go index aee4e669..c0d0b5ed 100644 --- a/platformapi/mtwmapi/retail.go +++ b/platformapi/mtwmapi/retail.go @@ -208,6 +208,7 @@ func (a *API) RetailCatList(poiCode string) (retailCatList []*RetailCategoryInfo if err == nil { return interface2CatList(result, 1, nil), nil } + globals.SugarLogger.Debugf("RetailCatList==========err %s", err.Error()) return nil, err } From babacd5233acc3e90a65eb5996577fcb9ab7818b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 21 Feb 2023 11:09:12 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=93=81=E7=89=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platformapi/jdapi/store_page.go | 1 + platformapi/jdapi/store_page_test.go | 18 +++++++------ platformapi/mtwmapi/retail_test.go | 2 +- .../tiktok_shop/tiktok_api/afs_test.go | 2 +- platformapi/tiktok_shop/tiktok_api/sku.go | 25 ++++++++++++++++--- .../tiktok_shop/tiktok_api/sku_delete_test.go | 7 ++++++ 6 files changed, 42 insertions(+), 13 deletions(-) diff --git a/platformapi/jdapi/store_page.go b/platformapi/jdapi/store_page.go index e431fb5c..54037c43 100644 --- a/platformapi/jdapi/store_page.go +++ b/platformapi/jdapi/store_page.go @@ -1038,6 +1038,7 @@ func (a *API) GetJdUpcCodeByName(name, upcCode string, pageNo, pageSize int) (pr UpcCode: v.(map[string]interface{})["upcCode"].(string), Weight: float32(utils.Interface2Float64WithDefault(v.(map[string]interface{})["weight"], 0) * 1000), ImgList: ImgList, + BrandName: v.(map[string]interface{})["brandName"].(string), } productInfos = append(productInfos, productInfo) } diff --git a/platformapi/jdapi/store_page_test.go b/platformapi/jdapi/store_page_test.go index 3c0b4ae4..e7cf8414 100644 --- a/platformapi/jdapi/store_page_test.go +++ b/platformapi/jdapi/store_page_test.go @@ -4,6 +4,7 @@ import ( "fmt" "git.rosy.net.cn/baseapi" "git.rosy.net.cn/baseapi/utils" + "strings" "testing" ) @@ -208,14 +209,15 @@ func TestC(t *testing.T) { // api.GetJdStoreLevel("320406", "11732427", 1) //} // -//func TestGetJdUpcCodeByName(t *testing.T) { -// result, err := api.GetJdUpcCodeByName("", "6920174736731", 1, 5) -// if err != nil { -// t.Fatal(err) -// } -// t.Log(utils.Format4Output(result, false)) -//} -// +func TestGetJdUpcCodeByName(t *testing.T) { + result, err := api.GetJdUpcCodeByName("", "9556771007300", 1, 5) + if err != nil { + t.Fatal(err) + } + t.Log(strings.Split(result[0].OriginalName, " ")[0]) + t.Log(utils.Format4Output(result, false)) +} + //func TestGetJdSkuDirectPrice(t *testing.T) { // result, err := api.GetJdSkuDirectPrice(31031) // fmt.Println("test1", result, err) diff --git a/platformapi/mtwmapi/retail_test.go b/platformapi/mtwmapi/retail_test.go index e86c3a5b..28810f86 100644 --- a/platformapi/mtwmapi/retail_test.go +++ b/platformapi/mtwmapi/retail_test.go @@ -11,7 +11,7 @@ import ( ) func TestRetailCatList(t *testing.T) { - result, err := api.RetailCatList("16690980") + result, err := api.RetailCatList("13262158") if err != nil { t.Fatal(err) } diff --git a/platformapi/tiktok_shop/tiktok_api/afs_test.go b/platformapi/tiktok_shop/tiktok_api/afs_test.go index 880dfabb..ccacf74d 100644 --- a/platformapi/tiktok_shop/tiktok_api/afs_test.go +++ b/platformapi/tiktok_shop/tiktok_api/afs_test.go @@ -18,7 +18,7 @@ import ( // "authority_id": "" //}` -var token = `{"access_token":"0befdbfe-b086-49f1-b539-dc39b8bebea0","expires_in":1676494406,"scope":"SCOPE","shop_id":68023619,"shop_name":"京西到家","refresh_token":"9ff5b722-77bf-486f-9f26-1751e768aff3","authority_id":""}` +var token = `{"access_token":"e1c4333c-6e5e-4db8-83d3-173923e0815f","expires_in":1677450559,"scope":"SCOPE","shop_id":57939570,"shop_name":"京西菜市速食","refresh_token":"89d62aee-5bb3-433c-9514-e435172a3263","authority_id":""}` //var token = `{"access_token":"e3173e9f-266f-4d87-88e7-e7cd837bc9d9","expires_in":1672882632,"scope":"SCOPE","shop_id":68023619,"shop_name":"京西到家","refresh_token":"5070aae2-493f-46bd-b5d6-6ea0cd64729f","authority_id":""}` diff --git a/platformapi/tiktok_shop/tiktok_api/sku.go b/platformapi/tiktok_shop/tiktok_api/sku.go index 9f2890f3..097d04de 100644 --- a/platformapi/tiktok_shop/tiktok_api/sku.go +++ b/platformapi/tiktok_shop/tiktok_api/sku.go @@ -294,9 +294,10 @@ func (a *API) EditPrice(skuPrice *sku_editPrice_request.SkuEditPriceParam) error } // GetSkuBrand 获取商品所属品牌 -func (a *API) GetSkuBrand(categoryId int64) (int64, error) { +func (a *API) GetSkuBrand(categoryId int64, brandName string) (int64, error) { request := brand_list_request.New() request.Param.CategoryId = categoryId + request.Param.Query = brandName result, err := request.Execute(a.accessTokenObj) if err != nil { return 0, err @@ -305,11 +306,29 @@ func (a *API) GetSkuBrand(categoryId int64) (int64, error) { return 0, errors.New(result.SubMsg) } - if result.Data == nil || len(result.Data.AuthBrandList) == 0 { + if result.Data == nil || len(result.Data.BrandList) == 0 { return 596120136, nil // 无品牌默认值 } - return result.Data.AuthBrandList[0].BrandId, nil + var brandNameLen int = 0 + var BrandNameMap = make(map[int]int64, 0) + for _, v := range result.Data.BrandList { + BrandNameMap[len(v.NameCn)] = v.BrandId + if brandNameLen == 0 { + brandNameLen = len(v.NameCn) + continue + } + if len(v.NameCn) < brandNameLen && brandNameLen != 0 { + brandNameLen = len(v.NameCn) + } + } + + //for _, vv := range result.Data.BrandList { + // if vv.BrandId == BrandNameMap[brandNameLen] { + // globals.SugarLogger.Debugf("brand name :[%s]", vv.NameCn) + // } + //} + return BrandNameMap[brandNameLen], nil } // OrderUserInfoDecrypt 用户信息解密 diff --git a/platformapi/tiktok_shop/tiktok_api/sku_delete_test.go b/platformapi/tiktok_shop/tiktok_api/sku_delete_test.go index 5cd3ef09..abfdf6c5 100644 --- a/platformapi/tiktok_shop/tiktok_api/sku_delete_test.go +++ b/platformapi/tiktok_shop/tiktok_api/sku_delete_test.go @@ -2,6 +2,7 @@ package tiktok_api import ( "fmt" + "git.rosy.net.cn/jx-callback/globals" "strings" "testing" ) @@ -49,3 +50,9 @@ func GetTiktokImgListTest(api *API, storeId, appOrgCode string, detailImg string return strings.Join(tiktokImg, "|"), detailTiktok, nil } + +func TestGetSkuBrand(t *testing.T) { + data, err := a.GetSkuBrand(22843, "康师傅") + globals.SugarLogger.Debugf("data ========= %v", data) + globals.SugarLogger.Debugf("data ========= %s", err) +} From ea5064a7f827ca98ac581708c74cee83922d1ac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 21 Feb 2023 11:19:11 +0800 Subject: [PATCH 7/8] 1 --- platformapi/mtwmapi/retail.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platformapi/mtwmapi/retail.go b/platformapi/mtwmapi/retail.go index c0d0b5ed..ff754d98 100644 --- a/platformapi/mtwmapi/retail.go +++ b/platformapi/mtwmapi/retail.go @@ -205,10 +205,12 @@ func (a *API) RetailCatList(poiCode string) (retailCatList []*RetailCategoryInfo result, err := a.AccessAPI("retailCat/list", true, map[string]interface{}{ KeyAppPoiCode: poiCode, }) + globals.SugarLogger.Debugf("RetailCatList==========err %s", err.Error()) + globals.SugarLogger.Debugf("result==========err %s", utils.Format4Output(result, false)) + if err == nil { return interface2CatList(result, 1, nil), nil } - globals.SugarLogger.Debugf("RetailCatList==========err %s", err.Error()) return nil, err } From ee3e31096ac772b8ebd5ab4a621f7b03de567909 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 21 Feb 2023 11:52:45 +0800 Subject: [PATCH 8/8] 1 --- platformapi/mtwmapi/retail.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platformapi/mtwmapi/retail.go b/platformapi/mtwmapi/retail.go index ff754d98..73b2b9da 100644 --- a/platformapi/mtwmapi/retail.go +++ b/platformapi/mtwmapi/retail.go @@ -205,7 +205,9 @@ func (a *API) RetailCatList(poiCode string) (retailCatList []*RetailCategoryInfo result, err := a.AccessAPI("retailCat/list", true, map[string]interface{}{ KeyAppPoiCode: poiCode, }) - globals.SugarLogger.Debugf("RetailCatList==========err %s", err.Error()) + if err != nil { + globals.SugarLogger.Debugf("RetailCatList==========err %v", err) + } globals.SugarLogger.Debugf("result==========err %s", utils.Format4Output(result, false)) if err == nil {