From 165988ec5835054e63ea029d9e5f7cd28157789a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 30 May 2024 10:17:08 +0800 Subject: [PATCH] 1 --- business/partner/delivery/rider.go | 9 +++++---- business/partner/purchase/jd/jd.go | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 21b2f684d..9cfda9ca7 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -205,12 +205,13 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) { } if riderInfo.Longitude == "" && riderInfo.LogisticsStatus != 105 { - riderInfo.Longitude = utils.Float64ToStr(utils.Int2Float64(storeDetail.Lng) / 1000000) - riderInfo.Latitude = utils.Float64ToStr(utils.Int2Float64(storeDetail.Lat) / 1000000) + + riderInfo.Longitude = utils.Float64ToStr(jxutils.IntCoordinate2Standard(storeDetail.Lng)) + riderInfo.Latitude = utils.Float64ToStr(jxutils.IntCoordinate2Standard(storeDetail.Lat)) } if riderInfo.Longitude == "" && riderInfo.LogisticsStatus == 105 { - riderInfo.Longitude = utils.Float64ToStr(utils.Int2Float64(v.ConsigneeLng) / 1000000) - riderInfo.Latitude = utils.Float64ToStr(utils.Int2Float64(v.ConsigneeLat) / 1000000) + riderInfo.Longitude = utils.Float64ToStr(jxutils.IntCoordinate2Standard(v.ConsigneeLng)) + riderInfo.Latitude = utils.Float64ToStr(jxutils.IntCoordinate2Standard(v.ConsigneeLat)) } if riderInfo.OrderId == "" { diff --git a/business/partner/purchase/jd/jd.go b/business/partner/purchase/jd/jd.go index 93fe357d8..6837caaec 100644 --- a/business/partner/purchase/jd/jd.go +++ b/business/partner/purchase/jd/jd.go @@ -5,6 +5,7 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/globals/api" "net/url" + "strings" "git.rosy.net.cn/jx-callback/business/model/dao" @@ -235,5 +236,6 @@ func OrderDeliveryCoordinate(vendorOrgCode string, param map[string]interface{}) if operateUser == "" { operateUser = "system_user" } - return getAPI(vendorOrgCode).SelfDeliveryUploadCoordinate(utils.Str2Int64(param["order_id"].(string)), param["latitude"].(string), param["longitude"].(string), operateUser) + + return getAPI(vendorOrgCode).SelfDeliveryUploadCoordinate(utils.Str2Int64(param["order_id"].(string)), strings.ReplaceAll(param["latitude"].(string), ".", ""), strings.ReplaceAll(param["longitude"].(string), ".", ""), operateUser) }