liulei/baseapi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/rosydev/baseapi

Browse Source
This commit is contained in:
richboo111
2022-11-14 09:39:04 +08:00
parent d99661fd18 76dcfaa33f
commit 2b1047a720
15 changed files with 7971 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platformapi/tiktok_shop/tiktok_api/logistics_express.go
View File

@@ -149,16 +149,12 @@ func (a *APIExpress) OrderStatusAndPsInfo(param map[string]interface{}) error {
psInfo.TraceMsgs = traceMsgs
request.Param = psInfo
globals.SugarLogger.Debugf("OrderStatusAndPsInfo=========:%s", request.GetUrlPath())
globals.SugarLogger.Debugf("OrderStatusAndPsInfo=========:%s", utils.Format4Output(request.Param, false))
if a.accessTokenObj == nil || a.accessTokenObj.CreateTokenData.AccessToken == "" {
a.CreateToken()
} else if a.expiresIn < time.Now().Unix() {
a.RefreshToken()
}
result, err := request.Execute(a.accessTokenObj)
globals.SugarLogger.Debugf("OrderStatusAndPsInfo result :%s", utils.Format4Output(result, false))
globals.SugarLogger.Debugf("OrderStatusAndPsInfo err :%s", err)
if err != nil {
return err
}

6
platformapi/tiktok_shop/tiktok_api/order.go
View File

@@ -73,8 +73,6 @@ func (a *API) ApplyMarketAfterSale(skuOrderId, count int64, afterSaleReason int3
param.ItemCount = count // 拒收是必填
result, err := request.Execute(a.accessTokenObj)
globals.SugarLogger.Debugf("====request.result ==========%s", request.GetUrlPath())
globals.SugarLogger.Debugf("====request.result = %s", utils.Format4Output(result, false))
if err != nil {
return "", err
}
@@ -158,8 +156,6 @@ func (a *API) AfterSaleOperate(refundType int32, refundId, remark string, storeI
param.Items = refundListParam
// 同意退货
result, err := request.Execute(a.accessTokenObj)
globals.SugarLogger.Debugf("AfterSaleOperate=========%s", request.GetUrlPath())
globals.SugarLogger.Debugf("====AfterSaleOperate:=%s", utils.Format4Output(result, false))
if err != nil {
return err
}
@@ -327,8 +323,6 @@ func (a *API) OrderDelivering(param *order_logisticsAdd_request.OrderLogisticsAd
request.Param = param
result, err := request.Execute(a.accessTokenObj)
globals.SugarLogger.Debugf("OrderDelivering=========%s", request.GetUrlPath())
globals.SugarLogger.Debugf("OrderDelivering=========%s", utils.Format4Output(result, false))
if err != nil {
return err
}

7750
platformapi/tiktok_shop/tiktok_api/sku.go
View File

File diff suppressed because it is too large Load Diff

34
platformapi/tiktok_shop/tiktok_api/sku_test.go
View File

@@ -38,7 +38,7 @@ func TestCategory(t *testing.T) {
}
func TestGetCatePropertyV2(t *testing.T) {
data, err := a.GetCatePropertyV2(29073)
data, err := a.GetCatePropertyV2(33622)
fmt.Println("err=====", err)
globals.SugarLogger.Debugf("data:=%s", utils.Format4Output(data, false))
fmt.Println("data====", data) // 202209281558450102081001701D7B32C5
@@ -346,3 +346,35 @@ func Test11111(t *testing.T) {
fmt.Println(randNumber)
}
}
func TestGetProductUpdateRule(t *testing.T) {
keys := make(map[int64]bool, 0)
data, _ := a.GetShopCategory(0)
for _, v1 := range data {
if len(v1.Children) > 0 {
for _, v2 := range v1.Children {
if len(v2.Children) > 0 {
for _, v3 := range v2.Children {
if len(v3.Children) > 0 {
for _, v4 := range v3.Children {
if v4.Enable {
keys[v4.Id] = a.GetProductUpdateRule(v4.Id)
}
}
}
keys[v3.Id] = a.GetProductUpdateRule(v3.Id)
}
}
keys[v2.Id] = a.GetProductUpdateRule(v2.Id)
}
}
keys[v1.Id] = a.GetProductUpdateRule(v1.Id)
}
globals.SugarLogger.Debugf("====%d", len(keys))
globals.SugarLogger.Debugf("====%s", utils.Format4Output(keys, false))
}
func TestNameeeee(t *testing.T) {
aa := `667278_/image/4229fbb12a40ddcc7a2d42728f`
fmt.Println(strings.Contains(aa, "detail_"))
}

15
platformapi/tiktok_shop/tiktok_api/sku_warehouse.go
View File

@@ -6,8 +6,6 @@ import (
material_batchUploadImageSync_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/material_batchUploadImageSync/response"
material_createFolder_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/material_createFolder/request"
material_createFolder_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/material_createFolder/response"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/globals"
)
// CreateFolder 创建商品库文件夹(存放商品图片素材)
@@ -26,8 +24,6 @@ func (a *API) CreateFolder(fileName string) (*material_createFolder_response.Mat
param.ParentFolderId = "0" // 根目录创建文件夹
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
}
@@ -41,7 +37,7 @@ func (a *API) CreateFolder(fileName string) (*material_createFolder_response.Mat
//1. 一次上传的数量限制50张图片；
//2. 图片大小限10M
//3. 素材中心会对素材进行异步审核，对于审核失败的素材，素材中心会在一定时间内将其删除。
func (a *API) BatchUploadImages(imgs []Imgs) (*material_batchUploadImageSync_response.MaterialBatchUploadImageSyncData, error) {
func (a *API) BatchUploadImages(imgs []Imgs) (map[string]material_batchUploadImageSync_response.SuccessMapItem, error) {
request := material_batchUploadImageSync_request.New()
var param = make([]material_batchUploadImageSync_request.MaterialsItem, 0, len(imgs))
@@ -61,13 +57,14 @@ func (a *API) BatchUploadImages(imgs []Imgs) (*material_batchUploadImageSync_res
imgParam.NeedDistinct = true
result, err := request.Execute(a.accessTokenObj)
globals.SugarLogger.Debugf("批量上传文件到目录=========:%s", request.GetUrlPath())
globals.SugarLogger.Debugf("批量上传文件到目录:=%s", utils.Format4Output(result, false))
if len(result.Data.SuccessMap) > 0 {
return result.Data.SuccessMap, nil
}
if err != nil {
return nil, err
}
if result.Code != RequestSuccessCode {
return nil, errors.New(result.SubMsg)
return nil, errors.New("==============logId" + result.LogId + ":" + result.SubMsg)
}
return result.Data, nil
return nil, err
}

8
platformapi/tiktok_shop/tiktok_api/sku_warehouse_test.go
View File

@@ -32,11 +32,11 @@ func TestCreateFolad(t *testing.T) {
}
func TestUploadImg(t *testing.T) {
accesstoken := `{"access_token":"60f530b2-9ab6-4723-b487-c094918f0d21","expires_in":1666257163,"scope":"SCOPE","shop_id":"","shop_name":"小时达开放平台对接专用店","refresh_token":"1220666a-5e88-458c-a8c0-06d949fbbd3f","authority_id":""}`
a := New("7136048270014416392", "c397aa9f-3927-47c4-8cfe-4d84e02602e0", accesstoken)
param := []Imgs{
{Name: "测试图片1", Url: "https://image.jxc4.com/image/3f8d9759eda4863e28a0fff523f9d477.jpg"},
{Name: "测试图片2", Url: "https://image.jxc4.com/image/06a488c740fe9f6e40a7fffe67a39570.jpg"},
{Name: "测试图片1", Url: "http://image.jxc4.com/efbfbde919e41435144485bb72bc8bd4.png"},
{Name: "测试图片2", Url: "https://image.jxc4.com/image/94859ee145dd3038f040800dd347e7b7.jpg"},
{Name: "测试图片3", Url: "https://image.jxc4.com/image/7a71696ddc7c030e31f9edc6cb211ab8.jpg"},
{Name: "测试图片detail", Url: "http://image.jxc4.com/image/f22e2e290087f6806ad48d279a7166d0.jpg"},
}
data, err := a.BatchUploadImages(param)
fmt.Println(err)

8
platformapi/tiktok_shop/tiktok_api/store.go
View File

@@ -62,8 +62,6 @@ func (a *API) GetStoreDetail(param *shop_getStoreDetail_request.ShopGetStoreDeta
request := shop_getStoreDetail_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
}
@@ -151,8 +149,6 @@ func (a *API) GetStoreList(param *shop_getStoreList_request.ShopGetStoreListPara
request := shop_getStoreList_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
}
@@ -174,8 +170,6 @@ func (a *API) CreateTradeLimitTemplate(param *trade_createTradeLimitTemplate_req
request := trade_createTradeLimitTemplate_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
}
@@ -386,7 +380,6 @@ func (a *API) StoreBindWarehouse(param *warehouse_bindStore_request.WarehouseBin
func (a *API) GetWarehouseByStore(storeID int64) (map[int64][]warehouse_getWarehouseByStore_response.WarehouseInfoMapItem, error) {
request := warehouse_getWarehouseByStore_request.New()
request.Param.StoreIds = append(request.Param.StoreIds, storeID)
globals.SugarLogger.Debugf("request.Param.StoreIds==========%d", request.Param.StoreIds)
response, err := request.Execute(a.accessTokenObj)
if err != nil {
return nil, err
@@ -394,7 +387,6 @@ func (a *API) GetWarehouseByStore(storeID int64) (map[int64][]warehouse_getWareh
if response.Code != RequestSuccessCode {
return nil, errors.New(response.Msg + "," + response.SubMsg)
}
globals.SugarLogger.Debugf("response.Data.WarehouseInfoMap==========%v", response.Data.WarehouseInfoMap)
if len(response.Data.WarehouseInfoMap) == 0 {
return nil, errors.New(fmt.Sprintf("门店%d 暂时未绑定仓库，请进行绑定!", storeID))
}

2
platformapi/tiktok_shop/tiktok_api/store_test.go
View File

@@ -19,7 +19,6 @@ import (
warehouse_createFence_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/warehouse_createFence/request"
warehouse_setFence_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/warehouse_setFence/request"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/globals"
"math/rand"
"strconv"
"strings"
@@ -118,7 +117,6 @@ func TestAPI_CreateTradeLimitTemplate(t *testing.T) {
tempDetail.Template.TemplateName += "固定运费模板"
}
globals.SugarLogger.Debugf("%s", utils.Format4Output(tempDetail, false))
a.FreightTemplateCreate(tempDetail)
}