From 473c5cba35885d90b931251ec5b045140490885a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Mon, 31 Oct 2022 19:23:57 +0800
Subject: [PATCH] 1

---
 platformapi/mtpsapi/riderInfo.go               |  1 +
 .../tiktok_api/logistics_express.go            | 18 +++++++++++-------
 .../tiktok_shop/tiktok_api/order_type_const.go | 12 ++++++++++++
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/platformapi/mtpsapi/riderInfo.go b/platformapi/mtpsapi/riderInfo.go
index e17129cb..8b21ca16 100644
--- a/platformapi/mtpsapi/riderInfo.go
+++ b/platformapi/mtpsapi/riderInfo.go
@@ -17,4 +17,5 @@ type RiderInfo struct {
 	LogisticsContext      string `json:"logistics_context"`       // 配送状态描述
 	Latitude              string `json:"latitude"`                // 骑手当前的纬度，美团使用的是高德坐标系。
 	Longitude             string `json:"longitude"`               // 骑手当前的经度，美团使用的是高德坐标系。
+	OpCode                string `json:"opcode"`                  // 抖音状态(抖音才需要)
 }
diff --git a/platformapi/tiktok_shop/tiktok_api/logistics_express.go b/platformapi/tiktok_shop/tiktok_api/logistics_express.go
index 836744e3..d6a3208e 100644
--- a/platformapi/tiktok_shop/tiktok_api/logistics_express.go
+++ b/platformapi/tiktok_shop/tiktok_api/logistics_express.go
@@ -126,13 +126,9 @@ func (a *APIExpress) OrderStatusAndPsInfo(param map[string]interface{}) error {
 		TrackNo: param["third_carrier_order_id"].(string),
 		Traces: []logistics_indTrackPush_reqeust.TracesList{
 			{
-				Opcode:  "ORDER_RECEIVED",
-				OpTime:  utils.Time2Str(time.Now()),
-				Content: param["logistics_context"].(string),
-				Rider: logistics_indTrackPush_reqeust.ReiderInfo{
-					Name:   param["courier_name"].(string),
-					Mobile: param["courier_phone"].(string),
-				},
+				Opcode:            param["opcode"].(string),
+				OpTime:            utils.Time2Str(time.Now()),
+				Content:           param["logistics_context"].(string),
 				ThirdPartyCompany: TiktokExpressCode,
 				ExceptionCode:     "",
 				ExceptionDesc:     "",
@@ -141,6 +137,14 @@ func (a *APIExpress) OrderStatusAndPsInfo(param map[string]interface{}) error {
 			},
 		},
 	}
+	if param["courier_name"] != "" && param["courier_name"] != nil {
+		rider := logistics_indTrackPush_reqeust.ReiderInfo{
+			Name:   param["courier_name"].(string),
+			Mobile: param["courier_phone"].(string),
+		}
+		traceMsg.Traces[0].Rider = rider
+	}
+
 	traceMsgs = append(traceMsgs, traceMsg)
 	psInfo.TraceMsgs = traceMsgs
 	request.Param = psInfo
diff --git a/platformapi/tiktok_shop/tiktok_api/order_type_const.go b/platformapi/tiktok_shop/tiktok_api/order_type_const.go
index 47ae4965..f8bf1b04 100644
--- a/platformapi/tiktok_shop/tiktok_api/order_type_const.go
+++ b/platformapi/tiktok_shop/tiktok_api/order_type_const.go
@@ -184,3 +184,15 @@ const (
 	MaxRetailDiscountCreateBatchSize = 200
 	MaxRetailDiscountDeleteBatchSize = 100
 )
+
+const (
+	TiktokLogisticsStatusCALLRIDER      = "CALL_RIDER"             // 呼叫骑手
+	TiktokLogisticsORDERRECEIVED        = "ORDER_RECEIVED"         // 已接单
+	TiktokLogisticsRIDERARRIVED         = "RIDER_ARRIVED"          // 已到店
+	TiktokLogisticsRIDERPICKUP          = "RIDER_PICK_UP"          // 已取货
+	TiktokLogisticsDELIVERED            = "DELIVERED"              // 已送达
+	TiktokLogisticsDELIVERYOFFLINE      = "DELIVERY_OFFLINE"       // 此单由商家自行配送，具体配送进度请咨询商家
+	TiktokLogisticsCHANGERIDER          = "CHANGE_RIDER"           // 更换骑手,继续为您配送
+	TiktokLogisticsINDDELIVERYEXCEPTION = "IND_DELIVERY_EXCEPTION" // 订单配送异常，异常原因
+	TiktokLogisticsCANCELDELIVERY       = "CANCEL_DELIVERY"        // 订单配送取消
+)