From 440d121a40f35373c2869d8063219d6b058433cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Tue, 27 Dec 2022 21:08:59 +0800
Subject: [PATCH 1/2] 1

---
 controllers/tiktok_delivery.go | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/controllers/tiktok_delivery.go b/controllers/tiktok_delivery.go
index 8397fc9df..e99b92942 100644
--- a/controllers/tiktok_delivery.go
+++ b/controllers/tiktok_delivery.go
@@ -2,8 +2,10 @@ package controllers
 
 import (
 	"encoding/json"
+	"fmt"
 	"git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api"
 	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/globals"
 	"github.com/astaxie/beego/server/web"
@@ -174,7 +176,7 @@ func (c *LogisticsController) LogisticsQuery() {
 			TrackNo:   param.TrackNo,
 			Traces: []TracesList{{
 				Timestamp:         utils.Time2Str(time.Now()),
-				Content:           "抖音定时保底更新",
+				Content:           "",
 				ThirdPartyCompany: tiktok_api.TiktokExpressCode,
 				ExceptionCode:     "",
 				ExceptionDesc:     "",
@@ -188,23 +190,41 @@ func (c *LogisticsController) LogisticsQuery() {
 	switch data[0].Status {
 	case 5: // 呼叫骑手
 		returnParam.Data.Traces[0].Opcode = tiktok_api.TiktokLogisticsStatusCALLRIDER
+		returnParam.Data.Traces[0].Content = "呼叫骑手,新建运单"
 	case 10, 12: // 骑手接单
 		returnParam.Data.Traces[0].Opcode = tiktok_api.TiktokLogisticsORDERRECEIVED
+		returnParam.Data.Traces[0].Content = model.RiderWaitGetGoods
 	case 15: // 到店
 		returnParam.Data.Traces[0].Opcode = tiktok_api.TiktokLogisticsRIDERARRIVED
+		returnParam.Data.Traces[0].Content = model.RiderToStore
 	case 20: //配送中
 		returnParam.Data.Traces[0].Opcode = tiktok_api.TiktokLogisticsRIDERPICKUP
+		returnParam.Data.Traces[0].Content = model.RiderGetOrderDelivering
 	case 105, 120: // 完成
 		returnParam.Data.Traces[0].Opcode = tiktok_api.TiktokLogisticsDELIVERED
+		returnParam.Data.Traces[0].Content = model.RiderGetOrderDelivered
 	case 8, 115: // 取消
 		returnParam.Data.Traces[0].Opcode = tiktok_api.TiktokLogisticsCANCELDELIVERY
 		returnParam.Data.Traces[0].CancelCode = "3000" // 骑手原因取消
 		returnParam.Data.Traces[0].CancelDesc = "繁忙"   // 骑手原因取消
+		returnParam.Data.Traces[0].Content = "取消"
 	case 22: //配送异常
 		returnParam.Data.Traces[0].Opcode = tiktok_api.TiktokLogisticsINDDELIVERYEXCEPTION
 		returnParam.Data.Traces[0].ExceptionCode = "5001"    // 服务商系统异常
 		returnParam.Data.Traces[0].ExceptionDesc = "服务商系统异常" // 服务商系统异常
+		returnParam.Data.Traces[0].Content = "异常订单/配送"
+	}
 
+	if returnParam.Data.Traces[0].Rider.Name == "" {
+		returnParam.Data.Traces[0].Rider.Name = " 暂无骑手 "
+	}
+	if returnParam.Data.Traces[0].Rider.Mobile == "" {
+		returnParam.Data.Traces[0].Rider.Mobile = " 暂无电话 "
+	}
+
+	switch data[0].Status {
+	case 5, 10, 12, 15, 20, 105, 120:
+		returnParam.Data.Traces[0].Content = fmt.Sprintf(returnParam.Data.Traces[0].Content, returnParam.Data.Traces[0].Rider.Name, returnParam.Data.Traces[0].Rider.Mobile)
 	}
 
 	c.Data["json"] = returnParam

From 9fba3d1879666255e57fd7cc66f8a9c9e06d199f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Tue, 27 Dec 2022 21:19:53 +0800
Subject: [PATCH 2/2] 1

---
 controllers/tiktok_delivery.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/controllers/tiktok_delivery.go b/controllers/tiktok_delivery.go
index e99b92942..fcae5e8ed 100644
--- a/controllers/tiktok_delivery.go
+++ b/controllers/tiktok_delivery.go
@@ -101,7 +101,7 @@ type LogisticsQueryRest struct {
 }
 
 type LogisticsQueryData struct {
-	Timestamp string       `json:"timestamp"` // 当前系统时间
+	Timestamp string       `json:"timestamp"` // 运单状态时间
 	TrackNo   string       `json:"track_no"`  // 运单号
 	Traces    []TracesList `json:"traces"`    // 轨迹列表
 }
@@ -172,7 +172,7 @@ func (c *LogisticsController) LogisticsQuery() {
 		ReturnCode: "200",
 		Message:    "正常",
 		Data: LogisticsQueryData{
-			Timestamp: utils.Time2Str(time.Now()),
+			Timestamp: utils.Time2Str(data[0].StatusTime),
 			TrackNo:   param.TrackNo,
 			Traces: []TracesList{{
 				Timestamp:         utils.Time2Str(time.Now()),