diff --git a/platformapi/tiktok_shop/tiktok_api/store.go b/platformapi/tiktok_shop/tiktok_api/store.go index d9b75fcc..06496583 100644 --- a/platformapi/tiktok_shop/tiktok_api/store.go +++ b/platformapi/tiktok_shop/tiktok_api/store.go @@ -72,7 +72,7 @@ func (a *API) GetStoreDetail(param *shop_getStoreDetail_request.ShopGetStoreDeta return nil, err } if response.Code != RequestSuccessCode { - return nil, errors.New(response.SubMsg + ":" + response.LogId) + return nil, errors.New(response.LogId + ":" + response.SubMsg + ":" + response.LogId) } return response.Data, nil } @@ -87,7 +87,7 @@ func (a *API) BatchCreateStore(param *shop_batchCreateStore_request.ShopBatchCre } if response.Code != RequestSuccessCode { //return nil, errors.New(response.Data.ResultList[0].Msg) - return nil, errors.New(response.Msg + ":" + response.LogId) + return nil, errors.New(response.LogId + ":" + response.Msg + ":" + response.LogId) } //if response.Data.ResultList[0].Store.StoreId == 0 { // return nil, errors.New(response.Msg + "," + response.SubMsg) @@ -104,7 +104,7 @@ func (a *API) EditStore(param *shop_editStore_request.ShopEditStoreParam) error return err } if response.Code != RequestSuccessCode { - return errors.New(response.SubMsg + ":" + response.LogId) + return errors.New(response.LogId + ":" + response.SubMsg + ":" + response.LogId) } return nil } @@ -131,7 +131,7 @@ func (a *API) StoreSuspend2(storeID int64) (*shop_storeSuspend_response.ShopStor return nil, err } if response.Code != RequestSuccessCode { - return nil, errors.New(response.SubMsg + ":" + response.LogId) + return nil, errors.New(response.LogId + ":" + response.SubMsg + ":" + response.LogId) } return response.Data, nil } @@ -145,7 +145,7 @@ func (a *API) UnsuspendStore(param *shop_unsuspendStore_request.ShopUnsuspendSto return nil, err } if response.Code != RequestSuccessCode { - return nil, errors.New(response.SubMsg + ":" + response.LogId) + return nil, errors.New(response.LogId + ":" + response.SubMsg + ":" + response.LogId) } return response.Data, nil } @@ -157,7 +157,7 @@ func (a *API) UnsuspendStore2(storeID int64) (*shop_unsuspendStore_response.Shop return nil, err } if response.Code != RequestSuccessCode { - return nil, errors.New(response.SubMsg + ":" + response.LogId) + return nil, errors.New(response.LogId + ":" + response.SubMsg + ":" + response.LogId) } return response.Data, nil } @@ -176,7 +176,7 @@ func (a *API) GetStoreList(param *shop_getStoreList_request.ShopGetStoreListPara return nil, err } if response.Code != RequestSuccessCode { - return nil, errors.New(response.SubMsg + ":" + response.LogId) + return nil, errors.New(response.LogId + ":" + response.SubMsg + ":" + response.LogId) } //测试用 resp := map[int64]string{} @@ -197,7 +197,7 @@ func (a *API) GetStoreList2(param *shop_getStoreList_request.ShopGetStoreListPar return nil, err } if response.Code != RequestSuccessCode { - return nil, errors.New(response.SubMsg + ":" + response.LogId) + return nil, errors.New(response.LogId + ":" + response.SubMsg + ":" + response.LogId) } return response, err @@ -212,7 +212,7 @@ func (a *API) CreateTradeLimitTemplate(param *trade_createTradeLimitTemplate_req return nil, err } if response.Code != RequestSuccessCode { - return nil, errors.New(response.SubMsg + ":" + response.LogId) + return nil, errors.New(response.LogId + ":" + response.SubMsg + ":" + response.LogId) } return response.Data, nil } @@ -226,7 +226,7 @@ func (a *API) UpdateTradeLimitTemplate(param *trade_UpdateTradeLimitTemplate_req return nil, err } if response.Code != RequestSuccessCode { - return nil, errors.New(response.SubMsg + ":" + response.LogId) + return nil, errors.New(response.LogId + ":" + response.SubMsg + ":" + response.LogId) } return response.Data, nil } @@ -240,7 +240,7 @@ func (a *API) BindStoreSaleLimit(param *shop_bindStoreSaleLimit_request.ShopBind return err } if response.Code != RequestSuccessCode { - return errors.New(response.SubMsg + ":" + response.LogId) + return errors.New(response.LogId + ":" + response.SubMsg + ":" + response.LogId) } return nil } @@ -254,7 +254,7 @@ func (a *API) StoreQuerySaleLimitTemp(storeId int64) (int64, error) { return 0, err } if result.Code != RequestSuccessCode { - return 0, errors.New(result.SubMsg + ":" + result.LogId) + return 0, errors.New(result.LogId + ":" + result.SubMsg + ":" + result.LogId) } if result.Data == nil || len(result.Data.StoreSaleLimits) == 0 { return 0, errors.New("未绑定限售模板,请先绑定") @@ -271,7 +271,7 @@ func (a *API) GetSaleLimitDetail(saleLimitId *[]int64) (*trade_batchGetTradeLimi return nil, err } if result.Code != RequestSuccessCode { - return nil, errors.New(result.SubMsg + ":" + result.LogId) + return nil, errors.New(result.LogId + ":" + result.SubMsg + ":" + result.LogId) } if result.Data == nil || len(result.Data.TradeLimitTemplateList) == 0 { return nil, errors.New("未查找到限售模板详情") @@ -290,7 +290,7 @@ func (a *API) FreightTemplateCreate(param *freightTemplate_create_request.Freigh } if response.Code != RequestSuccessCode { globals.SugarLogger.Debugf("创建门店运费模板错误信息====%v", errors.New(response.SubMsg)) - return nil, errors.New(response.Msg + "," + response.SubMsg) + return nil, errors.New(response.LogId + ":" + response.Msg + "," + response.SubMsg) } return response.Data, nil } @@ -305,7 +305,7 @@ func (a *API) FreightTemplateUpdate(param *freightTemplate_update_request.Freigh } if response.Code != RequestSuccessCode { globals.SugarLogger.Debugf("FreightTemplateUpdate err====%v", response.SubMsg) - return nil, errors.New(response.Msg + "," + response.SubMsg) + return nil, errors.New(response.LogId + ":" + response.Msg + "," + response.SubMsg) } return nil, nil } @@ -319,7 +319,7 @@ func (a *API) BindFreightTemplate(param *shop_bindStoreFreight_request.ShopBindS return err } if response.Code != RequestSuccessCode { - return errors.New(response.SubMsg) + return errors.New(response.LogId + ":" + response.SubMsg) } return nil } @@ -334,7 +334,7 @@ func (a *API) GetStoreFreight(storeId int64) ([]int64, error) { } if result.Code != RequestSuccessCode { globals.SugarLogger.Debugf("获取门店运费模板错误信息====%v", errors.New(result.SubMsg)) - return nil, errors.New(result.SubMsg) + return nil, errors.New(result.LogId + ":" + result.SubMsg) } tempList := make([]int64, 0) if result.Data == nil { @@ -356,7 +356,7 @@ func (a *API) GetStoreFreightDetail(freightId int64) (*freightTemplate_detail_re return nil, err } if result.Code != RequestSuccessCode { - return nil, errors.New(result.SubMsg) + return nil, errors.New(result.LogId + ":" + result.SubMsg) } return result.Data, nil } @@ -389,7 +389,7 @@ func (a *API) BatchCreateWarehouse(param *warehouse_createBatch_request.Warehous return nil, err } if response.Code != RequestSuccessCode { - return nil, errors.New(response.SubMsg) + return nil, errors.New(response.LogId + ":" + response.SubMsg) } return response.Data, nil } @@ -403,7 +403,7 @@ func (a *API) CreateWarehouse(param *warehouse_create_request.WarehouseCreatePar return nil, err } if response.Code != RequestSuccessCode { - return nil, errors.New(response.Msg + "," + response.SubMsg) + return nil, errors.New(response.LogId + ":" + response.Msg + "," + response.SubMsg) } return response.Data, nil } @@ -417,7 +417,7 @@ func (a *API) StoreBindWarehouse(param *warehouse_bindStore_request.WarehouseBin return nil, err } if response.Code != RequestSuccessCode { - return nil, errors.New(response.SubMsg) + return nil, errors.New(response.LogId + ":" + response.SubMsg) } return response.Data, nil } @@ -431,7 +431,7 @@ func (a *API) GetWarehouseByStore(storeID int64) (*warehouse_getWarehouseByStore return nil, err } if response.Code != RequestSuccessCode { - return nil, errors.New(response.Msg + "," + response.SubMsg) + return nil, errors.New(response.LogId + response.Msg + "," + response.SubMsg) } if len(response.Data.WarehouseInfoMap) == 0 { return nil, errors.New(fmt.Sprintf("门店%d 暂时未绑定仓库,请进行绑定!", storeID)) @@ -448,7 +448,7 @@ func (a *API) CreateFence(param *warehouse_createFence_request.WarehouseCreateFe return nil, err } if response.Code != RequestSuccessCode { - return nil, errors.New(response.SubMsg) + return nil, errors.New(response.LogId + ":" + response.SubMsg) } return response.Data, nil } @@ -462,7 +462,7 @@ func (a *API) SetFence(param *warehouse_setFence_request.WarehouseSetFenceParam) return err } if response.Code != RequestSuccessCode { - return errors.New(response.SubMsg) + return errors.New(response.LogId + ":" + response.SubMsg) } return nil } @@ -476,7 +476,7 @@ func (a *API) BindFenceByStore(param *warehouse_bindFencesByStore_request.Wareho return nil, err } if response.Code != RequestSuccessCode { - return nil, errors.New(response.SubMsg) + return nil, errors.New(response.LogId + ":" + response.SubMsg) } return response.Data, nil } @@ -490,7 +490,7 @@ func (a *API) WarehouseBindFence(param *warehouse_bindFences_request.WarehouseBi return err } if response.Code != RequestSuccessCode { - return errors.New(response.SubMsg) + return errors.New(response.LogId + ":" + response.SubMsg) } return nil } @@ -504,7 +504,7 @@ func (a *API) GetFence(outFenceID []string) (*warehouse_getFences_response.Wareh return nil, err } if response.Code != RequestSuccessCode { - return nil, errors.New(response.SubMsg) + return nil, errors.New(response.LogId + ":" + response.SubMsg) } return response.Data, nil } @@ -519,7 +519,7 @@ func (a *API) AddressCreate(param *address_create_request.AddressCreateParam) (* return nil, err } if response.Code != RequestSuccessCode { - return nil, errors.New(response.SubMsg) + return nil, errors.New(response.LogId + ":" + response.SubMsg) } return response.Data, nil } @@ -533,7 +533,7 @@ func (a *API) GetAddressList(param *address_list_request.AddressListParam) (*add return nil, err } if response.Code != RequestSuccessCode { - return nil, errors.New(response.SubMsg) + return nil, errors.New(response.LogId + ":" + response.SubMsg) } return response.Data, nil } @@ -547,21 +547,21 @@ func (a *API) GetAreasByProvince(param *address_getAreasByProvince_request.Addre return nil, err } if response.Code != RequestSuccessCode { - return nil, errors.New(response.SubMsg) + return nil, errors.New(response.LogId + ":" + response.SubMsg) } return response.Data, nil } -//获取四级地址全量省份信息 -func (a *API) GetProvince(param *address_getProvince_request.AddressGetProvinceParam) (*address_getProvince_response.AddressGetProvinceData, error) { +// GetProvince 获取四级地址全量省份信息 +func (a *API) GetProvince() (*address_getProvince_response.AddressGetProvinceData, error) { request := address_getProvince_request.New() - request.Param = param + //request.Param = param response, err := request.Execute(a.accessTokenObj) if err != nil { return nil, err } if response.Code != RequestSuccessCode { - return nil, errors.New(response.SubMsg) + return nil, errors.New(response.LogId + ":" + response.SubMsg) } return response.Data, nil } @@ -575,7 +575,7 @@ func (a *API) QueryAllWarehouse(param *warehouse_list_request.WarehouseListParam return nil, err } if result.Code != RequestSuccessCode { - return nil, errors.New(result.SubMsg) + return nil, errors.New(result.LogId + ":" + result.SubMsg) } if result.Data.Total == 0 { return nil, errors.New("没有区域仓库") @@ -594,7 +594,7 @@ func (a *API) WarehouseUnbindStore(storeId []int64, outWarehouseId string) error return err } if data.Code != RequestSuccessCode { - return errors.New(data.SubMsg) + return errors.New(data.LogId + ":" + data.SubMsg) } return nil @@ -625,7 +625,7 @@ func (a *API) GetStorePackageFee(storeID int64) (int64, error) { return 0, err } if result.Code != RequestSuccessCode { - return 0, errors.New(result.SubMsg) + return 0, errors.New(result.LogId + ":" + result.SubMsg) } if result.Data == nil { return 0, err diff --git a/platformapi/tiktok_shop/tiktok_api/store_test.go b/platformapi/tiktok_shop/tiktok_api/store_test.go index 18862add..e28a17d7 100644 --- a/platformapi/tiktok_shop/tiktok_api/store_test.go +++ b/platformapi/tiktok_shop/tiktok_api/store_test.go @@ -483,20 +483,20 @@ func TestCreateWarehouse(t *testing.T) { // 批量创建区域仓 func TestBatchCreateWarehouse(t *testing.T) { - token := `{"access_token":"a1746210-a8a3-4497-a87b-09d1f10dbb95","expires_in":1665652230,"scope":"SCOPE","shop_id":"","shop_name":"小时达开放平台对接专用店","refresh_token":"c1cf8d88-0983-4f2a-b969-3746fae6b0cd","authority_id":""}` - a := New("7136048270014416392", "c397aa9f-3927-47c4-8cfe-4d84e02602e0", token) + token3 := `{"access_token":"719db06b-3fbf-461b-8cf2-e5ae70293cdc","expires_in":1695876413,"scope":"SCOPE","shop_id":57939570,"shop_name":"京西菜市速食","refresh_token":"8c478de3-8fbd-4535-a78c-06792b8a20a4","authority_id":""}` + a2 := New("7267745202649957900", "51998fcf-d521-4553-8c0c-fa662c8dbd6e", token3) - data, err := a.BatchCreateWarehouse(&warehouse_createBatch_request.WarehouseCreateBatchParam{ + data, err := a2.BatchCreateWarehouse(&warehouse_createBatch_request.WarehouseCreateBatchParam{ OutWarehouseList: []warehouse_createBatch_request.OutWarehouseListItem{ { - OutWarehouseId: "666668", - Name: "V派区域仓", - Intro: "VV派区域仓,仓库id为京西门店id", - AddressDetail: "四川省成都市金牛区万科加州湾V派", + OutWarehouseId: "668841", + Name: "籁哜生鲜超市区域仓", + Intro: "籁哜生鲜超市区域仓,仓库id为京西门店id", + AddressDetail: "黔东南苗族侗族自治州黎平县黔东南苗族侗族自治州黎平县县平街12号", WarehouseLocation: &warehouse_createBatch_request.WarehouseLocation{ - AddressId1: 51, - AddressId2: 510100, - AddressId3: 510106, + AddressId1: 52, + AddressId2: 522600, + AddressId3: 522631, AddressId4: 0, }, }, @@ -505,6 +505,15 @@ func TestBatchCreateWarehouse(t *testing.T) { fmt.Println(err) } +//查询四级地址全量省份信息 +func TestGetProvince(t *testing.T) { + token3 := `{"access_token":"719db06b-3fbf-461b-8cf2-e5ae70293cdc","expires_in":1695876413,"scope":"SCOPE","shop_id":57939570,"shop_name":"京西菜市速食","refresh_token":"8c478de3-8fbd-4535-a78c-06792b8a20a4","authority_id":""}` + a2 := New("7267745202649957900", "51998fcf-d521-4553-8c0c-fa662c8dbd6e", token3) + retVal, err := a2.GetProvince() + fmt.Println(utils.Format4Output(retVal, false)) + fmt.Println(err) +} + // 仓库绑定门店 func TestBindWarehouseToStore(t *testing.T) { token := `{"access_token":"a1746210-a8a3-4497-a87b-09d1f10dbb95","expires_in":1665652230,"scope":"SCOPE","shop_id":"","shop_name":"小时达开放平台对接专用店","refresh_token":"c1cf8d88-0983-4f2a-b969-3746fae6b0cd","authority_id":""}`