From be2e7d24a7861f75e4113aaa44dc32e6b194291a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Wed, 24 May 2023 14:52:40 +0800
Subject: [PATCH] 1

---
 business/partner/delivery/rider.go    | 39 ++++++++++++++++++++++++++-
 controllers/jx_order.go               | 17 ++++++++++++
 routers/commentsRouter_controllers.go |  9 +++++++
 3 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go
index 390b407c9..222e64471 100644
--- a/business/partner/delivery/rider.go
+++ b/business/partner/delivery/rider.go
@@ -363,7 +363,6 @@ func UpdateFakeWayBillToTiktok() {
 	}
 
 	for i := 0; i < len(fakeWayBill); i++ {
-		globals.SugarLogger.Debugf("=======fakeWayBill orderID : %s", fakeWayBill[i].VendorOrderID)
 		// 判断当前订单是否可以推送,UpdatedAt > 当前时间 就跳过
 		if fakeWayBill[i].StatusTime.After(time.Now()) {
 			continue
@@ -509,3 +508,41 @@ func LoadingStoreOrderSettleAmount(startTime, endTime int64, jxStoreId []int) er
 	}
 	return nil
 }
+
+func GetVendorRiderInfo(wayBillVendorId, vendorId int, vendorOrderId, vendorWaybillId string) (riderInfo *mtpsapi.RiderInfo, err error) {
+	riderInfo = &mtpsapi.RiderInfo{}
+	if handlerInfo := partner.GetDeliveryPlatformFromVendorID(wayBillVendorId); handlerInfo != nil {
+		if wayBillVendorId == model.VendorIDDada || wayBillVendorId == model.VendorIDFengNiao || wayBillVendorId == model.VendorIDUUPT {
+			riderInfo, err = handlerInfo.Handler.GetRiderInfo(vendorOrderId, 0, vendorWaybillId)
+			if err != nil {
+				return nil, err
+			}
+		} else if wayBillVendorId == model.VendorIDMTPS {
+			riderInfo, err = handlerInfo.Handler.GetRiderInfo(vendorOrderId, time.Now().Unix()+1000000, vendorWaybillId)
+			if err != nil {
+				return nil, err
+			}
+		}
+	}
+
+	if riderInfo.Longitude == "" || riderInfo.Latitude == "" {
+		order, err := partner.CurOrderManager.LoadOrder(vendorOrderId, vendorId)
+		if err != nil {
+			return nil, err
+		}
+		if order.Status >= model.OrderStatusEndBegin {
+			riderInfo.Longitude = utils.Float64ToStr(utils.Int2Float64(order.ConsigneeLng) / 1000000)
+			riderInfo.Latitude = utils.Float64ToStr(utils.Int2Float64(order.ConsigneeLat) / 1000000)
+		} else {
+			store, err := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode)
+			if err != nil {
+				return nil, err
+			}
+			riderInfo.Longitude = utils.Float64ToStr(utils.Int2Float64(store.Lng) / 1000000)
+			riderInfo.Latitude = utils.Float64ToStr(utils.Int2Float64(store.Lat) / 1000000)
+		}
+
+	}
+
+	return
+}
diff --git a/controllers/jx_order.go b/controllers/jx_order.go
index c0239ce03..350f9dc36 100644
--- a/controllers/jx_order.go
+++ b/controllers/jx_order.go
@@ -1370,3 +1370,20 @@ func (c *OrderController) UpdateMTOrderSettle() {
 		return nil, "", err
 	})
 }
+
+// @Title 获取三方配送的骑手坐标
+// @Description 获取三方配送的骑手坐标
+// @Param	token			header		string	true	"认证token"
+// @Param	orderId			formData	string	true	"订单id"
+// @Param	deliveryId		formData	string	true	"运单id"
+// @Param	waybillVendorId	formData	int		true	"运单平台id"
+// @Param	orderVendorId	formData	int		true	"运单平台id"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetRiderLng [post]
+func (c *OrderController) GetRiderLng() {
+	c.callGetRiderLng(func(params *tOrderGetRiderLngParams) (interface{}, string, error) {
+		rider, err := delivery.GetVendorRiderInfo(params.WaybillVendorId, params.OrderVendorId, params.OrderId, params.DeliveryId)
+		return rider, "", err
+	})
+}
diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go
index 5063a37a1..6a13fdda2 100644
--- a/routers/commentsRouter_controllers.go
+++ b/routers/commentsRouter_controllers.go
@@ -1574,6 +1574,15 @@ func init() {
 			MethodParams:     param.Make(),
 			Filters:          nil,
 			Params:           nil})
+	// 获取三方运单骑手坐标
+	web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
+		web.ControllerComments{
+			Method:           "GetRiderLng",
+			Router:           `/GetRiderLng`,
+			AllowHTTPMethods: []string{"post"},
+			MethodParams:     param.Make(),
+			Filters:          nil,
+			Params:           nil})
 
 	web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
 		web.ControllerComments{