From b53d8b9406b810237aec16ce2a1808445cc15127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 11 Sep 2023 16:06:34 +0800 Subject: [PATCH] 1' --- business/jxstore/cms/cms.go | 4 ---- business/partner/purchase/mtwm/order.go | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go index ae18c4a0e..1aac9fea8 100644 --- a/business/jxstore/cms/cms.go +++ b/business/jxstore/cms/cms.go @@ -5,7 +5,6 @@ import ( "fmt" "git.rosy.net.cn/baseapi/platformapi/autonavi" "git.rosy.net.cn/baseapi/platformapi/baidunavi" - "git.rosy.net.cn/jx-callback/globals" "math" "reflect" "regexp" @@ -649,7 +648,6 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way // 如果是三方配送,更新骑手信息 if handler := partner.GetDeliveryPlatformFromVendorID(v.WaybillVendorID); handler != nil { riderInfo, _ := handler.Handler.GetRiderInfo(v.VendorOrderID, v.ID+1000000, v.VendorWaybillID) - globals.SugarLogger.Debugf("=======riderInfo := %s", utils.Format4Output(riderInfo, false)) if riderInfo != nil { if len(riderInfo.Longitude) < len("104.065861") || riderInfo.Longitude != "" { riderInfo.Longitude += "0" @@ -668,7 +666,6 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way // 如果是平台配送,获取骑手信息 if handler := partner.GetPurchaseOrderHandlerFromVendorID(v.WaybillVendorID); handler != nil { riderInfo, _ := handler.OrderLogisticsStatus(v.VendorOrderID) - globals.SugarLogger.Debugf("=======riderInfo := %s", utils.Format4Output(riderInfo, false)) if riderInfo != nil { if len(riderInfo.Longitude) < len("104.065861") || riderInfo.Longitude != "" { riderInfo.Longitude += "0" @@ -705,7 +702,6 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way } } - globals.SugarLogger.Debugf("=========v := %s", utils.Format4Output(v, false)) dao.UpdateEntity(db, v, "OriginalData", "CourierCoordinate", "Distance", "DurationTime") if v.CourierName == "" || v.CourierMobile == "" { v.CourierName = "暂无骑手" diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go index ff8e342f0..2d7934f8d 100644 --- a/business/partner/purchase/mtwm/order.go +++ b/business/partner/purchase/mtwm/order.go @@ -927,7 +927,7 @@ func (c *PurchaseHandler) OrderLogisticsStatus(orderId string) (*utils.RiderInfo } // 获取骑手坐标最后一个 - lng, lat, _ := api.GetDeliveryPath(utils.Str2Int64(orderId), orderInfo.VendorOrderID) + lng, lat, _ := api.GetDeliveryPath(utils.Str2Int64(orderId), orderInfo.VendorStoreID) status.Longitude = utils.Float64ToStr(jxutils.IntCoordinate2Standard(int(lng))) status.Latitude = utils.Float64ToStr(jxutils.IntCoordinate2Standard(int(lat))) return status, nil