From c4e65aa027aebbef7d8f7bb55b7d89709ff346fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Thu, 3 Nov 2022 14:03:54 +0800
Subject: [PATCH] 1

---
 platformapi/tiktok_shop/tiktok_api/order.go | 45 ++++++---------------
 1 file changed, 12 insertions(+), 33 deletions(-)

diff --git a/platformapi/tiktok_shop/tiktok_api/order.go b/platformapi/tiktok_shop/tiktok_api/order.go
index da4581f6..b6097dd0 100644
--- a/platformapi/tiktok_shop/tiktok_api/order.go
+++ b/platformapi/tiktok_shop/tiktok_api/order.go
@@ -318,26 +318,25 @@ func (a *API) ConfirmReceivedReturnGoods(afsOrderId int64, agree bool) {
 // CancelSendGoodsSuccess 商家在未发货仅退款途中发送取消发货状态
 func (a *API) CancelSendGoodsSuccess() {}
 
-// LogisticsAdd 订单发货接口
+// OrderDelivering 订单发货
 // 暂时只支持整单出库，即接口调用时入参只能传父订单号。
 // Tips：部分发货状态下的父订单，调此接口发货，会报错：该订单当前为“部分发货”状态，无法调用此接口
 // orderId主订单id,companyCode 物流公司code,isRefundReject 是否拒绝退款申请（true表示拒绝退款，并继续发货),addressId发货地址id
-func (a *API) LogisticsAdd(orderId string, companyCode string, isRefundReject bool, addressId int64) error {
+func (a *API) OrderDelivering(param *order_logisticsAdd_request.OrderLogisticsAddParam) error {
 	request := order_logisticsAdd_request.New()
-	request.Param = &order_logisticsAdd_request.OrderLogisticsAddParam{
-		OrderId:        orderId,
-		CompanyCode:    companyCode,
-		IsRefundReject: isRefundReject,
-		AddressId:      addressId,
-	}
-	data, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("订单发货接口=========%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("订单发货接口:=%s", utils.Format4Output(data, false))
+	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
 	}
-	if data.Code != RequestSuccessCode {
-		return errors.New(data.SubMsg)
+	if result.Code == RequestSuccessRepeatedShipment {
+		return nil
+	}
+	if result.Code != RequestSuccessCode {
+		return errors.New(result.SubMsg)
 	}
 	return nil
 }
@@ -616,26 +615,6 @@ func (a *API) GetCallbackOrderId(msgId string, data interface{}) (string, *Callb
 	}
 }
 
-// OrderDelivering 订单发货
-func (a *API) OrderDelivering(param *order_logisticsAdd_request.OrderLogisticsAddParam) error {
-	request := order_logisticsAdd_request.New()
-	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
-	}
-	if result.Code == RequestSuccessRepeatedShipment {
-		return nil
-	}
-	if result.Code != RequestSuccessCode {
-		return errors.New(result.SubMsg)
-	}
-	return nil
-}
-
 // LogisticsAddSinglePack 支持多个订单发同一个物流包裹
 func (a *API) LogisticsAddSinglePack() {
 	request := order_logisticsAddSinglePack_request.New()