From 5159195497626f796ee8da21e60884c78f9d7004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 8 Nov 2022 15:53:14 +0800 Subject: [PATCH 1/5] 1 --- platformapi/tiktok_shop/tiktok_api/sku.go | 1 + platformapi/tiktok_shop/tiktok_api/sku_test.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/platformapi/tiktok_shop/tiktok_api/sku.go b/platformapi/tiktok_shop/tiktok_api/sku.go index d9b91e7e..0dce40a5 100644 --- a/platformapi/tiktok_shop/tiktok_api/sku.go +++ b/platformapi/tiktok_shop/tiktok_api/sku.go @@ -102,6 +102,7 @@ func (a *API) GetCatePropertyV2(categoryLeftId int64) (*product_getCatePropertyV result, err := request.Execute(a.accessTokenObj) globals.SugarLogger.Debugf("根据类目id获取子节点属性=========:%s", request.GetUrlPath()) globals.SugarLogger.Debugf("根据类目id获取子节点属性:=%s", utils.Format4Output(result, false)) + globals.SugarLogger.Debugf("根据类目id获取参数:=%d", categoryLeftId) if err != nil { return nil, err } diff --git a/platformapi/tiktok_shop/tiktok_api/sku_test.go b/platformapi/tiktok_shop/tiktok_api/sku_test.go index 1ec3d58f..77671b68 100644 --- a/platformapi/tiktok_shop/tiktok_api/sku_test.go +++ b/platformapi/tiktok_shop/tiktok_api/sku_test.go @@ -38,7 +38,7 @@ func TestCategory(t *testing.T) { } func TestGetCatePropertyV2(t *testing.T) { - data, err := a.GetCatePropertyV2(35237) + data, err := a.GetCatePropertyV2(29073) fmt.Println("err=====", err) globals.SugarLogger.Debugf("data:=%s", utils.Format4Output(data, false)) fmt.Println("data====", data) // 202209281558450102081001701D7B32C5 @@ -333,7 +333,7 @@ func TestGetSkuList(t *testing.T) { } func TestGetBrandId(t *testing.T) { - a.GetSkuBrand(29146) + a.GetSkuBrand(29073) } func Test11111(t *testing.T) { From 2e07eb612b7a1089315402990c37d57fc211f754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 8 Nov 2022 17:27:28 +0800 Subject: [PATCH 2/5] 1 --- platformapi/tiktok_shop/tiktok_api/order_type_const.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformapi/tiktok_shop/tiktok_api/order_type_const.go b/platformapi/tiktok_shop/tiktok_api/order_type_const.go index 6181a2d8..8c883540 100644 --- a/platformapi/tiktok_shop/tiktok_api/order_type_const.go +++ b/platformapi/tiktok_shop/tiktok_api/order_type_const.go @@ -104,6 +104,7 @@ const ( CallbackRefundShopMsgTagId = "205" // 拒绝退货申请消息 CallbackReturnApplyAgreedMsgTagId = "202" // 同意退货申请消息 CallbackReturnRefundAgreedMsgTagId = "201" // 同意退款消息 + CallbackRefundClosedMsgTagId = "207" // 售后关闭消息,当买家取消申请或系统超时机制导致退款取消时，会推送此消息 // 不需要处理的退单消息 CallbackExchangeComfirmedMsgTagId = "211" // 卖家收到买家换货包裹，确认换货并二次发货消息 @@ -115,7 +116,6 @@ const ( CallbackArbitrateSubmitingMsgTagId = "213" // 客服要求商家上传凭证消息 CallbackArbitrateAppliedMsgTagId = "212" // 买家发起客服仲裁消息 CallbackExpirationChangeMsgTagId = "209" // 售后超时时长变更消息 - CallbackRefundClosedMsgTagId = "207" // 售后关闭消息,当买家取消申请或系统超时机制导致退款取消时，会推送此消息 CallbackBuyerReturnGoodsMsgTagId = "203" // 买家退货给卖家消息 CallbackSpecialRefundMsgTagId = "224" // 特殊权益售后消息 CallbackSpecialRefundSuccessMsgTagId = "225" // 特殊权益售后退款成功消息 From e1b2a11e60b803c67816dbce3cbf1685df793f8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 8 Nov 2022 18:44:41 +0800 Subject: [PATCH 3/5] 1 --- platformapi/tiktok_shop/tiktok_api/order.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/platformapi/tiktok_shop/tiktok_api/order.go b/platformapi/tiktok_shop/tiktok_api/order.go index b6097dd0..78dc1d9a 100644 --- a/platformapi/tiktok_shop/tiktok_api/order.go +++ b/platformapi/tiktok_shop/tiktok_api/order.go @@ -344,9 +344,12 @@ func (a *API) OrderDelivering(param *order_logisticsAdd_request.OrderLogisticsAd // CreateOrderCallback 订单创建,抖店创建订单后,回调消息通知本服务器 func (a *API) CreateOrderCallback(orderStatus []byte) (map[string][]interface{}, *CallbackResponse) { var resp []*OrderCallback + globals.SugarLogger.Debugf("=========orderStatus==errr", string(orderStatus)) if err := json.Unmarshal(orderStatus, &resp); err != nil { + globals.SugarLogger.Debugf("===========errr", err.Error()) return nil, &CallbackResponse{Code: CallbackFailCode, Msg: CallbackFail} } + globals.SugarLogger.Debugf("=========resp==errr", utils.Format4Output(resp, false)) callbackResult := make(map[string][]interface{}, 0) for _, data := range resp { @@ -472,6 +475,15 @@ func (a *API) CreateOrderCallback(orderStatus []byte) (map[string][]interface{}, return nil, CallbackResponseErr(false) } callbackResult[CallbackReturnRefundAgreedMsgTagId] = append(callbackResult[CallbackReturnRefundAgreedMsgTagId], create) + case CallbackRefundClosedMsgTagId: + create := UserCancelRefundOrderData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { + globals.SugarLogger.Debugf("errr ===============%s", err.Error()) + return nil, CallbackResponseErr(false) + } + globals.SugarLogger.Debugf("create ===========%s", utils.Format4Output(create, false)) + callbackResult[CallbackRefundClosedMsgTagId] = append(callbackResult[CallbackRefundClosedMsgTagId], create) + globals.SugarLogger.Debugf("CallbackRefundClosedMsgTagId ===========%s", utils.Format4Output(callbackResult, false)) default: return nil, CallbackResponseErr(false) } From a7007cf2679e763171d98ced91058e81f8deb171 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 8 Nov 2022 19:05:36 +0800 Subject: [PATCH 4/5] 1 --- platformapi/tiktok_shop/tiktok_api/order.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/platformapi/tiktok_shop/tiktok_api/order.go b/platformapi/tiktok_shop/tiktok_api/order.go index 78dc1d9a..b8b9d5d7 100644 --- a/platformapi/tiktok_shop/tiktok_api/order.go +++ b/platformapi/tiktok_shop/tiktok_api/order.go @@ -344,12 +344,9 @@ func (a *API) OrderDelivering(param *order_logisticsAdd_request.OrderLogisticsAd // CreateOrderCallback 订单创建,抖店创建订单后,回调消息通知本服务器 func (a *API) CreateOrderCallback(orderStatus []byte) (map[string][]interface{}, *CallbackResponse) { var resp []*OrderCallback - globals.SugarLogger.Debugf("=========orderStatus==errr", string(orderStatus)) if err := json.Unmarshal(orderStatus, &resp); err != nil { - globals.SugarLogger.Debugf("===========errr", err.Error()) return nil, &CallbackResponse{Code: CallbackFailCode, Msg: CallbackFail} } - globals.SugarLogger.Debugf("=========resp==errr", utils.Format4Output(resp, false)) callbackResult := make(map[string][]interface{}, 0) for _, data := range resp { @@ -478,12 +475,9 @@ func (a *API) CreateOrderCallback(orderStatus []byte) (map[string][]interface{}, case CallbackRefundClosedMsgTagId: create := UserCancelRefundOrderData{} if err := json.Unmarshal([]byte(data.Data), &create); err != nil { - globals.SugarLogger.Debugf("errr ===============%s", err.Error()) return nil, CallbackResponseErr(false) } - globals.SugarLogger.Debugf("create ===========%s", utils.Format4Output(create, false)) callbackResult[CallbackRefundClosedMsgTagId] = append(callbackResult[CallbackRefundClosedMsgTagId], create) - globals.SugarLogger.Debugf("CallbackRefundClosedMsgTagId ===========%s", utils.Format4Output(callbackResult, false)) default: return nil, CallbackResponseErr(false) } From cd045190ea37e48d8b87c1b5bbccc96e72a40be1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 8 Nov 2022 20:15:12 +0800 Subject: [PATCH 5/5] 1 --- platformapi/jdapi/jdapi.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/platformapi/jdapi/jdapi.go b/platformapi/jdapi/jdapi.go index 62546ab4..d952b6d5 100644 --- a/platformapi/jdapi/jdapi.go +++ b/platformapi/jdapi/jdapi.go @@ -7,7 +7,6 @@ import ( "encoding/json" "errors" "fmt" - "git.rosy.net.cn/jx-callback/globals" "net/http" "reflect" "sort" @@ -399,8 +398,6 @@ func (a *API) AccessAPIHavePage(apiStr string, jdParams map[string]interface{}, encryptData, err := JDDecodeToData(a.appSecret, jsonResult["encryptData"].(string)) 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 } innerCode := forceInnerCode2Str(data["code"])