From 490b256d91abc88166f77a3f42fe0818ac8d2d09 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, 11 Jul 2023 15:03:05 +0800
Subject: [PATCH] 1

---
 platformapi/mtpsapi/riderInfo.go        |  6 ++--
 platformapi/tao_vegetable/order_test.go | 37 ++++++++++++++++++++++---
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/platformapi/mtpsapi/riderInfo.go b/platformapi/mtpsapi/riderInfo.go
index af8b2e0b..d9ed7be2 100644
--- a/platformapi/mtpsapi/riderInfo.go
+++ b/platformapi/mtpsapi/riderInfo.go
@@ -4,9 +4,9 @@ const (
 	DaDaCode     = "10002" // 达达配送
 	FnPsCode     = "10004" // 蜂鸟配送
 	MTPsCode     = "10032" // 美团配送
-	UUPTCode     = "10006" //uu跑腿
-	SFPSCode     = "10007" //顺丰配送
-	DYPsCode     = "10018" //抖音配送(小时达)
+	UUPTCode     = "10006" // uu跑腿
+	SFPSCode     = "10007" // 顺丰配送
+	DYPsCode     = "10018" // 抖音配送(小时达)
 	MyselfPsCode = "10015" // 自送
 )
 
diff --git a/platformapi/tao_vegetable/order_test.go b/platformapi/tao_vegetable/order_test.go
index c4169d24..dd392fa2 100644
--- a/platformapi/tao_vegetable/order_test.go
+++ b/platformapi/tao_vegetable/order_test.go
@@ -57,11 +57,11 @@ func TestDeliveryFinishACCEPTED(t *testing.T) {
 	param := &request591.AlibabaAelophyOrderWorkCallbackRequest{}
 	param.WorkCallbackRequest = &domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackRequest{
 		StoreId:                      utils.String2Pointer("JX668594"),
-		BizOrderId:                   utils.Int64ToPointer(5000894158854290922),
-		Status:                       utils.String2Pointer("ACCEPTED"),
+		BizOrderId:                   utils.Int64ToPointer(5000900574962430922),
+		Status:                       utils.String2Pointer("SIGN"),
 		StatusRemark:                 nil,
-		DelivererName:                nil,
-		DelivererPhone:               nil,
+		DelivererName:                utils.String2Pointer("张廷"),
+		DelivererPhone:               utils.String2Pointer("SIGN"),
 		WorkCallbackSubOrderInfoList: nil,
 		DelivererCompany:             nil,
 		LogisticsNo:                  nil,
@@ -166,3 +166,32 @@ func TestString(t *testing.T) {
 	//skuName := skuSt[a2+12 : a3-5]
 	//fmt.Println(skuName)
 }
+
+// 骑手变更
+func TestDelivererChange(t *testing.T) {
+	param := &request591.AlibabaAelophyOrderDelivererChangeRequest{
+		DelivererChangeRequest: &domain591.AlibabaAelophyOrderDelivererChangeDelivererChangeRequest{
+			StoreId:          utils.String2Pointer("JX668594"),
+			BizOrderId:       utils.Int64ToPointer(5000900574962430922),
+			DelivererName:    utils.String2Pointer("张廷"),
+			DelivererPhone:   utils.String2Pointer("13302290396"),
+			DelivererCompany: utils.String2Pointer(TaoDeliveryTypeDD),
+			LogisticsNo:      utils.String2Pointer("1504611792359260160"),
+		},
+	}
+	apiTao.DelivererChange(param)
+}
+
+// 骑手坐标
+func TestDeliveryTrajectory(t *testing.T) {
+	param := &request591.AlibabaAelophyOrderLogisticsTraceCallbackRequest{
+		LogisticsTraceCallbackRequest: &domain591.AlibabaAelophyOrderLogisticsTraceCallbackLogisticsTraceCallbackRequest{
+			StoreId:    utils.String2Pointer("JX668594"),
+			BizOrderId: utils.Int64ToPointer(5000900574962430922),
+			Longitude:  utils.String2Pointer("104045460"),
+			Latitude:   utils.String2Pointer("30693001"),
+			UpdateTime: (*util.LocalTime)(utils.Time2Pointer(time.Now())),
+		},
+	}
+	apiTao.DeliveryTrajectory(param)
+}