From 513a3db786e6cbac81c2f2ac5a2b780c9fbf3f6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 19 May 2022 11:02:24 +0800 Subject: [PATCH] 1 --- business/partner/delivery/mtps/waybill.go | 10 ++++++++-- business/partner/delivery/rider.go | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index 6c75efdaf..c65c44d69 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -391,6 +391,12 @@ func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeiso return nil, err } + // 获取骑手位置 + lng, lat, err := api.MtpsAPI.RiderLocation(deliveryId, utils.Interface2String(order["mt_peisong_id"])) + if err != nil { + return nil, err + } + return &mtpsapi.RiderInfo{ OrderId: utils.Interface2String(order["mt_peisong_id"]), ThirdCarrierOrderId: utils.Interface2String(order["order_id"]), @@ -398,7 +404,7 @@ func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeiso CourierPhone: utils.Interface2String(order["courier_phone"]), LogisticsProviderCode: string(mtpsapi.MTPsCode), LogisticsStatus: int(utils.MustInterface2Int64(order["status"])), // 默认正在配送中 - Latitude: utils.Interface2String(order["order_id"]), - Longitude: utils.Interface2String(order["order_id"]), + Latitude: utils.Float64ToStr(jxutils.IntCoordinate2Standard(lat)), + Longitude: utils.Float64ToStr(jxutils.IntCoordinate2Standard(lng)), }, nil } diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 36f1fc6b3..280fa2162 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -98,7 +98,7 @@ func GetOrderRiderInfoToPlatform(orderId string) { case model.VendorIDMTWM: // 美团发单 globals.SugarLogger.Debug("struct 2 map ", riderInfo.Latitude, "---", riderInfo.Longitude, "---", riderInfo.CourierName) paramsMap := utils.Struct2Map(riderInfo, "", true) - globals.SugarLogger.Debug("GetOrderRiderInfoToPlatform map ", paramsMap) + globals.SugarLogger.Debug("GetOrderRiderInfoToPlatform map ", paramsMap) if handler := partner.GetPurchaseOrderHandlerFromVendorID(v.VendorID); handler != nil { if err := handler.GetOrderRider(v.VendorOrgCode, v.VendorStoreID, paramsMap); err != nil { globals.SugarLogger.Errorf("Error pushing meituan rider information :%v", err)