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:
richboo111
2023-12-13 09:24:11 +08:00
parent 97b46b81ff
commit 08f9c4592f
1 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
business/partner/delivery/uupt/waybill.go
View File

@@ -8,7 +8,6 @@ import (
tao "git.rosy.net.cn/baseapi/platformapi/tao_vegetable" tao "git.rosy.net.cn/baseapi/platformapi/tao_vegetable"
"git.rosy.net.cn/jx-callback/business/partner/purchase/tao_vegetable" "git.rosy.net.cn/jx-callback/business/partner/purchase/tao_vegetable"
"git.rosy.net.cn/baseapi/platformapi/baidunavi"
"git.rosy.net.cn/baseapi/platformapi/uuptapi" "git.rosy.net.cn/baseapi/platformapi/uuptapi"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils"
@@ -297,27 +296,27 @@ func getOrderPrice(order *model.GoodsOrder) (orderPrice *uuptapi.GetOrderPriceRe
return nil, err return nil, err
} }
//转换百度坐标系 //转换百度坐标系
var coords []*baidunavi.Coordinate //var coords []*baidunavi.Coordinate
coords = append(coords, &baidunavi.Coordinate{ //coords = append(coords, &baidunavi.Coordinate{
Lng: jxutils.IntCoordinate2Standard(store.Lng), // Lng: jxutils.IntCoordinate2Standard(store.Lng),
Lat: jxutils.IntCoordinate2Standard(store.Lat), // Lat: jxutils.IntCoordinate2Standard(store.Lat),
}, &baidunavi.Coordinate{ //}, &baidunavi.Coordinate{
Lat: jxutils.IntCoordinate2Standard(order.ConsigneeLat), // Lat: jxutils.IntCoordinate2Standard(order.ConsigneeLat),
Lng: jxutils.IntCoordinate2Standard(order.ConsigneeLng), // Lng: jxutils.IntCoordinate2Standard(order.ConsigneeLng),
}) //})
coords, err = api.BaiDuNaviAPI.BatchCoordinateConvert(coords, baidunavi.CoordSysGCJ02, baidunavi.CoordSysBaiDu) //coords, err = api.BaiDuNaviAPI.BatchCoordinateConvert(coords, baidunavi.CoordSysGCJ02, baidunavi.CoordSysBaiDu)
if err != nil || len(coords) == 0 { //if err != nil || len(coords) == 0 {
return nil, nil // return nil, nil
//fromLat = jxutils.IntCoordinate2Standard(store.Lng) //} else {
//fromLng = jxutils.IntCoordinate2Standard(store.Lat) // fromLat = coords[0].Lat
//toLat = jxutils.IntCoordinate2Standard(order.ConsigneeLat) // fromLng = coords[0].Lng
//toLng = jxutils.IntCoordinate2Standard(order.ConsigneeLng) // toLat = coords[1].Lat
} else { // toLng = coords[1].Lng
fromLat = coords[0].Lat //}
fromLng = coords[0].Lng fromLat = jxutils.IntCoordinate2Standard(store.Lng)
toLat = coords[1].Lat fromLng = jxutils.IntCoordinate2Standard(store.Lat)
toLng = coords[1].Lng toLat = jxutils.IntCoordinate2Standard(order.ConsigneeLat)
} toLng = jxutils.IntCoordinate2Standard(order.ConsigneeLng)
weight := 4 weight := 4
tempWeight := 0 tempWeight := 0