This commit is contained in:
邹宗楠
2024-01-11 16:05:39 +08:00
parent 3b2c26c040
commit b4ddfa37df
2 changed files with 4 additions and 3 deletions

View File

@@ -686,7 +686,6 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way
courierDistance = float64(v.Distance)
}
nowCourierDrop := int64(math.Ceil((courierDistance / float64(v.Distance)) * float64(len(riderLine)))) // 当前骑手骑行距离,占中的骑行距离百分比.
v.CourierCoordinate = riderLine[nowCourierDrop]
if nowCourierDrop >= int64(len(riderLine)) {
v.CourierCoordinate = riderLine[nowCourierDrop-1]
}
@@ -696,6 +695,10 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way
if v.Status >= model.WaybillStatusDelivered {
v.CourierCoordinate = riderLine[len(riderLine)-1]
}
if v.CourierCoordinate == "" {
v.CourierCoordinate = riderLine[nowCourierDrop]
}
}
dao.UpdateEntity(db, v, "OriginalData", "CourierCoordinate", "Distance", "DurationTime")