liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2024-05-30 10:17:08 +08:00
parent 7410975ed0
commit 165988ec58
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
business/partner/delivery/rider.go
View File

@@ -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 == "" {

4
business/partner/purchase/jd/jd.go
View File

@@ -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)
}