diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go index e6b9c0d76..6bf06a3be 100644 --- a/business/jxutils/jxutils.go +++ b/business/jxutils/jxutils.go @@ -132,7 +132,7 @@ func ConvertDistanceToLogLat(lng, lat, distance, angle float64) (newLng, newLat } // 返回结果单元为公里 -func EarthDistance(lat1, lng1, lat2, lng2 float64) float64 { +func EarthDistance(lng1, lat1, lng2, lat2 float64) float64 { radius := 6378.137 rad := math.Pi / 180.0 lat1 = lat1 * rad diff --git a/business/jxutils/jxutils_test.go b/business/jxutils/jxutils_test.go index 64450af30..eb48eee78 100644 --- a/business/jxutils/jxutils_test.go +++ b/business/jxutils/jxutils_test.go @@ -6,9 +6,9 @@ import ( ) func TestEarthDistance(t *testing.T) { - lat1, lng1 := 32.060255, 118.796877 - lat2, lng2 := 39.904211, 116.407395 - distance := EarthDistance(lat1, lng1, lat2, lng2) + lng1, lat1 := 118.796877, 32.060255 + lng2, lat2 := 116.407395, 39.904211 + distance := EarthDistance(lng1, lat1, lng2, lat2) fmt.Print(distance) } diff --git a/business/partner/delivery/delivery.go b/business/partner/delivery/delivery.go index 4a96d4258..8d58c15aa 100644 --- a/business/partner/delivery/delivery.go +++ b/business/partner/delivery/delivery.go @@ -55,7 +55,7 @@ func CalculateOrderDeliveryFee(order *model.GoodsOrder, billTime time.Time, db o lng2, lat2, _ := jxutils.IntCoordinate2MarsStandard(order.ConsigneeLng, order.ConsigneeLat, order.CoordinateType) var distanceAddFee, weightAddFee, timeAddFee int64 - distance := jxutils.EarthDistance(lat, lng, lat2, lng2) * 1.4 + distance := jxutils.EarthDistance(lng, lat, lng2, lat2) * 1.4 if distance < 3 { } else if distance < 5 { distanceAddFee = jxutils.StandardPrice2Int(math.Ceil(distance - 3))