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

Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
邹宗楠
2023-11-30 16:22:37 +08:00
parent 9cf6125a03 ffe03b5199
commit b4e7070033
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -307,10 +307,11 @@ func getOrderPrice(order *model.GoodsOrder) (orderPrice *uuptapi.GetOrderPriceRe
}) })
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 {
fromLat = jxutils.IntCoordinate2Standard(store.Lng) return nil, nil
fromLng = jxutils.IntCoordinate2Standard(store.Lat) //fromLat = jxutils.IntCoordinate2Standard(store.Lng)
toLat = jxutils.IntCoordinate2Standard(order.ConsigneeLat) //fromLng = jxutils.IntCoordinate2Standard(store.Lat)
toLng = jxutils.IntCoordinate2Standard(order.ConsigneeLng) //toLat = jxutils.IntCoordinate2Standard(order.ConsigneeLat)
//toLng = jxutils.IntCoordinate2Standard(order.ConsigneeLng)
} else { } else {
fromLat = coords[0].Lat fromLat = coords[0].Lat
fromLng = coords[0].Lng fromLng = coords[0].Lng