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