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

This commit is contained in:
邹宗楠
2023-11-30 16:22:37 +08:00

View File

@@ -307,10 +307,11 @@ func getOrderPrice(order *model.GoodsOrder) (orderPrice *uuptapi.GetOrderPriceRe
})
coords, err = api.BaiDuNaviAPI.BatchCoordinateConvert(coords, baidunavi.CoordSysGCJ02, baidunavi.CoordSysBaiDu)
if err != nil || len(coords) == 0 {
fromLat = jxutils.IntCoordinate2Standard(store.Lng)
fromLng = jxutils.IntCoordinate2Standard(store.Lat)
toLat = jxutils.IntCoordinate2Standard(order.ConsigneeLat)
toLng = jxutils.IntCoordinate2Standard(order.ConsigneeLng)
return nil, nil
//fromLat = jxutils.IntCoordinate2Standard(store.Lng)
//fromLng = jxutils.IntCoordinate2Standard(store.Lat)
//toLat = jxutils.IntCoordinate2Standard(order.ConsigneeLat)
//toLng = jxutils.IntCoordinate2Standard(order.ConsigneeLng)
} else {
fromLat = coords[0].Lat
fromLng = coords[0].Lng