From 089d73664ad0a4cd22a64b467542ee5d3c7c881e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 12 Oct 2022 18:38:03 +0800 Subject: [PATCH] 1 --- platformapi/tiktok_shop/tiktok_api/order.go | 160 +++++++----------- .../tiktok_shop/tiktok_api/order_type.go | 8 +- 2 files changed, 64 insertions(+), 104 deletions(-) diff --git a/platformapi/tiktok_shop/tiktok_api/order.go b/platformapi/tiktok_shop/tiktok_api/order.go index a433529f..2f7e6097 100644 --- a/platformapi/tiktok_shop/tiktok_api/order.go +++ b/platformapi/tiktok_shop/tiktok_api/order.go @@ -335,167 +335,127 @@ func (a *API) CreateOrderCallback(orderStatus []byte) (map[string][]interface{}, for _, data := range resp { switch data.Tag { case CallbackCreatedOrderMsgTagId: // 创建订单 - create := []CreateOrderCallback{} - if err := json.Unmarshal(orderStatus, &create); err != nil { + create := CreateOrderData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { return nil, CallbackResponseErr(false) } - for _, v := range create { - callbackResult[CallbackCreatedOrderMsgTagId] = append(callbackResult[CallbackCreatedOrderMsgTagId], v.Data) - } + callbackResult[CallbackCreatedOrderMsgTagId] = append(callbackResult[CallbackCreatedOrderMsgTagId], create) case CallbackPayOrderMsgTagId: // 支付订单 - create := []PayOrderCallback{} - if err := json.Unmarshal(orderStatus, &create); err != nil { + create := PayOrderData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { return nil, CallbackResponseErr(false) } - for _, v := range create { - callbackResult[CallbackPayOrderMsgTagId] = append(callbackResult[CallbackPayOrderMsgTagId], v.Data) - } + callbackResult[CallbackPayOrderMsgTagId] = append(callbackResult[CallbackPayOrderMsgTagId], create) globals.SugarLogger.Debugf("CallbackPayOrderMsgTagId======%s", utils.Format4Output(callbackResult, false)) case CallbackWaitOrderMsgTagId: // 支付订单待处理(风控审核) - create := []WaitOrderCallback{} - if err := json.Unmarshal(orderStatus, &create); err != nil { + create := WaitOrderData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { return nil, CallbackResponseErr(false) } - for _, v := range create { - callbackResult[CallbackWaitOrderMsgTagId] = append(callbackResult[CallbackWaitOrderMsgTagId], v.Data) - } + callbackResult[CallbackWaitOrderMsgTagId] = append(callbackResult[CallbackWaitOrderMsgTagId], create) case CallbackPartGoodsMsgTagId: // 卖家部分发货 - create := []SomeSendOrderCallback{} - if err := json.Unmarshal(orderStatus, &create); err != nil { + create := SomeSendOrderData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { return nil, CallbackResponseErr(false) } - for _, v := range create { - callbackResult[CallbackPartGoodsMsgTagId] = append(callbackResult[CallbackPartGoodsMsgTagId], v.Data) - } + callbackResult[CallbackPartGoodsMsgTagId] = append(callbackResult[CallbackPartGoodsMsgTagId], create) case CallbackPartAllGoodsMsgTagId: // 卖家发货 - create := []BusinessDeliveryCallback{} - if err := json.Unmarshal(orderStatus, &create); err != nil { + create := BusinessDeliveryData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { return nil, CallbackResponseErr(false) } - for _, v := range create { - callbackResult[CallbackPartAllGoodsMsgTagId] = append(callbackResult[CallbackPartAllGoodsMsgTagId], v.data) - } + callbackResult[CallbackPartAllGoodsMsgTagId] = append(callbackResult[CallbackPartAllGoodsMsgTagId], create) case CallbackCancelOrderMsgTagId: // 取消订单 - create := []CancelOrderCallback{} - if err := json.Unmarshal(orderStatus, &create); err != nil { + create := CreateOrderData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { return nil, CallbackResponseErr(false) } - for _, v := range create { - callbackResult[CallbackCancelOrderMsgTagId] = append(callbackResult[CallbackCancelOrderMsgTagId], v.Data) - } + callbackResult[CallbackCancelOrderMsgTagId] = append(callbackResult[CallbackCancelOrderMsgTagId], create) case CallbackSuccessOrderMsgTagId: // 卖家确认收货时,会自动完成 - create := []SuccessOrderCallback{} - if err := json.Unmarshal(orderStatus, &create); err != nil { + create := SuccessOrderData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { return nil, CallbackResponseErr(false) } - for _, v := range create { - callbackResult[CallbackSuccessOrderMsgTagId] = append(callbackResult[CallbackSuccessOrderMsgTagId], v.Data) - } + callbackResult[CallbackSuccessOrderMsgTagId] = append(callbackResult[CallbackSuccessOrderMsgTagId], create) case CallbackWayBillChangeOrderMsgTagId: // 发货物流消息便跟 - create := []WayBillChangeCallback{} - if err := json.Unmarshal(orderStatus, &create); err != nil { + create := WayBillChangeData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { return nil, CallbackResponseErr(false) } - for _, v := range create { - callbackResult[CallbackWayBillChangeOrderMsgTagId] = append(callbackResult[CallbackWayBillChangeOrderMsgTagId], v.Data) - } + callbackResult[CallbackWayBillChangeOrderMsgTagId] = append(callbackResult[CallbackWayBillChangeOrderMsgTagId], create) case CallbackReceivingChangeOrderMsgTagId: // 收货地址消息变更(商家审核通过触发) - create := []ReceivingAddressChangeCallback{} - if err := json.Unmarshal(orderStatus, &create); err != nil { + create := ReceivingAddressChangeData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { return nil, CallbackResponseErr(false) } - for _, v := range create { - callbackResult[CallbackReceivingChangeOrderMsgTagId] = append(callbackResult[CallbackReceivingChangeOrderMsgTagId], v.Data) - } + callbackResult[CallbackReceivingChangeOrderMsgTagId] = append(callbackResult[CallbackReceivingChangeOrderMsgTagId], create) case CallbackChangeMoneyMsgTagId: // 卖家修改订单/运单金额回调 - create := []UpdateAmountChangeCallback{} - if err := json.Unmarshal([]byte(orderStatus), &create); err != nil { + create := UpdateAmountChangeData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { return nil, CallbackResponseErr(false) } - for _, v := range create { - callbackResult[CallbackChangeMoneyMsgTagId] = append(callbackResult[CallbackChangeMoneyMsgTagId], v.Data) - } + callbackResult[CallbackChangeMoneyMsgTagId] = append(callbackResult[CallbackChangeMoneyMsgTagId], create) case CallbackBusinessRemarkMsgTagId: // 买家收货消息变更(手机,地址,姓名),用户C端修改触发(需要上面审核接口) - create := []BuyerUpdateWayBillCallback{} - if err := json.Unmarshal(orderStatus, create); err != nil { + create := BuyerUpdateWayBillData{} + if err := json.Unmarshal([]byte(data.Data), create); err != nil { return nil, CallbackResponseErr(false) } - for _, v := range create { - callbackResult[CallbackBusinessRemarkMsgTagId] = append(callbackResult[CallbackBusinessRemarkMsgTagId], v.Data) - } + callbackResult[CallbackBusinessRemarkMsgTagId] = append(callbackResult[CallbackBusinessRemarkMsgTagId], create) case CallbackApplyUpdateAddressMsgTagId: // 商家修改交易备注回调 - create := []BusinessUpdateRemakeCallback{} - if err := json.Unmarshal(orderStatus, &create); err != nil { + create := BusinessUpdateRemakeData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { return nil, CallbackResponseErr(false) } - for _, v := range create { - callbackResult[CallbackApplyUpdateAddressMsgTagId] = append(callbackResult[CallbackApplyUpdateAddressMsgTagId], v.Data) - } + callbackResult[CallbackApplyUpdateAddressMsgTagId] = append(callbackResult[CallbackApplyUpdateAddressMsgTagId], create) case CallbackSendOrderTimeChangeMsgTagId: // 订单发货时消息变更回调 - create := []AppointmentChangeCallback{} - if err := json.Unmarshal(orderStatus, &create); err != nil { + create := AppointmentChangeData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { return nil, CallbackResponseErr(false) } - for _, v := range create { - callbackResult[CallbackSendOrderTimeChangeMsgTagId] = append(callbackResult[CallbackSendOrderTimeChangeMsgTagId], v.Data) - } + callbackResult[CallbackSendOrderTimeChangeMsgTagId] = append(callbackResult[CallbackSendOrderTimeChangeMsgTagId], create) /*********下面属于订单退货消息************/ case CallbackRefundOrderMsgTagId: // 买家发起售后申请消息 - create := []BuyerRefundCreatedCallback{} - if err := json.Unmarshal(orderStatus, &create); err != nil { + create := BuyerRefundCreatedData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { return nil, CallbackResponseErr(false) } - for _, v := range create { - callbackResult[CallbackRefundOrderMsgTagId] = append(callbackResult[CallbackRefundOrderMsgTagId], v.Data) - } + callbackResult[CallbackRefundOrderMsgTagId] = append(callbackResult[CallbackRefundOrderMsgTagId], create) case CallbackUpdateRefundOrderMsgTagId: // 买家修改售后申请消息 - create := []BuyerRefundModifiedCallBack{} - if err := json.Unmarshal(orderStatus, &create); err != nil { + create := BuyerRefundModifiedData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { return nil, CallbackResponseErr(false) } - for _, v := range create { - callbackResult[CallbackUpdateRefundOrderMsgTagId] = append(callbackResult[CallbackUpdateRefundOrderMsgTagId], v.Data) - } + callbackResult[CallbackUpdateRefundOrderMsgTagId] = append(callbackResult[CallbackUpdateRefundOrderMsgTagId], create) case CallbackRefundOrderSuccessMsgTagId: // 退款成功消息 - create := []BusinessRefundSuccessCallback{} - if err := json.Unmarshal(orderStatus, &create); err != nil { + create := BusinessRefundSuccessData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { return nil, CallbackResponseErr(false) } - for _, v := range create { - callbackResult[CallbackRefundOrderSuccessMsgTagId] = append(callbackResult[CallbackRefundOrderSuccessMsgTagId], v.Data) - } + callbackResult[CallbackRefundOrderSuccessMsgTagId] = append(callbackResult[CallbackRefundOrderSuccessMsgTagId], create) case CallbackRefundOrderRefuseMsgTagId: // 拒绝退款消息 - create := []BusinessNotRefundRefusedCallBack{} - if err := json.Unmarshal(orderStatus, &create); err != nil { + create := BusinessNotRefundRefusedData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { return nil, CallbackResponseErr(false) } - for _, v := range create { - callbackResult[CallbackRefundOrderRefuseMsgTagId] = append(callbackResult[CallbackRefundOrderRefuseMsgTagId], v.Data) - } + callbackResult[CallbackRefundOrderRefuseMsgTagId] = append(callbackResult[CallbackRefundOrderRefuseMsgTagId], create) case CallbackRefundShopMsgTagId: // 拒绝退货申请消息 - create := []BusinessNotReturnApplyRefusedCallBack{} - if err := json.Unmarshal(orderStatus, &create); err != nil { + create := BusinessNotReturnApplyRefusedData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { return nil, CallbackResponseErr(false) } - for _, v := range create { - callbackResult[CallbackRefundShopMsgTagId] = append(callbackResult[CallbackRefundShopMsgTagId], v.Data) - } + callbackResult[CallbackRefundShopMsgTagId] = append(callbackResult[CallbackRefundShopMsgTagId], create) case CallbackReturnApplyAgreedMsgTagId: // 卖家同意时，推送此消息 - create := []BusinessReturnApplyAgreedCallback{} - if err := json.Unmarshal(orderStatus, &create); err != nil { + create := BusinessReturnApplyAgreedData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { return nil, CallbackResponseErr(false) } - for _, v := range create { - callbackResult[CallbackReturnApplyAgreedMsgTagId] = append(callbackResult[CallbackReturnApplyAgreedMsgTagId], v.Data) - } + callbackResult[CallbackReturnApplyAgreedMsgTagId] = append(callbackResult[CallbackReturnApplyAgreedMsgTagId], create) case CallbackReturnRefundAgreedMsgTagId: // 同意退款消息 - create := []BusinessRefundAgreedCallback{} - if err := json.Unmarshal(orderStatus, &create); err != nil { + create := BusinessRefundAgreedData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { return nil, CallbackResponseErr(false) } - for _, v := range create { - callbackResult[CallbackReturnRefundAgreedMsgTagId] = append(callbackResult[CallbackReturnRefundAgreedMsgTagId], v.Data) - } + callbackResult[CallbackReturnRefundAgreedMsgTagId] = append(callbackResult[CallbackReturnRefundAgreedMsgTagId], create) default: return nil, CallbackResponseErr(false) } diff --git a/platformapi/tiktok_shop/tiktok_api/order_type.go b/platformapi/tiktok_shop/tiktok_api/order_type.go index c03b9b20..7442415e 100644 --- a/platformapi/tiktok_shop/tiktok_api/order_type.go +++ b/platformapi/tiktok_shop/tiktok_api/order_type.go @@ -17,9 +17,9 @@ type PublicOrderCallback struct { } type OrderCallback struct { - Tag string `json:"tag"` // 消息种类，订单创建消息的tag值为"100" - MsgId string `json:"msg_id"` //消息记录id - Data interface{} `json:"data"` // 消息正文 + Tag string `json:"tag"` // 消息种类，订单创建消息的tag值为"100" + MsgId string `json:"msg_id"` //消息记录id + Data string `json:"data"` // 消息正文 FormData url.Values } @@ -68,7 +68,7 @@ type PayOrderData struct { type WaitOrderCallback struct { PublicOrderCallback - Data *PayOrderData `json:"data"` + Data *WaitOrderData `json:"data"` } type WaitOrderData struct {