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-09 10:12:50 +08:00
parent 708ba8157d cd045190ea
commit 99dfc3f61b
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platformapi/jdapi/jdapi.go
View File

@@ -7,7 +7,6 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"git.rosy.net.cn/jx-callback/globals"
"net/http" "net/http"
"reflect" "reflect"
"sort" "sort"
@@ -399,8 +398,6 @@ func (a *API) AccessAPIHavePage(apiStr string, jdParams map[string]interface{},
encryptData, err := JDDecodeToData(a.appSecret, jsonResult["encryptData"].(string)) encryptData, err := JDDecodeToData(a.appSecret, jsonResult["encryptData"].(string))
if err := utils.UnmarshalUseNumber(encryptData, &data); err != nil { if err := utils.UnmarshalUseNumber(encryptData, &data); err != nil {
globals.SugarLogger.Errorf("err 1 := %s", err.Error())
globals.SugarLogger.Errorf("jsonResult=========:= %s", utils.Format4Output(jsonResult, false))
return nil, totalCount, platformapi.ErrResponseDataFormatWrong return nil, totalCount, platformapi.ErrResponseDataFormatWrong
} }
innerCode := forceInnerCode2Str(data["code"]) innerCode := forceInnerCode2Str(data["code"])

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

@@ -472,6 +472,12 @@ func (a *API) CreateOrderCallback(orderStatus []byte) (map[string][]interface{},
return nil, CallbackResponseErr(false) return nil, CallbackResponseErr(false)
} }
callbackResult[CallbackReturnRefundAgreedMsgTagId] = append(callbackResult[CallbackReturnRefundAgreedMsgTagId], create) callbackResult[CallbackReturnRefundAgreedMsgTagId] = append(callbackResult[CallbackReturnRefundAgreedMsgTagId], create)
case CallbackRefundClosedMsgTagId:
create := UserCancelRefundOrderData{}
if err := json.Unmarshal([]byte(data.Data), &create); err != nil {
return nil, CallbackResponseErr(false)
}
callbackResult[CallbackRefundClosedMsgTagId] = append(callbackResult[CallbackRefundClosedMsgTagId], create)
default: default:
return nil, CallbackResponseErr(false) return nil, CallbackResponseErr(false)
} }

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

@@ -104,6 +104,7 @@ const (
CallbackRefundShopMsgTagId = "205" // 拒绝退货申请消息 CallbackRefundShopMsgTagId = "205" // 拒绝退货申请消息
CallbackReturnApplyAgreedMsgTagId = "202" // 同意退货申请消息 CallbackReturnApplyAgreedMsgTagId = "202" // 同意退货申请消息
CallbackReturnRefundAgreedMsgTagId = "201" // 同意退款消息 CallbackReturnRefundAgreedMsgTagId = "201" // 同意退款消息
CallbackRefundClosedMsgTagId = "207" // 售后关闭消息,当买家取消申请或系统超时机制导致退款取消时，会推送此消息
// 不需要处理的退单消息 // 不需要处理的退单消息
CallbackExchangeComfirmedMsgTagId = "211" // 卖家收到买家换货包裹，确认换货并二次发货消息 CallbackExchangeComfirmedMsgTagId = "211" // 卖家收到买家换货包裹，确认换货并二次发货消息
@@ -115,7 +116,6 @@ const (
CallbackArbitrateSubmitingMsgTagId = "213" // 客服要求商家上传凭证消息 CallbackArbitrateSubmitingMsgTagId = "213" // 客服要求商家上传凭证消息
CallbackArbitrateAppliedMsgTagId = "212" // 买家发起客服仲裁消息 CallbackArbitrateAppliedMsgTagId = "212" // 买家发起客服仲裁消息
CallbackExpirationChangeMsgTagId = "209" // 售后超时时长变更消息 CallbackExpirationChangeMsgTagId = "209" // 售后超时时长变更消息
CallbackRefundClosedMsgTagId = "207" // 售后关闭消息,当买家取消申请或系统超时机制导致退款取消时，会推送此消息
CallbackBuyerReturnGoodsMsgTagId = "203" // 买家退货给卖家消息 CallbackBuyerReturnGoodsMsgTagId = "203" // 买家退货给卖家消息
CallbackSpecialRefundMsgTagId = "224" // 特殊权益售后消息 CallbackSpecialRefundMsgTagId = "224" // 特殊权益售后消息
CallbackSpecialRefundSuccessMsgTagId = "225" // 特殊权益售后退款成功消息 CallbackSpecialRefundSuccessMsgTagId = "225" // 特殊权益售后退款成功消息

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

@@ -102,6 +102,7 @@ func (a *API) GetCatePropertyV2(categoryLeftId int64) (*product_getCatePropertyV
result, err := request.Execute(a.accessTokenObj) result, err := request.Execute(a.accessTokenObj)
globals.SugarLogger.Debugf("根据类目id获取子节点属性=========:%s", request.GetUrlPath()) globals.SugarLogger.Debugf("根据类目id获取子节点属性=========:%s", request.GetUrlPath())
globals.SugarLogger.Debugf("根据类目id获取子节点属性:=%s", utils.Format4Output(result, false)) globals.SugarLogger.Debugf("根据类目id获取子节点属性:=%s", utils.Format4Output(result, false))
globals.SugarLogger.Debugf("根据类目id获取参数:=%d", categoryLeftId)
if err != nil { if err != nil {
return nil, err return nil, err
} }

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

@@ -38,7 +38,7 @@ func TestCategory(t *testing.T) {
} }
func TestGetCatePropertyV2(t *testing.T) { func TestGetCatePropertyV2(t *testing.T) {
data, err := a.GetCatePropertyV2(35237) data, err := a.GetCatePropertyV2(29073)
fmt.Println("err=====", err) fmt.Println("err=====", err)
globals.SugarLogger.Debugf("data:=%s", utils.Format4Output(data, false)) globals.SugarLogger.Debugf("data:=%s", utils.Format4Output(data, false))
fmt.Println("data====", data) // 202209281558450102081001701D7B32C5 fmt.Println("data====", data) // 202209281558450102081001701D7B32C5
@@ -333,7 +333,7 @@ func TestGetSkuList(t *testing.T) {
} }
func TestGetBrandId(t *testing.T) { func TestGetBrandId(t *testing.T) {
a.GetSkuBrand(29146) a.GetSkuBrand(29073)
} }
func Test11111(t *testing.T) { func Test11111(t *testing.T) {