From b35d5029dc6b507619cafcc29d23665bbf0f86df Mon Sep 17 00:00:00 2001
From: richboo111 <yangsiqi1376@163.com>
Date: Wed, 10 Jan 2024 09:51:58 +0800
Subject: [PATCH] 1

---
 business/partner/delivery/sfps/waybill.go | 63 ++++++++++++++++++++++-
 1 file changed, 62 insertions(+), 1 deletion(-)

diff --git a/business/partner/delivery/sfps/waybill.go b/business/partner/delivery/sfps/waybill.go
index 7630ac557..5a3864483 100644
--- a/business/partner/delivery/sfps/waybill.go
+++ b/business/partner/delivery/sfps/waybill.go
@@ -470,7 +470,7 @@ func pushCallbackToGy(urlIndex string, msg interface{}) {
 		request *http.Request
 		param   = make(map[string]interface{})
 	)
-	param = msg.(map[string]interface{})
+	param = changeToRaw(urlIndex, msg)
 	globals.SugarLogger.Debugf("sfsfsf pushCallbackToGy param=%s", utils.Format4Output(param, false))
 	switch urlIndex {
 	case sfps2.UrlIndexRiderException:
@@ -633,6 +633,67 @@ func getWaybillByStatus(urlIndex string, msg interface{}) (waybill *model.Waybil
 	return waybill
 }
 
+//转换原始数据 转发果园
+func changeToRaw(urlIndex string, msg interface{}) (retVal map[string]interface{}) {
+	switch urlIndex {
+	case sfps2.UrlIndexRiderStatus:
+		temp := msg.(sfps2.RiderStatus)
+		retVal["shop_id"] = temp.ShopId
+		retVal["sf_order_id"] = temp.SFOrderID
+		retVal["shop_order_id"] = temp.ShopOrderID
+		retVal["url_index"] = temp.UrlIndex
+		retVal["operator_name"] = temp.OperatorName
+		retVal["operator_phone"] = temp.OperatorPhone
+		retVal["rider_lng"] = temp.RiderLng
+		retVal["rider_lat"] = temp.RiderLat
+		retVal["order_status"] = temp.OrderStatus
+		retVal["status_desc"] = temp.StatusDesc
+		retVal["sf_ucode"] = temp.SFUCode
+		retVal["push_time"] = temp.PushTime
+	case sfps2.UrlIndexRiderRecall:
+		temp := msg.(sfps2.RiderRecall)
+		retVal["order_status"] = temp.OrderStatus
+		retVal["push_time"] = temp.PushTime
+		retVal["sf_order_id"] = temp.SFOrderID
+		retVal["shop_id"] = temp.ShopId
+		retVal["shop_order_id"] = temp.ShopOrderID
+		retVal["url_index"] = temp.UrlIndex
+		retVal["status_desc"] = temp.StatusDesc
+	case sfps2.UrlIndexOrderComplete:
+		temp := msg.(sfps2.OrderComplete)
+		retVal["operator_name"] = temp.OperatorName
+		retVal["operator_phone"] = temp.OperatorPhone
+		retVal["order_status"] = temp.OrderStatus
+		retVal["push_time"] = temp.PushTime
+		retVal["receiRpt_type"] = temp.ReceiRptType
+		retVal["rider_lat"] = temp.RiderLat
+		retVal["rider_lng"] = temp.RiderLng
+		retVal["sf_order_id"] = temp.SfOrderID
+		retVal["sf_ucode"] = temp.SfUcode
+		retVal["shop_id"] = temp.ShopId
+		retVal["shop_order_id"] = temp.ShopOrderID
+		retVal["status_desc"] = temp.StatusDesc
+		retVal["url_index"] = temp.UrlIndex
+	case sfps2.UrlIndexSFCancel:
+		temp := msg.(sfps2.SFCancel)
+		retVal["cancel_reason"] = temp.CancelReason
+		retVal["cancel_code"] = temp.CancelCode
+		retVal["operator_name"] = temp.OperatorName
+		retVal["operator_phone"] = temp.OperatorPhone
+		retVal["order_status"] = temp.OrderStatus
+		retVal["push_time"] = temp.PushTime
+		retVal["rider_lat"] = temp.RiderLat
+		retVal["rider_lng"] = temp.RiderLng
+		retVal["sf_order_id"] = temp.SFOrderID
+		retVal["sf_ucode"] = temp.SFUCode
+		retVal["shop_id"] = temp.ShopId
+		retVal["shop_order_id"] = temp.ShopOrderID
+		retVal["url_index"] = temp.UrlIndex
+		retVal["status_desc"] = temp.StatusDesc
+	}
+	return retVal
+}
+
 // GetVendorSource 辅助函数
 //获取订单来源标识符
 func GetVendorSource(vendorID int) (source string) {