From 7cb514aa1ea3ee699b3952e3aa9fd146de287e06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 1 Apr 2022 15:43:07 +0800
Subject: [PATCH] 1

---
 platformapi/fnpsapi/callback.go | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/platformapi/fnpsapi/callback.go b/platformapi/fnpsapi/callback.go
index fe782d51..ad67f423 100644
--- a/platformapi/fnpsapi/callback.go
+++ b/platformapi/fnpsapi/callback.go
@@ -157,18 +157,28 @@ func (a *API) GetChainOrderStatusNotify(request *http.Request) (shopStatusMsg *O
 		return nil, callbackResponse
 	}
 
+	//if true { // 第二次平台分配骑手
 	fmt.Println("==============", string(data))
-	result := &OrderErr{}
+	result := &OrderStatusNottify{}
 	if err := json.Unmarshal(data, &result); err != nil {
 		callbackResponse = &CallbackResponse{Code: -1}
 		return nil, callbackResponse
 	}
+	fmt.Println("data=======", result.Param)
+	fmt.Println("data=======", result.Param.OrderId)
+	fmt.Println("data=======", result.Param.PartnerOrderCode)
+	//} else { // 第一次,平台确认收取订单
+	//	result := &OrderErr{}
+	//	if err := json.Unmarshal(data, &result); err != nil {
+	//		callbackResponse = &CallbackResponse{Code: -1}
+	//		return nil, callbackResponse
+	//	}
+	//	fmt.Println("data=======", result.Param)
+	//	fmt.Println("data=======", result.Param.Param.OrderId)
+	//	fmt.Println("data=======", result.Param.Param.PartnerOrderCode)
+	//}
 
-	fmt.Println("data=======", result.Param.Param)
-	fmt.Println("data=======", result.Param.Param.OrderId)
-	fmt.Println("data=======", result.Param.Param.PartnerOrderCode)
-
-	return result.Param, SuccessResponse
+	return result, SuccessResponse
 }
 
 // 异常配送