This commit is contained in:
邹宗楠
2023-10-27 18:28:47 +08:00
parent d53146b640
commit 0480adb3dc
2 changed files with 0 additions and 8 deletions

View File

@@ -2,7 +2,6 @@ package cms
import (
"fmt"
"git.rosy.net.cn/jx-callback/globals"
"math"
"reflect"
"regexp"
@@ -631,10 +630,8 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way
if v.Status == model.WaybillStatusCanceled {
continue
}
//if v.Status >= model.WaybillStatusAccepted && v.Status <= model.WaybillStatusCanceled {
// 获取骑行路线图
if v.OriginalData == "" {
//originalData, distance, durationTime, err := GetCyclingLine(origin, destination)
originalData, distance, durationTime, err := GetCyclingLine(sLng, sLat, uLng, uLat)
if err == nil {
v.OriginalData = strings.Join(originalData, ";")
@@ -643,7 +640,6 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way
}
}
//}
if vendorMaps[v.WaybillVendorID] == model.YES {
// 如果是三方配送,更新骑手信息
@@ -734,7 +730,6 @@ func GetCyclingLine(sLng, sLat, uLng, uLat float64) (polyLineList []string, dist
if err != nil {
return nil, 0, 0, err
}
globals.SugarLogger.Debugf("==============:data %s", utils.Format4Output(data, false))
if data == "" {
return nil, 0, 0, fmt.Errorf("获取骑行规划路线错误")
}
@@ -742,7 +737,6 @@ func GetCyclingLine(sLng, sLat, uLng, uLat float64) (polyLineList []string, dist
if err := utils.Map2StructByJson(data, path, false); err != nil {
return nil, 0, 0, err
}
globals.SugarLogger.Debugf("==============:path %s", utils.Format4Output(path, false))
distance = int64(path.Routes[0].Distance) // 距离
duration = int64(path.Routes[0].Duration) // 时间