liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2023-09-06 15:03:14 +08:00
parent ed4aca4fa9
commit b5eb42f6a3
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
business/jxstore/cms/cms.go
View File

@@ -669,14 +669,17 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way
riderLine := strings.Split(v.OriginalData, ";") // 路线坐标点 riderLine := strings.Split(v.OriginalData, ";") // 路线坐标点
courierDistance := float64(time.Now().Unix()-v.WaybillCreatedAt.Unix()) * (float64(v.Distance) / float64(v.DurationTime)) // 当前骑手骑行距离 courierDistance := float64(time.Now().Unix()-v.WaybillCreatedAt.Unix()) * (float64(v.Distance) / float64(v.DurationTime)) // 当前骑手骑行距离
if courierDistance >= float64(v.Distance) {
courierDistance = float64(v.Distance)
}
nowCourierDrop := int64(math.Ceil((courierDistance / float64(v.Distance)) * float64(len(riderLine)))) // 当前骑手骑行距离,占中的骑行距离百分比. nowCourierDrop := int64(math.Ceil((courierDistance / float64(v.Distance)) * float64(len(riderLine)))) // 当前骑手骑行距离,占中的骑行距离百分比.
if nowCourierDrop >= int64(len(riderLine)) { if nowCourierDrop >= int64(len(riderLine)) {
v.CourierCoordinate = riderLine[nowCourierDrop-2] v.CourierCoordinate = riderLine[nowCourierDrop-1]
} }
if nowCourierDrop <= 0 { if nowCourierDrop <= 0 {
v.CourierCoordinate = riderLine[0] v.CourierCoordinate = riderLine[0]
} }
if v.Status == model.WaybillStatusDelivered { if v.Status >= model.WaybillStatusDelivered {
v.CourierCoordinate = riderLine[len(riderLine)-1] v.CourierCoordinate = riderLine[len(riderLine)-1]
} }
} }