From 6eac242b06dfc3a6e41b7982d08ed45af2cb655c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 24 Feb 2023 15:23:30 +0800 Subject: [PATCH 01/12] 1 --- platformapi/mtwmapi/mtwmapi_test.go | 6 ++--- platformapi/mtwmapi/order_test.go | 2 +- platformapi/mtwmapi/poi_test.go | 2 +- platformapi/mtwmapi/retail.go | 24 ++++++++++++++--- platformapi/mtwmapi/retail_test.go | 27 +++++++++++++------ .../tiktok_shop/tiktok_api/api_test.go | 2 +- 6 files changed, 46 insertions(+), 17 deletions(-) diff --git a/platformapi/mtwmapi/mtwmapi_test.go b/platformapi/mtwmapi/mtwmapi_test.go index 7fad5bd4..3b0fee2d 100644 --- a/platformapi/mtwmapi/mtwmapi_test.go +++ b/platformapi/mtwmapi/mtwmapi_test.go @@ -20,13 +20,13 @@ func init() { baseapi.Init(sugarLogger) // 菜市 - api = New("589", "a81eb3df418d83d6a1a4b7c572156d2f", "", "") + //api = New("589", "a81eb3df418d83d6a1a4b7c572156d2f", "", "") // 果园 //api = New("4123", "df2c88338b85f830cebce2a9eab56628", "", "") //商超 - //api = New("5873", "41c479790a76f86326f89e8048964739", "", "token_nH_IlcWQKAkZBqklwItNRw") //token_nH_IlcWQKAkZBqklwItNRw + api = New("5873", "41c479790a76f86326f89e8048964739", "", "") //token_nH_IlcWQKAkZBqklwItNRw cookieStr := ` acctId=57396785; token=0bWbK5VbK50E2BmIhIH2zHB-am_y7mB37yXHm6RLZWx4*; wmPoiId=-1; ` @@ -60,7 +60,7 @@ func TestGetAccessToken(t *testing.T) { } func TestGetAccessToken2(t *testing.T) { - result, err := api.GetAccessToken2("12422751") //refresh_token_pLG7Jw7g9mu7oOzNSuJIUg + result, err := api.GetAccessToken2("16708848") //refresh_token_pLG7Jw7g9mu7oOzNSuJIUg if err != nil { t.Fatal(err) } diff --git a/platformapi/mtwmapi/order_test.go b/platformapi/mtwmapi/order_test.go index 178fb325..2fe114d9 100644 --- a/platformapi/mtwmapi/order_test.go +++ b/platformapi/mtwmapi/order_test.go @@ -131,7 +131,7 @@ func TestGetOrderIdByDaySeq(t *testing.T) { } func TestGetOrderIdByDaySeqSingle(t *testing.T) { - result, err := api.GetOrderIdByDaySeqSingle("7111597", utils.Time2Date(time.Now()), 1) + result, err := api.GetOrderIdByDaySeqSingle("16708848", utils.Time2Date(time.Now()), 1) t.Log(utils.Format4Output(result, false)) if err != nil { t.Fatal(err) diff --git a/platformapi/mtwmapi/poi_test.go b/platformapi/mtwmapi/poi_test.go index 5c358c4e..c6398ce3 100644 --- a/platformapi/mtwmapi/poi_test.go +++ b/platformapi/mtwmapi/poi_test.go @@ -23,7 +23,7 @@ func TestPoiGetIDs(t *testing.T) { } func TestPoiMGet(t *testing.T) { - result, err := api.PoiMGet([]string{"12524795"}) + result, err := api.PoiMGet([]string{"16708848"}) t.Log(utils.Format4Output(result, false)) if err != nil { t.Fatal(err) diff --git a/platformapi/mtwmapi/retail.go b/platformapi/mtwmapi/retail.go index 73b2b9da..635b6a36 100644 --- a/platformapi/mtwmapi/retail.go +++ b/platformapi/mtwmapi/retail.go @@ -1,6 +1,7 @@ package mtwmapi import ( + "errors" "git.rosy.net.cn/jx-callback/globals" "regexp" "strings" @@ -32,7 +33,8 @@ const ( // {"attrId":1200000275,"attrName":"是否有机","valueList":[{"valueId MtwmSkuAttr200002716 = `[{"attrId":1200000287,"attrName":"特产品种","valueList":[{"valueId":1300003951,"value":"非特产品种"}]},{"attrId":1200000094,"attrName":"产地","valueList":[{"valueId":100000050,"value":"中国"}]},{"attrId":1200000132,"attrName":"国产/进口","valueList":[{"valueId":1300000003,"value":"国产"}]},{"attrId":1200000286,"attrName":"果品品牌","valueList":[{"valueId":1300000249,"value":"其他"}]}]` //200002667，200002713 MtwmSkuAttr200002670 = `[{"attrId":1200000202,"attrName":"品种","valueList":[{"valueId":1300000249,"value":"其他"}]},{"attrId":1200000287,"attrName":"特产品种","valueList":[{"valueId":1300003951,"value":"非特产品种"}]},{"attrId":1200000094,"attrName":"产地","valueList":[{"valueId":100000050,"value":"中国"}]},{"attrId":1200000132,"attrName":"国产/进口","valueList":[{"valueId":1300000003,"value":"国产"}]},{"attrId":1200000286,"attrName":"果品品牌","valueList":[{"valueId":1300000249,"value":"其他"}]}]` - MtwmSkuAttr200002680 = `[{"attrId":1200000289,"attrName":"品规","valueList":[{"valueId":1300004255,"value":"未区分品规"}]},{"attrId":1200000202,"attrName":"品种","valueList":[{"valueId":1300000249,"value":"其他"}]},{"attrId":1200000094,"attrName":"产地","valueList":[{"valueId":100000050,"value":"中国"}]},{"attrId":1200000132,"attrName":"国产/进口","valueList":[{"valueId":1300000003,"value":"国产"}]},{"attrId":1200000286,"attrName":"果品品牌","valueList":[{"valueId":1300000249,"value":"其他"}]}]` + //MtwmSkuAttr200002680 = `[{"attrId":1200000289,"attrName":"品规","valueList":[{"valueId":1300004255,"value":"未区分品规"}]},{"attrId":1200000202,"attrName":"品种","valueList":[{"valueId":1300000249,"value":"其他"}]},{"attrId":1200000094,"attrName":"产地","valueList":[{"valueId":100000050,"value":"中国"}]},{"attrId":1200000132,"attrName":"国产/进口","valueList":[{"valueId":1300000003,"value":"国产"}]},{"attrId":1200000286,"attrName":"果品品牌","valueList":[{"valueId":1300000249,"value":"其他"}]}]` + MtwmSkuAttr200002680 = `[{"attrId":1200004607,"attrName":"水果形态","valueList":[{"valueId":1300017364,"value":"新鲜整果"}]},{"attrId":1200004608,"attrName":"单果重量","valueList":[{"valueId":1300004271,"value":"4kg~4.5kg"}]},{"attrId":1200000202,"attrName":"品种","valueList":[{"valueId":1300000249,"value":"其他"}]},{"attrId":1200000094,"attrName":"产地","valueList":[{"valueId":100000050,"value":"中国"}]},{"attrId":1200000132,"attrName":"国产/进口","valueList":[{"valueId":1300000003,"value":"国产"}]},{"attrId":1200000286,"attrName":"果品品牌","valueList":[{"valueId":1300000249,"value":"其他"}]}]` ) var ( @@ -177,10 +179,26 @@ func (a *API) RetailCatUpdate(poiCode, catName string, updateParams *Param4Updat params := utils.Struct2MapByJson(updateParams) params[KeyAppPoiCode] = poiCode params["category_name"] = catName - _, err = a.AccessAPI("retailCat/update", false, params) - return err + + categoryChannel <- params + for { + select { + case <-categoryChannel: + if _, err := a.AccessAPI("retailCat/update", false, params); err != nil { + errList = append(errList, err.Error()) + } + default: + return errors.New(strings.Join(errList, ",")) + } + } + + // _, err = a.AccessAPI("retailCat/update", false, params) + //return err } +var categoryChannel = make(chan map[string]interface{}, 100) +var errList = make([]string, 0, 0) + // 删除商品分类 // 当分类下存在子级分类或商品时，不允许直接删除此分类。 func (a *API) RetailCatDelete(poiCode, code, name string) (err error) { diff --git a/platformapi/mtwmapi/retail_test.go b/platformapi/mtwmapi/retail_test.go index 60faa73a..65d6c459 100644 --- a/platformapi/mtwmapi/retail_test.go +++ b/platformapi/mtwmapi/retail_test.go @@ -10,25 +10,36 @@ import ( "git.rosy.net.cn/baseapi/utils" ) +// 测试添加分类 +func TestRetailCatUpdate(t *testing.T) { + err := api.RetailCatUpdate("12663480", "测试2底料", &Param4UpdateCat{ + CategoryNameOrigin: "", + CategoryCodeOrigin: "", + CategoryCode: "45", + Sequence: 0, + }) + if err != nil { + t.Fatal(err) + } +} + +// 测试获取门店分类列表 func TestRetailCatList(t *testing.T) { - result, err := api.RetailCatList("8061767") + result, err := api.RetailCatList("12663480") if err != nil { t.Fatal(err) } t.Log(utils.Format4Output(result, false)) } -func TestRetailCatUpdate(t *testing.T) { - err := api.RetailCatUpdate("16690980", "咸菜罐头", &Param4UpdateCat{ - CategoryNameOrigin: "咸菜罐头", - CategoryCodeOrigin: "", - CategoryCode: "1", - Sequence: 3, - }) +// 测试删除门店分类列表 +func TestDeleteCat(t *testing.T) { + err := api.RetailCatDelete("12663480", "", "火锅底料") if err != nil { t.Fatal(err) } } + func TestRetailCatDelete(t *testing.T) { //var err error errList := errlist.New() diff --git a/platformapi/tiktok_shop/tiktok_api/api_test.go b/platformapi/tiktok_shop/tiktok_api/api_test.go index edd03e57..03fba8d6 100644 --- a/platformapi/tiktok_shop/tiktok_api/api_test.go +++ b/platformapi/tiktok_shop/tiktok_api/api_test.go @@ -21,7 +21,7 @@ func TestApi(t *testing.T) { } func TestQueryOrderDetail(t *testing.T) { - data, err := a.GetTiktokOrderDetail("5012575500183489614") + data, err := a.GetTiktokOrderDetail("5038446046747543348") globals.SugarLogger.Debugf("=====%s", utils.Format4Output(data, false)) globals.SugarLogger.Debugf("=====%s", err) } From 719507863acdef410ef9edbf87c7a44a2b0cc7ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 24 Feb 2023 16:59:07 +0800 Subject: [PATCH 02/12] 1 --- platformapi/jdapi/store.go | 4 ++ platformapi/jdapi/store_test.go | 60 +++++++++---------- .../tiktok_api/logistics_express.go | 10 +--- platformapi/tiktok_shop/tiktok_api/order.go | 4 +- 4 files changed, 38 insertions(+), 40 deletions(-) diff --git a/platformapi/jdapi/store.go b/platformapi/jdapi/store.go index 475a4852..d929f25e 100644 --- a/platformapi/jdapi/store.go +++ b/platformapi/jdapi/store.go @@ -4,6 +4,7 @@ package jdapi import ( "encoding/json" "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/globals" ) const ( @@ -337,6 +338,8 @@ func (a *API) GetStoreInfoByStationNo2(storeNo string) (storeDetail *StoreDetail // } func (a *API) UpdateStoreInfo4Open2(updateParams *OpStoreParams, modifyCloseStatus bool) (err error) { + globals.SugarLogger.Debugf("=updateParams=========: %s", utils.Format4Output(updateParams, false)) + globals.SugarLogger.Debugf("=modifyCloseStatus=========: %s", utils.Format4Output(modifyCloseStatus, false)) updateParams.Operator = utils.GetAPIOperator(updateParams.Operator) mapData := utils.Struct2MapByJson(updateParams) if !modifyCloseStatus { @@ -357,6 +360,7 @@ func (a *API) UpdateStoreInfo4Open2(updateParams *OpStoreParams, modifyCloseStat delete(mapData, "serviceTimeEnd1") } _, err = a.AccessAPINoPage("store/updateStoreInfo4Open", mapData, nil, nil, nullResultParser) + globals.SugarLogger.Debugf("=err=========: %s", utils.Format4Output(err, false)) return err } diff --git a/platformapi/jdapi/store_test.go b/platformapi/jdapi/store_test.go index e7ab8f71..199eb126 100644 --- a/platformapi/jdapi/store_test.go +++ b/platformapi/jdapi/store_test.go @@ -49,36 +49,36 @@ func TestGetStoreInfoByStationNo(t *testing.T) { } -// -//func TestUpdateStoreInfo4Open(t *testing.T) { -// result, err := api.GetStoreInfoByStationNo2(mustExistStoreID) -// if err != nil { -// t.Fatal(err) -// } -// oldAddress := result.StationAddress -// params := &OpStoreParams{ -// StationNo: mustExistStoreID, -// Operator: "test", -// StationAddress: oldAddress + "T", -// } -// err = api.UpdateStoreInfo4Open2(params, false) -// if err != nil { -// t.Fatal(err) -// } -// -// result, err = api.GetStoreInfoByStationNo2(mustExistStoreID) -// newAddress := result.StationAddress -// if newAddress != params.StationAddress { -// t.Fatalf("address not match, newAddress:%s, oldAddress:%s", newAddress, oldAddress) -// } -// -// params.StationAddress = oldAddress -// api.UpdateStoreInfo4Open2(params, false) -// if err != nil { -// t.Fatal(err) -// } -//} -// +func TestUpdateStoreInfo4Open(t *testing.T) { + params := &OpStoreParams{ + StationNo: "12664100", + StationName: "", + OutSystemID: "", + Mobile: "", + Phone: "", + Lat: 43.622098, + Lng: 122.275918, + StationAddress: "内蒙古自治区通辽市科尔沁区百花新城", + Operator: "liulei", + ServiceTimeEnd1: 0, + ServiceTimeStart1: 0, + ServiceTimeEnd2: 0, + ServiceTimeStart2: 0, + DeliveryRangeType: 0, + CoordinateType: 0, + DeliveryRangeRadius: 0, + CoordinatePoints: "", + CloseStatus: 0, + StoreNotice: "", + StandByPhone: "", + } + err := api.UpdateStoreInfo4Open2(params, false) + if err != nil { + t.Fatal(err) + } + +} + //func TestGetCommentByOrderId(t *testing.T) { // testOrderID := int64(922520919000622) // result, err := api.GetCommentByOrderId2(testOrderID) diff --git a/platformapi/tiktok_shop/tiktok_api/logistics_express.go b/platformapi/tiktok_shop/tiktok_api/logistics_express.go index 590938f3..c61eed4f 100644 --- a/platformapi/tiktok_shop/tiktok_api/logistics_express.go +++ b/platformapi/tiktok_shop/tiktok_api/logistics_express.go @@ -150,18 +150,12 @@ func (a *APIExpress) OrderStatusAndPsInfo(param map[string]interface{}) error { request.Param = psInfo if a.accessTokenObj == nil || a.accessTokenObj.CreateTokenData.AccessToken == "" { - _, createTokenErr := a.CreateToken() - globals.SugarLogger.Debugf("'==============createTokenErr : %s", utils.Format4Output(createTokenErr, false)) + a.CreateToken() } else if a.expiresIn < time.Now().Unix() { - _, RefreshToken := a.RefreshToken() - globals.SugarLogger.Debugf("'==============RefreshToken : %s", utils.Format4Output(RefreshToken, false)) + a.RefreshToken() } result, err := request.Execute(a.accessTokenObj) - //globals.SugarLogger.Debugf("'==============param : %s", utils.Format4Output(request.Param, false)) - //globals.SugarLogger.Debugf("'==============result : %s", utils.Format4Output(result, false)) - //globals.SugarLogger.Debugf("'==============param : %s", utils.Format4Output(err, false)) - //globals.SugarLogger.Debugf("key:%s,sercet:%s,expiresIn:%d,tokenObj :%s", a.appKey, a.appSecret, a.expiresIn, utils.Format4Output(a.accessTokenObj, false)) if err != nil { return err } diff --git a/platformapi/tiktok_shop/tiktok_api/order.go b/platformapi/tiktok_shop/tiktok_api/order.go index 48786dfc..d4735fb1 100644 --- a/platformapi/tiktok_shop/tiktok_api/order.go +++ b/platformapi/tiktok_shop/tiktok_api/order.go @@ -311,8 +311,8 @@ func (a *API) OrderDelivering(param *order_logisticsAdd_request.OrderLogisticsAd request.Param = param result, err := request.Execute(a.accessTokenObj) - globals.SugarLogger.Debugf("订单发货=========:%s", request.GetUrlPath()) - globals.SugarLogger.Debugf("订单发货:=%s", utils.Format4Output(result, false)) + //globals.SugarLogger.Debugf("订单发货=========:%s", request.GetUrlPath()) + //globals.SugarLogger.Debugf("订单发货:=%s", utils.Format4Output(result, false)) if err != nil { return err } From cf1578a2c83669a98e73e985a226c6479b520734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 25 Feb 2023 14:20:43 +0800 Subject: [PATCH 03/12] 1 --- platformapi/ebaiapi/shop_sku.go | 4 -- platformapi/jdapi/jdapi_test.go | 2 - platformapi/jdapi/store.go | 15 ++++-- platformapi/jdapi/store_test.go | 39 ++++++++------- platformapi/jdshopapi/order2.go | 2 - platformapi/mtwmapi/retail.go | 4 -- platformapi/tiktok_shop/tiktok_api/order.go | 4 -- platformapi/tiktok_shop/tiktok_api/sku.go | 7 --- platformapi/tiktok_shop/tiktok_api/store.go | 48 ------------------- .../tiktok_shop/tiktok_api/transport.go | 6 --- platformapi/uuptapi/callback.go | 3 -- platformapi/uuptapi/uuptapi.go | 2 - 12 files changed, 30 insertions(+), 106 deletions(-) diff --git a/platformapi/ebaiapi/shop_sku.go b/platformapi/ebaiapi/shop_sku.go index f365a9c4..3d058db2 100644 --- a/platformapi/ebaiapi/shop_sku.go +++ b/platformapi/ebaiapi/shop_sku.go @@ -2,7 +2,6 @@ package ebaiapi import ( "fmt" - "git.rosy.net.cn/jx-callback/globals" "regexp" "strings" @@ -250,7 +249,6 @@ func (a *API) ShopCategoryGet(shopID string) (cats []*CategoryInfo, err error) { return cats, nil } } - globals.SugarLogger.Debugf("ShopCategoryGet err====%v", err) return nil, err } @@ -316,7 +314,6 @@ func (a *API) SkuCreate(trackInfo, shopID string, customSkuID int64, params map[ if err == nil && result.Data != nil { return utils.Interface2Int64WithDefault(result.Data.(map[string]interface{})[KeySkuID], 0), nil } - globals.SugarLogger.Debugf("SkuCreate err====%v", err) return 0, err } @@ -329,7 +326,6 @@ func (a *API) SkuUpdate(trackInfo, shopID string, ebaiSkuID int64, params map[st if err == nil { return utils.Interface2Int64WithDefault(result.Data.(map[string]interface{})[KeySkuID], 0), nil } - globals.SugarLogger.Debugf("SkuUpdate err====%v", err) return 0, err } diff --git a/platformapi/jdapi/jdapi_test.go b/platformapi/jdapi/jdapi_test.go index 45c6c561..2bc3fbc9 100644 --- a/platformapi/jdapi/jdapi_test.go +++ b/platformapi/jdapi/jdapi_test.go @@ -216,8 +216,6 @@ func TestStringTo(t *testing.T) { globals.SugarLogger.Debugf("==============err := %s", err.Error()) } - globals.SugarLogger.Debugf("=data :=%s", utils.Format4Output(result0, false)) - } func TestDecode(t *testing.T) { diff --git a/platformapi/jdapi/store.go b/platformapi/jdapi/store.go index d929f25e..cdd46407 100644 --- a/platformapi/jdapi/store.go +++ b/platformapi/jdapi/store.go @@ -4,7 +4,6 @@ package jdapi import ( "encoding/json" "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/globals" ) const ( @@ -338,8 +337,6 @@ func (a *API) GetStoreInfoByStationNo2(storeNo string) (storeDetail *StoreDetail // } func (a *API) UpdateStoreInfo4Open2(updateParams *OpStoreParams, modifyCloseStatus bool) (err error) { - globals.SugarLogger.Debugf("=updateParams=========: %s", utils.Format4Output(updateParams, false)) - globals.SugarLogger.Debugf("=modifyCloseStatus=========: %s", utils.Format4Output(modifyCloseStatus, false)) updateParams.Operator = utils.GetAPIOperator(updateParams.Operator) mapData := utils.Struct2MapByJson(updateParams) if !modifyCloseStatus { @@ -360,7 +357,6 @@ func (a *API) UpdateStoreInfo4Open2(updateParams *OpStoreParams, modifyCloseStat delete(mapData, "serviceTimeEnd1") } _, err = a.AccessAPINoPage("store/updateStoreInfo4Open", mapData, nil, nil, nullResultParser) - globals.SugarLogger.Debugf("=err=========: %s", utils.Format4Output(err, false)) return err } @@ -401,6 +397,17 @@ func (a *API) OrgReplyComment(orderID int64, storeID, content, replayPin string) return err } +// 根据城市编码查询区域信息列表接口 +// https://opendj.jd.com/staticnew/widgets/resources.html?groupid=194&apiid=cc2a3b5d49e84f3eb41ee39a0afe33c3 +func (a *API) GetNextLevelByType(areaCode int64, pin string) (interface{}, error) { + jdParams := map[string]interface{}{ + "areaCode": areaCode, + "pin": pin, + } + result, err := a.AccessAPI("address/getNextLevelByType", jdParams) + return result, err +} + // 根据到家门店编码修改商家自动接单接口 // https://opendj.jd.com/staticnew/widgets/resources.html?groupid=194&apiid=5df446bb5ff14413965b8d702718dc48 func (a *API) UpdateStoreConfig4Open(stationNo string, isAutoOrder bool) (bool, error) { diff --git a/platformapi/jdapi/store_test.go b/platformapi/jdapi/store_test.go index 199eb126..6cf99d6d 100644 --- a/platformapi/jdapi/store_test.go +++ b/platformapi/jdapi/store_test.go @@ -51,26 +51,21 @@ func TestGetStoreInfoByStationNo(t *testing.T) { func TestUpdateStoreInfo4Open(t *testing.T) { params := &OpStoreParams{ - StationNo: "12664100", - StationName: "", - OutSystemID: "", - Mobile: "", - Phone: "", - Lat: 43.622098, - Lng: 122.275918, - StationAddress: "内蒙古自治区通辽市科尔沁区百花新城", - Operator: "liulei", - ServiceTimeEnd1: 0, - ServiceTimeStart1: 0, - ServiceTimeEnd2: 0, - ServiceTimeStart2: 0, - DeliveryRangeType: 0, - CoordinateType: 0, - DeliveryRangeRadius: 0, - CoordinatePoints: "", - CloseStatus: 0, - StoreNotice: "", - StandByPhone: "", + StationNo: "12664100", + StationName: "旺佳超市", + OutSystemID: "668836", + Mobile: "17751816719", + Phone: "17751816719", + Lat: 43.622098, + Lng: 122.275918, + City: 902, + County: 32769, + StationAddress: "内蒙古自治区通辽市科尔沁区百花新城", + Operator: "18981810340", + ServiceTimeEnd1: 44, + ServiceTimeStart1: 14, + CoordinateType: 3, + CloseStatus: 0, } err := api.UpdateStoreInfo4Open2(params, false) if err != nil { @@ -79,6 +74,10 @@ func TestUpdateStoreInfo4Open(t *testing.T) { } +func TestGetNextLevelByType(t *testing.T) { + api.GetNextLevelByType(902, "18981810") +} + //func TestGetCommentByOrderId(t *testing.T) { // testOrderID := int64(922520919000622) // result, err := api.GetCommentByOrderId2(testOrderID) diff --git a/platformapi/jdshopapi/order2.go b/platformapi/jdshopapi/order2.go index 5391ba34..731d27d1 100644 --- a/platformapi/jdshopapi/order2.go +++ b/platformapi/jdshopapi/order2.go @@ -2,7 +2,6 @@ package jdshopapi import ( "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/globals" ) //Creat by hang At 2022-03-28 @@ -66,7 +65,6 @@ func (a *API) GetOrderById2(orderID int64, isStatus bool) (getOrderResult *GetEn } result, err := a.AccessAPI("jingdong.pop.oto.locorderinfo.enget", prodURL2, params) - globals.SugarLogger.Debugf("===result :%s", utils.Format4Output(result, false)) if err == nil { utils.Map2StructByJson(result["jingdong_pop_order_enGet_responce"].(map[string]interface{})["orderDetailInfo"].(map[string]interface{})["orderInfo"], &getOrderResult, false) } diff --git a/platformapi/mtwmapi/retail.go b/platformapi/mtwmapi/retail.go index 635b6a36..4cf2d788 100644 --- a/platformapi/mtwmapi/retail.go +++ b/platformapi/mtwmapi/retail.go @@ -202,8 +202,6 @@ var errList = make([]string, 0, 0) // 删除商品分类 // 当分类下存在子级分类或商品时，不允许直接删除此分类。 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, } @@ -226,7 +224,6 @@ func (a *API) RetailCatList(poiCode string) (retailCatList []*RetailCategoryInfo if err != nil { globals.SugarLogger.Debugf("RetailCatList==========err %v", err) } - globals.SugarLogger.Debugf("result==========err %s", utils.Format4Output(result, false)) if err == nil { return interface2CatList(result, 1, nil), nil @@ -525,7 +522,6 @@ func (a *API) BatchSetRestockingPrice(trackInfo, appPoiCode string, spuData []*S KeyAppPoiCode: appPoiCode, "spu_data": spuData, }, resultKeyMsg, trackInfo) - globals.SugarLogger.Debugf("BatchSetRestockingPrice retVal====%v err===========%v", retVal, err) return err } diff --git a/platformapi/tiktok_shop/tiktok_api/order.go b/platformapi/tiktok_shop/tiktok_api/order.go index d4735fb1..c2e85624 100644 --- a/platformapi/tiktok_shop/tiktok_api/order.go +++ b/platformapi/tiktok_shop/tiktok_api/order.go @@ -19,7 +19,6 @@ import ( order_orderDetail_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/order_orderDetail/response" order_searchList_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/order_searchList/request" "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/globals" "math" "time" ) @@ -311,8 +310,6 @@ func (a *API) OrderDelivering(param *order_logisticsAdd_request.OrderLogisticsAd request.Param = param result, err := request.Execute(a.accessTokenObj) - //globals.SugarLogger.Debugf("订单发货=========:%s", request.GetUrlPath()) - //globals.SugarLogger.Debugf("订单发货:=%s", utils.Format4Output(result, false)) if err != nil { return err } @@ -467,7 +464,6 @@ func (a *API) CreateOrderCallback(orderStatus []byte) (map[string][]interface{}, if err := json.Unmarshal([]byte(data.Data), &create); err != nil { return nil, CallbackResponseErr(false) } - globals.SugarLogger.Debugf("CallbackShipmentInfoChange create=====%s", utils.Format4Output(create, false)) callbackResult[CallbackShipmentInfoChange] = append(callbackResult[CallbackShipmentInfoChange], create) default: return nil, CallbackResponseErr(false) diff --git a/platformapi/tiktok_shop/tiktok_api/sku.go b/platformapi/tiktok_shop/tiktok_api/sku.go index 097d04de..00aadcba 100644 --- a/platformapi/tiktok_shop/tiktok_api/sku.go +++ b/platformapi/tiktok_shop/tiktok_api/sku.go @@ -30,7 +30,6 @@ import ( superm_product_batchRedistributeStoreProduct_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_product_batchRedistributeStoreProduct/request" superm_product_createSubProduct_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_product_createSubProduct/request" superm_product_launchProduct_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_product_launchProduct/request" - "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/globals" "strings" ) @@ -119,11 +118,9 @@ func (a *API) CreateStoreCommodity(skuParam *product_addV2_request.ProductAddV2P request.Param = skuParam result, err := request.Execute(a.accessTokenObj) if err != nil { - globals.SugarLogger.Debugf("======CreateStoreCommodity logid: %s,%d,%d", result.LogId, skuParam.MainProductId, err.Error()) return nil, err } if result.Code != RequestSuccessCode { - globals.SugarLogger.Debugf("======CreateStoreCommodity logid: %s", utils.Format4Output(result, false)) return nil, errors.New(result.SubMsg) } return result.Data, nil @@ -151,11 +148,9 @@ func (a *API) EditStoreCommodity(sku *product_editV2_request.ProductEditV2Param) result, err := request.Execute(a.accessTokenObj) if err != nil { - globals.SugarLogger.Debugf("LogId %s ,err %s", result.LogId, err.Error()) return err } if result.Code != RequestSuccessCode { - globals.SugarLogger.Debugf("result err := %s", utils.Format4Output(result, false)) return errors.New(result.SubMsg) } return nil @@ -525,10 +520,8 @@ func (a *API) CreateSubProduct(mainProductId int64, storeId int64) (int64, error } if result.Code != RequestSuccessCode { - globals.SugarLogger.Debugf("=CreateSubProduct logID ========= %s", utils.Format4Output(result, false)) return 0, errors.New(result.SubMsg) } - globals.SugarLogger.Debugf("result CreateSubProduct %s", utils.Format4Output(result, false)) return result.Data.SubProductId, nil } diff --git a/platformapi/tiktok_shop/tiktok_api/store.go b/platformapi/tiktok_shop/tiktok_api/store.go index 4963efb7..c6cd7820 100644 --- a/platformapi/tiktok_shop/tiktok_api/store.go +++ b/platformapi/tiktok_shop/tiktok_api/store.go @@ -56,8 +56,6 @@ import ( warehouse_list_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/warehouse_list/response" warehouse_setFence_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/warehouse_setFence/request" warehouse_unbindStore_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/warehouse_unbindStore/request" - "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/globals" ) //GetStoreDetail 单个获取门店信息 @@ -221,8 +219,6 @@ func (a *API) BindStoreSaleLimit(param *shop_bindStoreSaleLimit_request.ShopBind request := shop_bindStoreSaleLimit_request.New() request.Param = param response, err := request.Execute(a.accessTokenObj) - globals.SugarLogger.Debugf("门店绑定限售模板=========:%s", request.GetUrlPath()) - globals.SugarLogger.Debugf("门店绑定限售模板:=%s", utils.Format4Output(response, false)) if err != nil { return err } @@ -237,8 +233,6 @@ func (a *API) StoreQuerySaleLimitTemp(storeId int64) (int64, error) { request := shop_getStoreSaleLimit_request.New() request.Param.StoreId = storeId result, err := request.Execute(a.accessTokenObj) - globals.SugarLogger.Debugf("门店查询限售模板=========:%s", request.GetUrlPath()) - globals.SugarLogger.Debugf("门店查询限售模板:=%s", utils.Format4Output(result, false)) if err != nil { return 0, err } @@ -256,8 +250,6 @@ func (a *API) FreightTemplateCreate(param *freightTemplate_create_request.Freigh request := freightTemplate_create_request.New() request.Param = param response, err := request.Execute(a.accessTokenObj) - globals.SugarLogger.Debugf("创建运费模板=========:%s", request.GetUrlPath()) - globals.SugarLogger.Debugf("创建运费模板:=%s", utils.Format4Output(response, false)) if err != nil { return nil, err } @@ -272,9 +264,6 @@ func (a *API) FreightTemplateUpdate(param *freightTemplate_update_request.Freigh request := freightTemplate_update_request.New() request.Param = param response, err := request.Execute(a.accessTokenObj) - globals.SugarLogger.Debugf("更新运费模板=========:%s", request.GetUrlPath()) - globals.SugarLogger.Debugf("更新运费模板:=%s", utils.Format4Output(response, false)) - globals.SugarLogger.Debugf("打印param 检查======%v", utils.Format4Output(request.Param, false)) if err != nil { return nil, err } @@ -289,8 +278,6 @@ func (a *API) BindFreightTemplate(param *shop_bindStoreFreight_request.ShopBindS request := shop_bindStoreFreight_request.New() request.Param = param response, err := request.Execute(a.accessTokenObj) - globals.SugarLogger.Debugf("门店绑定运费模板=========:%s", request.GetUrlPath()) - globals.SugarLogger.Debugf("门店绑定运费模板:=%s", utils.Format4Output(response, false)) if err != nil { return err } @@ -305,8 +292,6 @@ func (a *API) GetStoreFreight(storeId int64) ([]int64, error) { request := shop_getStoreFreight_request.New() request.Param.StoreId = storeId result, err := request.Execute(a.accessTokenObj) - globals.SugarLogger.Debugf("获取门店所有的运费模板=========:%s", request.GetUrlPath()) - globals.SugarLogger.Debugf("获取门店所有的运费模板:=%s", utils.Format4Output(result, false)) if err != nil { return nil, err } @@ -315,7 +300,6 @@ func (a *API) GetStoreFreight(storeId int64) ([]int64, error) { } tempList := make([]int64, 0) if result.Data == nil { - globals.SugarLogger.Debugf("绑定运费模板为空") tempList = append(tempList, 0) return tempList, err } @@ -329,8 +313,6 @@ func (a *API) GetStoreFreight(storeId int64) ([]int64, error) { func (a *API) GetStoreFreightDetail(freightId int64) (*freightTemplate_detail_response.Data, error) { request := freightTemplate_detail_request.New() result, err := request.Execute(a.accessTokenObj) - globals.SugarLogger.Debugf("获取门店运费模板详情=========:%s", request.GetUrlPath()) - globals.SugarLogger.Debugf("获取门店运费模板详情:=%s", utils.Format4Output(result, false)) if err != nil { return nil, err } @@ -345,8 +327,6 @@ func (a *API) GetStoreBindTemp(storeId int64) (freightId int64, err error) { request := shop_getStoreFreight_request.New() request.Param.StoreId = storeId result, err := request.Execute(a.accessTokenObj) - globals.SugarLogger.Debugf("获取门店绑定的运费模板=========:%s", request.GetUrlPath()) - globals.SugarLogger.Debugf("获取门店绑定的运费模板:=%s", utils.Format4Output(result, false)) if err != nil { return 0, err } @@ -366,8 +346,6 @@ func (a *API) BatchCreateWarehouse(param *warehouse_createBatch_request.Warehous request := warehouse_createBatch_request.New() request.Param = param response, err := request.Execute(a.accessTokenObj) - globals.SugarLogger.Debugf("批量创建区域仓=========:%s", request.GetUrlPath()) - globals.SugarLogger.Debugf("批量创建区域仓:=%s", utils.Format4Output(response, false)) if err != nil { return nil, err } @@ -382,8 +360,6 @@ func (a *API) CreateWarehouse(param *warehouse_create_request.WarehouseCreatePar request := warehouse_create_request.New() request.Param = param response, err := request.Execute(a.accessTokenObj) - globals.SugarLogger.Debugf("创建单个区域仓=========:%s", request.GetUrlPath()) - globals.SugarLogger.Debugf("创建单个区域仓:=%s", utils.Format4Output(response, false)) if err != nil { return nil, err } @@ -398,8 +374,6 @@ func (a *API) StoreBindWarehouse(param *warehouse_bindStore_request.WarehouseBin request := warehouse_bindStore_request.New() request.Param = param response, err := request.Execute(a.accessTokenObj) - globals.SugarLogger.Debugf("仓库绑定门店=========:%s", request.GetUrlPath()) - globals.SugarLogger.Debugf("仓库绑定门店:=%s", utils.Format4Output(response, false)) if err != nil { return nil, err } @@ -431,8 +405,6 @@ func (a *API) CreateFence(param *warehouse_createFence_request.WarehouseCreateFe request := warehouse_createFence_request.New() request.Param = param response, err := request.Execute(a.accessTokenObj) - globals.SugarLogger.Debugf("创建电子围栏=========:%s", request.GetUrlPath()) - globals.SugarLogger.Debugf("创建电子围栏:=%s", utils.Format4Output(response, false)) if err != nil { return nil, err } @@ -447,8 +419,6 @@ func (a *API) SetFence(param *warehouse_setFence_request.WarehouseSetFenceParam) request := warehouse_setFence_request.New() request.Param = param response, err := request.Execute(a.accessTokenObj) - globals.SugarLogger.Debugf("更新电子围栏=========:%s", request.GetUrlPath()) - globals.SugarLogger.Debugf("更新电子围栏:=%s", utils.Format4Output(response, false)) if err != nil { return err } @@ -477,8 +447,6 @@ func (a *API) WarehouseBindFence(param *warehouse_bindFences_request.WarehouseBi request := warehouse_bindFences_request.New() request.Param = param response, err := request.Execute(a.accessTokenObj) - globals.SugarLogger.Debugf("仓库绑定电子围栏=========:%s", request.GetUrlPath()) - globals.SugarLogger.Debugf("仓库绑定电子围栏:=%s", utils.Format4Output(response, false)) if err != nil { return err } @@ -493,8 +461,6 @@ func (a *API) GetFence(outFenceID []string) (*warehouse_getFences_response.Wareh request := warehouse_getFences_request.New() request.Param.OutFenceIdList = outFenceID response, err := request.Execute(a.accessTokenObj) - globals.SugarLogger.Debugf(" 获取仓库（即门店）绑定 电子围栏信息列表=========:%s", request.GetUrlPath()) - globals.SugarLogger.Debugf(" 获取仓库（即门店）绑定 电子围栏信息列表:=%s", utils.Format4Output(response, false)) if err != nil { return nil, err } @@ -510,8 +476,6 @@ func (a *API) AddressCreate(param *address_create_request.AddressCreateParam) (* request := address_create_request.New() request.Param = param response, err := request.Execute(a.accessTokenObj) - globals.SugarLogger.Debugf(" 门店新增查询发货地址=========:%s", request.GetUrlPath()) - globals.SugarLogger.Debugf(" 门店新增查询发货地址:=%s", utils.Format4Output(response, false)) if err != nil { return nil, err } @@ -526,8 +490,6 @@ func (a *API) GetAddressList(param *address_list_request.AddressListParam) (*add request := address_list_request.New() request.Param = param response, err := request.Execute(a.accessTokenObj) - globals.SugarLogger.Debugf(" 分页获取商家地址列表=========:%s", request.GetUrlPath()) - globals.SugarLogger.Debugf(" 分页获取商家地址列表:=%s", utils.Format4Output(response, false)) if err != nil { return nil, err } @@ -542,8 +504,6 @@ func (a *API) GetAreasByProvince(param *address_getAreasByProvince_request.Addre request := address_getAreasByProvince_request.New() request.Param = param response, err := request.Execute(a.accessTokenObj) - globals.SugarLogger.Debugf(" 根据省份ID获取全量四级地址=========:%s", request.GetUrlPath()) - globals.SugarLogger.Debugf(" 根据省份ID获取全量四级地址:=%s", utils.Format4Output(response, false)) if err != nil { return nil, err } @@ -558,8 +518,6 @@ func (a *API) GetProvince(param *address_getProvince_request.AddressGetProvinceP request := address_getProvince_request.New() request.Param = param response, err := request.Execute(a.accessTokenObj) - globals.SugarLogger.Debugf(" 获取四级地址全量省份信息=========:%s", request.GetUrlPath()) - globals.SugarLogger.Debugf(" 获取四级地址全量省份信息:=%s", utils.Format4Output(response, false)) if err != nil { return nil, err } @@ -574,8 +532,6 @@ func (a *API) QueryAllWarehouse(param *warehouse_list_request.WarehouseListParam request := warehouse_list_request.New() request.Param = param result, err := request.Execute(a.accessTokenObj) - globals.SugarLogger.Debugf(" 查询所有的仓库=========:%s", request.GetUrlPath()) - globals.SugarLogger.Debugf(" 查询所有的仓库:=%s", utils.Format4Output(result, false)) if err != nil { return nil, err } @@ -595,8 +551,6 @@ func (a *API) WarehouseUnbindStore(storeId []int64, outWarehouseId string) error request.Param.OutWarehouseId = outWarehouseId data, err := request.Execute(a.accessTokenObj) - globals.SugarLogger.Debugf(" 仓库解绑门店接口=========:%s", request.GetUrlPath()) - globals.SugarLogger.Debugf(" 仓库解绑门店接口:=%s", utils.Format4Output(data, false)) if err != nil { return err } @@ -613,8 +567,6 @@ func (a *API) SetStorePackageFee(storeID, packageFee int64) error { request.Param.StoreId = storeID request.Param.PackageFee = packageFee result, err := request.Execute(a.accessTokenObj) - globals.SugarLogger.Debugf(" 设置门店打包费接口=========:%s", request.GetUrlPath()) - globals.SugarLogger.Debugf(" 设置门店打包费接口:=%s", utils.Format4Output(result, false)) if err != nil { return err } diff --git a/platformapi/tiktok_shop/tiktok_api/transport.go b/platformapi/tiktok_shop/tiktok_api/transport.go index 70ba8872..0dcc549e 100644 --- a/platformapi/tiktok_shop/tiktok_api/transport.go +++ b/platformapi/tiktok_shop/tiktok_api/transport.go @@ -14,8 +14,6 @@ import ( superm_getStoreAutoCallRiderInfo_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_getStoreAutoCallRiderInfo/response" superm_orderDispatcher_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_orderDispatcher/request" superm_setStoreAutoCallRider_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_setStoreAutoCallRider/request" - "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/globals" "strings" ) @@ -60,8 +58,6 @@ func (a *API) SetStoreAutoCallRider(params *superm_setStoreAutoCallRider_request request := superm_setStoreAutoCallRider_request.New() request.Param = params response, err := request.Execute(a.accessTokenObj) - globals.SugarLogger.Debugf("订单自动呼叫运力 设置操作=========:%s", request.GetUrlPath()) - globals.SugarLogger.Debugf("订单自动呼叫运力 设置操作:=%s", utils.Format4Output(response, false)) if err != nil { return err } @@ -78,8 +74,6 @@ func (a *API) GetStoreAutoCallRiderInfo(storeID int64) (*superm_getStoreAutoCall StoreID: storeID, } response, err := request.Execute(a.accessTokenObj) - globals.SugarLogger.Debugf("查询自动呼叫运力配置=========:%s", request.GetUrlPath()) - globals.SugarLogger.Debugf("查询自动呼叫运力配置:=%s", utils.Format4Output(response, false)) if err != nil { return nil, err } diff --git a/platformapi/uuptapi/callback.go b/platformapi/uuptapi/callback.go index 54779461..d244334d 100644 --- a/platformapi/uuptapi/callback.go +++ b/platformapi/uuptapi/callback.go @@ -5,7 +5,6 @@ import ( "encoding/json" "errors" "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/globals" "net/http" ) @@ -48,7 +47,6 @@ func (a *API) WaybillCallback(request *http.Request) (*WaybillCallbackParam, *Ca if err := decoder.Decode(&retVal); err != nil { return nil, Err2CallbackResponse(errors.New("uu跑腿回调参数解析错误,请检查")) } - globals.SugarLogger.Debugf("uupt WaybillCallback retVal======%s", utils.Format4Output(retVal, false)) con := retVal != WaybillCallbackParam{} if con { return &retVal, Err2CallbackResponse(nil) @@ -62,7 +60,6 @@ func (a *API) CheckCallbackValidation(request *http.Request) (callbackResponse * if err == nil { sign := a.signParam(utils.URLValues2Map(request.PostForm)) if sign != request.FormValue(signKey) { - globals.SugarLogger.Infof("Signature is not ok, mine:%v, get:%v", sign, request.FormValue(signKey)) return SignatureIsNotOk } } else { diff --git a/platformapi/uuptapi/uuptapi.go b/platformapi/uuptapi/uuptapi.go index f74d72d0..7dcb693d 100644 --- a/platformapi/uuptapi/uuptapi.go +++ b/platformapi/uuptapi/uuptapi.go @@ -5,7 +5,6 @@ import ( "fmt" "git.rosy.net.cn/baseapi/platformapi" "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/globals" "math/rand" "net/http" "sort" @@ -77,7 +76,6 @@ func (a *API) AccessAPI(baseUrl, actionApi, method string, bizParams map[string] //} //完整请求url fullPath := utils.GenerateGetURL(baseUrl, actionApi, nil) - globals.SugarLogger.Debugf("uupt fullPath======%s", fullPath) //发送请求 sendUrl := func() *http.Request { var request *http.Request From 9868621d7e5083217074c8158b182c3b9e38f42b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 25 Feb 2023 14:26:57 +0800 Subject: [PATCH 04/12] 1 --- platformapi/mtwmapi/retail.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformapi/mtwmapi/retail.go b/platformapi/mtwmapi/retail.go index 4cf2d788..f0f5ba69 100644 --- a/platformapi/mtwmapi/retail.go +++ b/platformapi/mtwmapi/retail.go @@ -518,7 +518,7 @@ func (a *API) BatchSetRestockingPrice(trackInfo, appPoiCode string, spuData []*S globals.SugarLogger.Debugf("BatchSetRestockingPrice params======%s %s %s", v.PurchasePrice, v.AppSpuCode, v.SkuID) } } - retVal, err := a.AccessAPI2("/retail/purchase/price/update", false, map[string]interface{}{ + _, err := a.AccessAPI2("/retail/purchase/price/update", false, map[string]interface{}{ KeyAppPoiCode: appPoiCode, "spu_data": spuData, }, resultKeyMsg, trackInfo) From 22c6185172db1673f39f89ddec6c522368ae3699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 26 Feb 2023 19:23:59 +0800 Subject: [PATCH 05/12] 1 --- platformapi/mtwmapi/retail.go | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/platformapi/mtwmapi/retail.go b/platformapi/mtwmapi/retail.go index f0f5ba69..89a865d1 100644 --- a/platformapi/mtwmapi/retail.go +++ b/platformapi/mtwmapi/retail.go @@ -1,7 +1,6 @@ package mtwmapi import ( - "errors" "git.rosy.net.cn/jx-callback/globals" "regexp" "strings" @@ -180,20 +179,20 @@ func (a *API) RetailCatUpdate(poiCode, catName string, updateParams *Param4Updat params[KeyAppPoiCode] = poiCode params["category_name"] = catName - categoryChannel <- params - for { - select { - case <-categoryChannel: - if _, err := a.AccessAPI("retailCat/update", false, params); err != nil { - errList = append(errList, err.Error()) - } - default: - return errors.New(strings.Join(errList, ",")) - } - } + //categoryChannel <- params + //for { + // select { + // case <-categoryChannel: + // if _, err := a.AccessAPI("retailCat/update", false, params); err != nil { + // errList = append(errList, err.Error()) + // } + // default: + // return errors.New(strings.Join(errList, ",")) + // } + //} - // _, err = a.AccessAPI("retailCat/update", false, params) - //return err + _, err = a.AccessAPI("retailCat/update", false, params) + return err } var categoryChannel = make(chan map[string]interface{}, 100) From 855ba4e00d8b03b25e339101c9eb5cc2d8097f66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 27 Feb 2023 09:32:14 +0800 Subject: [PATCH 06/12] 1 --- platformapi/mtwmapi/retail.go | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/platformapi/mtwmapi/retail.go b/platformapi/mtwmapi/retail.go index 89a865d1..a4db641a 100644 --- a/platformapi/mtwmapi/retail.go +++ b/platformapi/mtwmapi/retail.go @@ -4,6 +4,7 @@ import ( "git.rosy.net.cn/jx-callback/globals" "regexp" "strings" + "time" "git.rosy.net.cn/baseapi/utils" ) @@ -179,25 +180,11 @@ func (a *API) RetailCatUpdate(poiCode, catName string, updateParams *Param4Updat params[KeyAppPoiCode] = poiCode params["category_name"] = catName - //categoryChannel <- params - //for { - // select { - // case <-categoryChannel: - // if _, err := a.AccessAPI("retailCat/update", false, params); err != nil { - // errList = append(errList, err.Error()) - // } - // default: - // return errors.New(strings.Join(errList, ",")) - // } - //} - + time.Sleep(200 * time.Millisecond) _, err = a.AccessAPI("retailCat/update", false, params) return err } -var categoryChannel = make(chan map[string]interface{}, 100) -var errList = make([]string, 0, 0) - // 删除商品分类 // 当分类下存在子级分类或商品时，不允许直接删除此分类。 func (a *API) RetailCatDelete(poiCode, code, name string) (err error) { @@ -210,9 +197,7 @@ 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 } @@ -220,10 +205,6 @@ func (a *API) RetailCatList(poiCode string) (retailCatList []*RetailCategoryInfo result, err := a.AccessAPI("retailCat/list", true, map[string]interface{}{ KeyAppPoiCode: poiCode, }) - if err != nil { - globals.SugarLogger.Debugf("RetailCatList==========err %v", err) - } - if err == nil { return interface2CatList(result, 1, nil), nil } From 462334d0c1a48ad4f5e79c846c952817386e0500 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 28 Feb 2023 14:14:26 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BE=8E=E5=9B=A2?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=95=86,=E5=92=8C=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/jdapi.go | 1 - platformapi/jdapi/store_page_test.go | 13 +++ platformapi/mtwmapi/retail.go | 6 +- platformapi/mtwmapi/retail_test.go | 44 ++++++++- .../tiktok_shop/tiktok_api/afs_test.go | 2 +- platformapi/tiktok_shop/tiktok_api/sku.go | 4 +- .../tiktok_shop/tiktok_api/sku_test.go | 97 +++++++++++++------ 7 files changed, 129 insertions(+), 38 deletions(-) diff --git a/platformapi/jdapi/jdapi.go b/platformapi/jdapi/jdapi.go index a1d648ed..041efc22 100644 --- a/platformapi/jdapi/jdapi.go +++ b/platformapi/jdapi/jdapi.go @@ -301,7 +301,6 @@ func (a *API) AccessAPINoPage2(apiStr string, jdParams map[string]interface{}, k return utils.DictKeysMan(result, keyToRemove, keyToKeep), nil } err = platformapi.RebuildError(err, jdParams, watchKeys) - baseapi.SugarLogger.Infof("AccessAPINoPage failed, apiStr:%s, jdParams:%s, data:%s, error:%v", apiStr, utils.Format4Output(jdParams, true), utils.Format4Output(jsonResult, true), err) return result, err } diff --git a/platformapi/jdapi/store_page_test.go b/platformapi/jdapi/store_page_test.go index e7cf8414..cf47d29d 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" + "git.rosy.net.cn/jx-callback/globals" "strings" "testing" ) @@ -218,6 +219,18 @@ func TestGetJdUpcCodeByName(t *testing.T) { t.Log(utils.Format4Output(result, false)) } +func TestGetAllCities(t *testing.T) { + citys, err := api.GetAllCities() + globals.SugarLogger.Debug("=========err %v", err) + globals.SugarLogger.Debug("=========len %d", len(citys)) + for _, v := range citys { + if v.AreaName == "通辽市" { + } + globals.SugarLogger.Debugf("=========data %s", utils.Format4Output(v, false)) + + } +} + //func TestGetJdSkuDirectPrice(t *testing.T) { // result, err := api.GetJdSkuDirectPrice(31031) // fmt.Println("test1", result, err) diff --git a/platformapi/mtwmapi/retail.go b/platformapi/mtwmapi/retail.go index a4db641a..bc1ccd02 100644 --- a/platformapi/mtwmapi/retail.go +++ b/platformapi/mtwmapi/retail.go @@ -187,7 +187,7 @@ func (a *API) RetailCatUpdate(poiCode, catName string, updateParams *Param4Updat // 删除商品分类 // 当分类下存在子级分类或商品时，不允许直接删除此分类。 -func (a *API) RetailCatDelete(poiCode, code, name string) (err error) { +func (a *API) RetailCatDelete(poiCode, code, name string, moveProductToUncate int) (err error) { params := map[string]interface{}{ KeyAppPoiCode: poiCode, } @@ -196,6 +196,10 @@ func (a *API) RetailCatDelete(poiCode, code, name string) (err error) { } else { params["category_name"] = name } + if moveProductToUncate != 0 { + params["move_product_to_uncate"] = 1 // 分类存在商品时将商品转移到未分类当中 + } + _, err = a.AccessAPI("retailCat/delete", false, params) return err diff --git a/platformapi/mtwmapi/retail_test.go b/platformapi/mtwmapi/retail_test.go index 65d6c459..4395e9ee 100644 --- a/platformapi/mtwmapi/retail_test.go +++ b/platformapi/mtwmapi/retail_test.go @@ -5,6 +5,7 @@ import ( "fmt" "git.rosy.net.cn/baseapi/utils/errlist" "git.rosy.net.cn/jx-callback/globals" + "strings" "testing" "git.rosy.net.cn/baseapi/utils" @@ -34,7 +35,7 @@ func TestRetailCatList(t *testing.T) { // 测试删除门店分类列表 func TestDeleteCat(t *testing.T) { - err := api.RetailCatDelete("12663480", "", "火锅底料") + err := api.RetailCatDelete("12663480", "", "火锅底料", 1) if err != nil { t.Fatal(err) } @@ -59,11 +60,11 @@ func TestRetailCatDelete(t *testing.T) { var errStr1 string var errStr2 string for _, v := range str { - if err := api.RetailCatDelete(v, "" /*utils.GetUpperUUID()*/, "热销"); err != nil { + if err := api.RetailCatDelete(v, "" /*utils.GetUpperUUID()*/, "热销", 1); err != nil { errList.AddErr(err) errStr1 += v + "," } - if err1 := api.RetailCatDelete(v, "" /*utils.GetUpperUUID()*/, "底料"); err1 != nil { + if err1 := api.RetailCatDelete(v, "" /*utils.GetUpperUUID()*/, "底料", 1); err1 != nil { errList1.AddErr(err1) errStr2 += v + "," } @@ -368,3 +369,40 @@ func TestCategoryAttrValueList(t *testing.T) { } t.Log(utils.Format4Output(result, false)) } + +func TestSplit(t *testing.T) { + param := "门店内存在重复的分类：【柑桔柚类】 【底料】 【火锅】，请先删除重复分类后再操作。" + firstIndex := strings.Index(param, "【") + lastIndex := strings.LastIndex(param, "】") + newParam := param[firstIndex:lastIndex] + new2 := strings.Split(newParam, "【") + cc := make([]string, 0, 0) + for _, v := range new2 { + if strings.TrimSpace(v) == "" { + continue + } else if strings.Contains(v, "【") { + for _, v2 := range strings.Split(v, "【") { + if strings.TrimSpace(v) == "" { + continue + } + if strings.TrimSpace(v2) != "" { + cc = append(cc, v2) + } + } + } else if strings.Contains(v, "】") { + for _, v3 := range strings.Split(v, "】") { + if strings.TrimSpace(v3) == "" { + continue + } + if strings.TrimSpace(v3) != "" { + cc = append(cc, v3) + } + } + } else { + cc = append(cc, v) + } + } + + fmt.Println("len-======", len(cc)) + globals.SugarLogger.Debugf("cc %s", utils.Format4Output(cc, false)) +} diff --git a/platformapi/tiktok_shop/tiktok_api/afs_test.go b/platformapi/tiktok_shop/tiktok_api/afs_test.go index ccacf74d..f3c0cab1 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":"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":"1ae389c0-f28f-4339-9a46-f58cca218148","expires_in":1677698819,"scope":"SCOPE","shop_id":68023619,"shop_name":"京西到家","refresh_token":"d97b7fb4-3601-4d66-ae0f-bd44892cd4d7","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 00aadcba..106b019a 100644 --- a/platformapi/tiktok_shop/tiktok_api/sku.go +++ b/platformapi/tiktok_shop/tiktok_api/sku.go @@ -30,6 +30,7 @@ import ( superm_product_batchRedistributeStoreProduct_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_product_batchRedistributeStoreProduct/request" superm_product_createSubProduct_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_product_createSubProduct/request" superm_product_launchProduct_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_product_launchProduct/request" + "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/globals" "strings" ) @@ -114,6 +115,7 @@ func (a *API) GetCatePropertyV2(categoryLeftId int64) (*product_getCatePropertyV // CreateStoreCommodity (新增总部商品) func (a *API) CreateStoreCommodity(skuParam *product_addV2_request.ProductAddV2Param) (*product_addV2_response.ProductAddV2Data, error) { + globals.SugarLogger.Debugf("CreateStoreCommodity===== %s", utils.Format4Output(skuParam, false)) request := product_addV2_request.New() request.Param = skuParam result, err := request.Execute(a.accessTokenObj) @@ -142,7 +144,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 ========") + globals.SugarLogger.Debugf("EditStoreCommodity===== %s", utils.Format4Output(sku, false)) request := product_editV2_request.New() request.Param = sku diff --git a/platformapi/tiktok_shop/tiktok_api/sku_test.go b/platformapi/tiktok_shop/tiktok_api/sku_test.go index ffdaeb8f..4b71ade2 100644 --- a/platformapi/tiktok_shop/tiktok_api/sku_test.go +++ b/platformapi/tiktok_shop/tiktok_api/sku_test.go @@ -142,7 +142,42 @@ func TestBatchDecrypt(t *testing.T) { // a.OrderUserInfoSensitive("4988354190732430566") //} -var c = []int64{71199364, 71199363, 71199362, 71199361, 71199360, 71199359, 71199358, 71199357, 71199356, 71199355, 71199354, 71199353, 71199352, 71199351, 71199350, 71199349, 70870848, 70870393, 69608467, 69395217, 66502882, 65585133, 65402632, 65401463, 64363086, 64292416, 64270631, 64270382, 64270381, 64270380, 64270379, 64270378, 64270377, 64270376, 64270375, 64270374, 64270373, 64270372, 64270371, 64270370, 64270369, 64270368, 64270367, 64270366, 64270365, 64270364, 64270363, 64270362, 64270361, 64270360, 64270359, 64270358, 64270357, 64270356, 64270355, 64270354, 64270353, 64270352, 64270351, 64270350, 64270349, 64270348, 64270347, 64270346, 64270345, 64270344, 64270343, 64270342, 64270341, 64270340, 64270339, 64270338, 64270337, 64270336, 64270335, 64270334, 64270333, 64270331, 64270330, 64270329, 64270328, 64270327, 64270326, 64270325, 64270324, 64270323, 64270322, 64270321, 64270320, 64270319, 64270318, 64270317, 64270316, 64270315, 64270314, 64270313, 64270312, 64270311, 64270310, 64270309, 64270308, 64270307, 64270306, 64270305, 64270304, 64270303, 64270302, 64270301, 64270300, 64270299, 64270298, 64270297, 64270296, 64270295, 64270294, 64270293, 64270292, 64270291, 64270290, 64270289, 64270288, 64270287, 64270286, 64270285, 64270284, 64270283, 64270282, 64270281, 64270280, 64270279, 64270278, 64270277, 64270276, 64270275, 64270274, 64270273, 64270272, 64270271, 64270270, 64270269, 64270268, 64270267, 64270266, 64270265, 64270264, 64270263, 64270262, 64270261, 64270260, 64270259, 64270258, 64270257, 64270256, 64270255, 64270254, 64270253, 64270252, 64270251, 64270250, 64270249, 64270248, 64270247, 64270246, 64270245, 64270244, 64270243, 64270242, 64270241, 64270240, 64270239, 64270238, 64270237, 64270236, 64270235, 64270234, 64270233, 64270232, 64270231, 64270230, 64270229, 64270228, 64270227, 64270226, 64270225, 64270224, 64270223, 64270222, 64270221, 64270220, 64270219, 64270217, 64270216, 64270215, 64270214, 64270213, 64270212, 64270211, 64270210, 64270209, 64270208, 64270207, 64270206, 64270205, 64270204, 64270203, 64270202, 64270201, 64270200, 64270199, 64270198, 64270197, 64270196, 64270195, 64270194, 64270193, 64270192, 64270191, 64270190, 64270189, 64270188, 64270187, 64270186, 64270185, 64270184, 64270183, 64270182, 64270181, 64270180, 64270179, 64270178, 64270177, 64270176, 64270175, 64270174, 64270173, 64270172, 64270171, 64270170, 64270169, 64270168, 64270167, 64270166, 64270165, 64270164, 64270163, 64270162, 64270161, 64270160, 64270159, 64270158, 64270157, 64270156, 64270155, 64270154, 64270153, 64270152, 64270151, 64270150, 64270149, 64270148, 64270147, 64270146, 64270145, 64270144, 64270143, 64270142, 64270141, 64270140, 64270139, 64270138, 64270137, 64270136, 64270135, 64270134, 64270133, 64270132, 64270131, 64270130, 64270129, 64270128, 64270127, 64270126, 64270125, 64270124, 64270123, 64270122, 64270121, 64270120, 64270119, 64270118, 64270117, 64270116, 64270115, 64270114, 64270113, 64270112, 64270111, 64270110, 64270109, 64270108, 64270107, 64270106, 64270105, 64270104, 64270103, 64270102, 64270101, 64270100, 64270099, 64270098, 64270097, 64270096, 64270095, 64270094, 64270093, 64270092, 64270091, 64270090, 64270089, 64270088, 64270087, 64270086, 64270085, 64270084, 64270083, 64270082, 64270081, 64270080, 64270079, 64270078, 64270077, 64270076, 64270075, 64270074, 64270073, 64270072, 64270071, 64270070, 64270069, 64270068, 64270067, 64270066, 64270065, 64270064, 64270063, 64270062, 64270061, 64270060, 64270059, 64270058, 64270057, 64270056, 64270055, 64270054, 64270053, 64270052, 64270051, 64270050, 64270049, 64270048, 64270047, 64270046, 64270045, 64270044, 64270043, 64270042, 64270041, 64270040, 64270039, 64270038, 64270037, 64270036, 64270035, 64270034, 64270033, 64270032, 64270031, 64270030, 64270029, 64270028, 64270027, 64270026, 64270025, 64270024, 64270023, 64270022, 64270021, 64270020, 64270019, 64270018, 64270017, 64270016, 64270015, 64270014, 64270013, 64270012, 64270011, 64270010, 64270009, 64270008, 64270007, 64270006, 64270005, 64270004, 64270003, 64270002, 64270001, 64270000, 64269999, 64269998, 64269997, 64269996, 64269995, 64269994, 64269993, 64269992, 64269991, 64269990, 64269989, 64269988, 64269987, 64269986, 64269985, 64269984, 64269983, 64269982, 64269981, 64269980, 64269979, 64269978, 64269977, 64269976, 64269975, 64269974, 64269973, 64269972, 64269971, 64269970, 64269969, 64269968, 64269967, 64269966, 64269965, 64269964, 64269963, 64269962, 64269961, 64269960, 64269959, 64269958, 64269957, 64269956, 64269955, 64269954, 64269953, 64269952, 64269951, 64269950, 64269949, 64269948, 64269947, 64269946, 64269945, 64269944, 64269943, 64269942, 64269941, 64269940, 64269939, 64269938, 64269937, 64269936, 64269935, 64269934, 64269933, 64269932, 64269931, 64269930, 64269929, 64269928, 64269927, 64269926, 64269925, 64269924, 64269923, 64269922, 64252804, 64252803, 64252802, 64252801, 64252800, 64252799, 64252798, 64252797, 64252796, 64252795, 64252794, 64252793, 64252792, 64252791, 64252790, 64252789, 64252788, 64252787, 64252786, 64252785, 64252784, 64252783, 64252782, 64251903, 64251902, 64251901, 64251900, 64251899, 64251898, 64251897, 64251896, 64251895, 64251894, 64251893, 64251892, 64251891, 64251890, 64251889, 64251888, 64251887, 64251886, 64251885, 64251884, 64251883, 64251882, 64251881, 64251880, 64251879, 64251878, 64251877, 64251876, 64251875, 64251874, 64251873, 64251872, 64251871, 64251870, 64251869, 64251868, 64251867, 64251866, 64251865, 64251864, 64251863, 64251862, 64251861, 64251860, 64251859, 64251858, 64251857, 64251856, 64251855, 64251854, 64251853, 64251634, 64251633, 64251632, 64251631, 64251630, 64251629, 64251628, 64251627, 64251626, 64251625, 64251624, 64251623, 64251622, 64251621, 64251620, 64251619, 64251618, 64251617, 64251616, 64251615, 64251614, 64251613, 64251612, 64251611, 64251610, 64251609, 64251608, 64251607, 64251606, 64251605, 64251604, 64251603, 64251602, 64251601, 64251600, 64251599, 64251224, 64251223, 64251222, 64251221, 64251220, 64251219, 64251218, 64251217, 64251216, 64251215, 64251214, 64251213, 64251212, 64251211, 64251210, 64251209, 64251208, 64251207, 64251206, 64251205, 64251204, 64251203, 64251202, 64251201, 64251200, 64251199, 64251198, 64251197, 64251196, 64251195, 64250758, 64250756, 64250755, 64250754, 64250753, 64250751, 64250750, 64250749, 64250748, 64250746, 64250745, 64250744, 64250743, 64250742, 64250741, 64250740, 64250739, 64250738, 64250736, 64250735, 64250734, 64250733, 64250732, 64250731, 64250730, 64250729, 64250728, 64250727, 64250724, 64250722, 64250720, 64250717, 64250715, 64250714, 64250713, 64250712, 64250711, 64250710, 64250709, 64250708, 64250707, 64250704, 64250703, 64212758, 64212030, 64208920, 64208821, 64208482, 64208305, 64208009, 64200572, 64200094, 64199878, 64199719, 64198428, 64176100, 64175830, 64175570, 64174147, 64140100, 64138874, 64138148, 64137635, 64134486, 64091796, 64091449, 64090703, 64089616, 64089252, 64088268, 64042829, 63841927, 63841926, 63841925, 63841924, 63841923, 63841426, 63840545, 63840103, 63837040, 63836369, 63836019, 63835743, 63830250, 63826512, 63825967, 63789725, 63783027, 63783026, 63783025, 63783024, 63783023, 63783022, 63783021, 63521502, 63521394, 63520894, 63520826, 63520432, 63520016, 63519651, 63517900, 63517652, 63517290, 63511878, 63509810, 63509510, 63509364, 63508531, 63508263, 63507300, 63507093, 63504497, 63504222, 63503537, 63503468, 63503199, 63485316, 63468251, 63468130, 63468038, 63467912, 63467783, 63467659, 63467462, 63467326, 63467143, 63467044, 63465423, 63465133, 63463365, 63463026, 63463014, 63462817, 63457010, 63325222, 63224599, 63223727, 63183340, 63183100, 63182898, 63182749, 63182392, 63182200, 63181030, 63179331, 63178998, 63178597, 63177967, 63177531, 63177145, 63172646, 62493432, 62490423} +var c = []int64{ + 87893329, + 87542533, + 86486240, + 86454312, + 85672244, + 85672146, + 85672027, + 85671854, + 85671727, + 85671454, + 85671173, + 85670943, + 84938439, + 84936029, + 83727966, + 81521327, + 80790189} + +//668851, +//668841, +//668711, +//668770, +//668709, +//668708, +//668713, +//668707, +//668712, +//668710, +//668714, +//668723, +//668790, +//668789, +//668785, +//668512, +//667481, // 删除已经创建商品,重新同步 func TestDeleteSkuAndUploadSku(t *testing.T) { @@ -177,6 +212,36 @@ func TestDeleteSkuAndUploadSku(t *testing.T) { } } +// 删除已经创建商品,重新同步封禁 +func TestDeleteSkuAndUploadSkuFengJinBiXu222(t *testing.T) { + var errList = make([]error, 0, 0) + for i := 1; i < 100; i++ { + result, err := a.GetSkuDetailList(&product_listV2_request.ProductListV2Param{ + //Status: 2, + //CheckStatus: 3, // 1-未提交；2-待审核；3-审核通过；4-审核未通过；5-封禁；7-审核通过待上架 + Page: int64(i), + Size: 100, + }) + if err != nil { + globals.SugarLogger.Debugf("=index := %d ,err := %s", i, utils.Format4Output(err, false)) + continue + } + if len(result.Data) == 0 { + break + } + for _, v := range result.Data { + err := a.DeleteStoreCommodity(v.ProductId) + if err != nil { + errList = append(errList, err) + } + } + } + + for _, v := range errList { + globals.SugarLogger.Debugf("err := %s", utils.Format4Output(v, false)) + } +} + // 删除已经创建商品,重新同步 func TestDeleteSkuAndUploadSku55(t *testing.T) { var errList = make([]error, 0, 0) @@ -345,36 +410,6 @@ func TestDeleteSkuAndUploadSkuYanChiBiXu(t *testing.T) { } } -// 删除已经创建商品,重新同步封禁 -func TestDeleteSkuAndUploadSkuFengJinBiXu222(t *testing.T) { - var errList = make([]error, 0, 0) - for i := 1; i < 100; i++ { - result, err := a.GetSkuDetailList(&product_listV2_request.ProductListV2Param{ - Status: 0, - CheckStatus: 3, // 1-未提交；2-待审核；3-审核通过；4-审核未通过；5-封禁；7-审核通过待上架 - Page: int64(i), - Size: 100, - }) - if err != nil { - globals.SugarLogger.Debugf("=index := %d ,err := %s", i, utils.Format4Output(err, false)) - continue - } - if len(result.Data) == 0 { - break - } - for _, v := range result.Data { - err := a.DeleteStoreCommodity(v.ProductId) - if err != nil { - errList = append(errList, err) - } - } - } - - for _, v := range errList { - globals.SugarLogger.Debugf("err := %s", utils.Format4Output(v, false)) - } -} - // 删除已经创建商品,重新同步封禁 func TestDeleteSkuAndUploadSkuFengJinBiXu22332(t *testing.T) { var errList = make([]error, 0, 0) From 14dc78b1ede6b9f7f94efad0ed0158ca635caecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 28 Feb 2023 15:25:43 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platformapi/tiktok_shop/tiktok_api/sku.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/platformapi/tiktok_shop/tiktok_api/sku.go b/platformapi/tiktok_shop/tiktok_api/sku.go index 106b019a..15111564 100644 --- a/platformapi/tiktok_shop/tiktok_api/sku.go +++ b/platformapi/tiktok_shop/tiktok_api/sku.go @@ -30,8 +30,6 @@ import ( superm_product_batchRedistributeStoreProduct_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_product_batchRedistributeStoreProduct/request" superm_product_createSubProduct_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_product_createSubProduct/request" superm_product_launchProduct_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_product_launchProduct/request" - "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/globals" "strings" ) @@ -115,7 +113,6 @@ func (a *API) GetCatePropertyV2(categoryLeftId int64) (*product_getCatePropertyV // CreateStoreCommodity (新增总部商品) func (a *API) CreateStoreCommodity(skuParam *product_addV2_request.ProductAddV2Param) (*product_addV2_response.ProductAddV2Data, error) { - globals.SugarLogger.Debugf("CreateStoreCommodity===== %s", utils.Format4Output(skuParam, false)) request := product_addV2_request.New() request.Param = skuParam result, err := request.Execute(a.accessTokenObj) @@ -144,7 +141,6 @@ func (a *API) SyncStockBatch(param *sku_syncStockBatch_request.SkuSyncStockBatch // EditStoreCommodity 编辑商品 func (a *API) EditStoreCommodity(sku *product_editV2_request.ProductEditV2Param) error { - globals.SugarLogger.Debugf("EditStoreCommodity===== %s", utils.Format4Output(sku, false)) request := product_editV2_request.New() request.Param = sku From ca542edd1e39752d678ac2358e4cbf6171c10287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 28 Feb 2023 18:33:42 +0800 Subject: [PATCH 09/12] 1 --- platformapi/tiktok_shop/tiktok_api/sku.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/platformapi/tiktok_shop/tiktok_api/sku.go b/platformapi/tiktok_shop/tiktok_api/sku.go index 15111564..02343260 100644 --- a/platformapi/tiktok_shop/tiktok_api/sku.go +++ b/platformapi/tiktok_shop/tiktok_api/sku.go @@ -30,6 +30,8 @@ import ( superm_product_batchRedistributeStoreProduct_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_product_batchRedistributeStoreProduct/request" superm_product_createSubProduct_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_product_createSubProduct/request" superm_product_launchProduct_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_product_launchProduct/request" + "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/globals" "strings" ) @@ -145,6 +147,8 @@ func (a *API) EditStoreCommodity(sku *product_editV2_request.ProductEditV2Param) request.Param = sku result, err := request.Execute(a.accessTokenObj) + globals.SugarLogger.Debugf("EditStoreCommodity 1 %s", utils.Format4Output(result, false)) + globals.SugarLogger.Debugf("EditStoreCommodity 2 %s", utils.Format4Output(err, false)) if err != nil { return err } From 81e75c4cf9a891e8e103e24845ac5c63ad86e7ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 28 Feb 2023 21:40:23 +0800 Subject: [PATCH 10/12] 1 --- platformapi/tiktok_shop/tiktok_api/sku.go | 1 + 1 file changed, 1 insertion(+) diff --git a/platformapi/tiktok_shop/tiktok_api/sku.go b/platformapi/tiktok_shop/tiktok_api/sku.go index 02343260..1861072a 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 func (a *API) EditStoreCommodity(sku *product_editV2_request.ProductEditV2Param) error { request := product_editV2_request.New() request.Param = sku + globals.SugarLogger.Debugf("sku 1 %s", utils.Format4Output(sku, false)) result, err := request.Execute(a.accessTokenObj) globals.SugarLogger.Debugf("EditStoreCommodity 1 %s", utils.Format4Output(result, false)) From c4e33abf90ab04911a860ca5d86681fad70f68b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 28 Feb 2023 22:10:06 +0800 Subject: [PATCH 11/12] 1 --- platformapi/jdapi/store_page_test.go | 2 +- platformapi/tiktok_shop/tiktok_api/sku.go | 5 ----- platformapi/tiktok_shop/tiktok_api/sku_delete_test.go | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/platformapi/jdapi/store_page_test.go b/platformapi/jdapi/store_page_test.go index cf47d29d..bbc0458b 100644 --- a/platformapi/jdapi/store_page_test.go +++ b/platformapi/jdapi/store_page_test.go @@ -211,7 +211,7 @@ func TestC(t *testing.T) { //} // func TestGetJdUpcCodeByName(t *testing.T) { - result, err := api.GetJdUpcCodeByName("", "9556771007300", 1, 5) + result, err := api.GetJdUpcCodeByName("", "6909931247116", 1, 5) if err != nil { t.Fatal(err) } diff --git a/platformapi/tiktok_shop/tiktok_api/sku.go b/platformapi/tiktok_shop/tiktok_api/sku.go index 1861072a..15111564 100644 --- a/platformapi/tiktok_shop/tiktok_api/sku.go +++ b/platformapi/tiktok_shop/tiktok_api/sku.go @@ -30,8 +30,6 @@ import ( superm_product_batchRedistributeStoreProduct_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_product_batchRedistributeStoreProduct/request" superm_product_createSubProduct_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_product_createSubProduct/request" superm_product_launchProduct_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_product_launchProduct/request" - "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/globals" "strings" ) @@ -145,11 +143,8 @@ func (a *API) SyncStockBatch(param *sku_syncStockBatch_request.SkuSyncStockBatch func (a *API) EditStoreCommodity(sku *product_editV2_request.ProductEditV2Param) error { request := product_editV2_request.New() request.Param = sku - globals.SugarLogger.Debugf("sku 1 %s", utils.Format4Output(sku, false)) result, err := request.Execute(a.accessTokenObj) - globals.SugarLogger.Debugf("EditStoreCommodity 1 %s", utils.Format4Output(result, false)) - globals.SugarLogger.Debugf("EditStoreCommodity 2 %s", utils.Format4Output(err, false)) if err != nil { return err } diff --git a/platformapi/tiktok_shop/tiktok_api/sku_delete_test.go b/platformapi/tiktok_shop/tiktok_api/sku_delete_test.go index abfdf6c5..9cc8995b 100644 --- a/platformapi/tiktok_shop/tiktok_api/sku_delete_test.go +++ b/platformapi/tiktok_shop/tiktok_api/sku_delete_test.go @@ -52,7 +52,7 @@ func GetTiktokImgListTest(api *API, storeId, appOrgCode string, detailImg string } func TestGetSkuBrand(t *testing.T) { - data, err := a.GetSkuBrand(22843, "康师傅") + data, err := a.GetSkuBrand(28239, "多力/MIGHTY") globals.SugarLogger.Debugf("data ========= %v", data) globals.SugarLogger.Debugf("data ========= %s", err) } From 274a127c31b27012875473bbf10ff3d6f8857771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 1 Mar 2023 14:03:05 +0800 Subject: [PATCH 12/12] 1 --- platformapi/tiktok_shop/tiktok_api/sku_delete_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformapi/tiktok_shop/tiktok_api/sku_delete_test.go b/platformapi/tiktok_shop/tiktok_api/sku_delete_test.go index 9cc8995b..f0760be6 100644 --- a/platformapi/tiktok_shop/tiktok_api/sku_delete_test.go +++ b/platformapi/tiktok_shop/tiktok_api/sku_delete_test.go @@ -52,7 +52,7 @@ func GetTiktokImgListTest(api *API, storeId, appOrgCode string, detailImg string } func TestGetSkuBrand(t *testing.T) { - data, err := a.GetSkuBrand(28239, "多力/MIGHTY") + data, err := a.GetSkuBrand(23156, "娃哈哈") globals.SugarLogger.Debugf("data ========= %v", data) globals.SugarLogger.Debugf("data ========= %s", err) }