1
This commit is contained in:
@@ -628,8 +628,8 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string, vend
|
|||||||
for _, v := range waybills {
|
for _, v := range waybills {
|
||||||
// 获取骑行路线图
|
// 获取骑行路线图
|
||||||
if v.OriginalData == "" && v.WaybillVendorID == model.VendorJXFakeWL {
|
if v.OriginalData == "" && v.WaybillVendorID == model.VendorJXFakeWL {
|
||||||
originalData, distance, durationTime, err := GetCyclingLine(sLng, sLat, uLng, uLat)
|
originalData, distance, durationTime, err2 := GetCyclingLine(sLng, sLat, uLng, uLat)
|
||||||
if err == nil && len(originalData) != model.NO {
|
if err2 == nil && len(originalData) != model.NO {
|
||||||
v.OriginalData = strings.Join(originalData, ";")
|
v.OriginalData = strings.Join(originalData, ";")
|
||||||
v.Distance = distance
|
v.Distance = distance
|
||||||
v.DurationTime = durationTime + 500
|
v.DurationTime = durationTime + 500
|
||||||
@@ -704,7 +704,20 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string, vend
|
|||||||
}
|
}
|
||||||
|
|
||||||
} else if (v.WaybillVendorID == model.VendorJXFakeWL || v.WaybillVendorID == model.VendorIDUnknown || v.CourierCoordinate == "") && v.OriginalData == "" {
|
} else if (v.WaybillVendorID == model.VendorJXFakeWL || v.WaybillVendorID == model.VendorIDUnknown || v.CourierCoordinate == "") && v.OriginalData == "" {
|
||||||
v.CourierCoordinate = ""
|
lng := (sLng - uLng) / float64(300)
|
||||||
|
lat := (sLat - uLat) / float64(300)
|
||||||
|
originalData := make([]string, 0, 0)
|
||||||
|
originalData = append(originalData, fmt.Sprintf("%.6f,%.6f", sLng, sLat))
|
||||||
|
for i := 1; i <= 300; i++ {
|
||||||
|
fakeCourier := fmt.Sprintf("%.6f,%.6f", sLng+(lng*float64(i)), sLat+(lat*float64(i)))
|
||||||
|
originalData = append(originalData, fakeCourier)
|
||||||
|
}
|
||||||
|
originalData = append(originalData, fmt.Sprintf("%.6f,%.6f", uLng, uLat))
|
||||||
|
|
||||||
|
v.Distance = 5001 // 距离,固定
|
||||||
|
v.DurationTime = 600 // 固定骑行时间
|
||||||
|
v.OriginalData = strings.Join(originalData, ";")
|
||||||
|
v.CourierCoordinate = originalData[0]
|
||||||
}
|
}
|
||||||
|
|
||||||
dao.UpdateEntity(db, v, "OriginalData", "CourierCoordinate", "Distance", "DurationTime")
|
dao.UpdateEntity(db, v, "OriginalData", "CourierCoordinate", "Distance", "DurationTime")
|
||||||
|
|||||||
Reference in New Issue
Block a user