Merge remote-tracking branch 'origin/mark' into su

2019-11-28 09:49:47 +08:00
parent 799c8232d7 412fe44d32
commit a041906c86
21 changed files with 440 additions and 57 deletions
--- a/business/jxutils/jxutils.go
+++ b/business/jxutils/jxutils.go
@@ -210,6 +210,9 @@ func EarthDistance(lng1, lat1, lng2, lat2 float64) float64 {
 	lng2 = lng2 * rad
 	theta := lng2 - lng1
 	dist := math.Acos(math.Sin(lat1)*math.Sin(lat2) + math.Cos(lat1)*math.Cos(lat2)*math.Cos(theta))
+	if dist < 0 {
+		dist = 0
+	}
 	return dist * radius
 }