From b6c64a493f9bf70a35094098634b9c9cea415a78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Wed, 31 Aug 2022 11:11:45 +0800
Subject: [PATCH] 1

---
 platformapi/tiktok_shop/tiktok_api/api.go | 13 ++++++++++++-
 platformapi/tiktok_shop/tiktok_api/sku.go | 16 +++++++++++++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/platformapi/tiktok_shop/tiktok_api/api.go b/platformapi/tiktok_shop/tiktok_api/api.go
index 0ad9f1d3..5721e168 100644
--- a/platformapi/tiktok_shop/tiktok_api/api.go
+++ b/platformapi/tiktok_shop/tiktok_api/api.go
@@ -1,6 +1,7 @@
 package tiktok_api
 
 import (
+	"encoding/json"
 	doudian_sdk "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/core"
 	"git.rosy.net.cn/jx-callback/globals"
 	"time"
@@ -16,7 +17,17 @@ type Api struct {
 	expiresIn    int64
 }
 
-func New(appKey, appSecret string) *Api {
+func New(appKey, appSecret, accessToken string) *Api {
+	var access *doudian_sdk.AccessToken
+	if accessToken != "" {
+		if err := json.Unmarshal([]byte(accessToken), &access); err != nil {
+			globals.SugarLogger.Debug("accessToken init err :", err)
+			return nil
+		} else {
+			AccessToken = access
+		}
+	}
+
 	return &Api{
 		appKey:    appKey,
 		appSecret: appSecret,
diff --git a/platformapi/tiktok_shop/tiktok_api/sku.go b/platformapi/tiktok_shop/tiktok_api/sku.go
index db5282d9..e4dda362 100644
--- a/platformapi/tiktok_shop/tiktok_api/sku.go
+++ b/platformapi/tiktok_shop/tiktok_api/sku.go
@@ -1,15 +1,25 @@
 package tiktok_api
 
 import (
+	"errors"
 	order_orderDetail_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/order_orderDetail/request"
+	order_orderDetail_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/order_orderDetail/response"
 )
 
 // GetTiktokOrderDetail 获取订单详情
-func (a *Api) GetTiktokOrderDetail(storeId string) {
+func (a *Api) GetTiktokOrderDetail(orderId string) (*order_orderDetail_response.ShopOrderDetail, error) {
 	reqParam := order_orderDetail_request.New()
 	reqParam.Param = &order_orderDetail_request.OrderOrderDetailParam{
-		ShopOrderId:  storeId,
+		ShopOrderId:  orderId,
 		IsSearchable: false,
 	}
-	reqParam.Execute(AccessToken)
+	orderDetail, err := reqParam.Execute(AccessToken)
+	if err != nil {
+		return nil, err
+	}
+	if orderDetail.Code != 1000 {
+		return nil, errors.New(orderDetail.Msg)
+	}
+
+	return orderDetail.Data.ShopOrderDetail, nil
 }