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-12 18:59:37 +08:00
parent 5ebc38ce1f
commit d0acb420a4
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,6 @@ import (
"fmt" "fmt"
"git.rosy.net.cn/baseapi/platformapi/autonavi" "git.rosy.net.cn/baseapi/platformapi/autonavi"
"git.rosy.net.cn/baseapi/platformapi/baidunavi" "git.rosy.net.cn/baseapi/platformapi/baidunavi"
"git.rosy.net.cn/jx-callback/globals"
"math" "math"
"reflect" "reflect"
"regexp" "regexp"
@@ -636,13 +635,13 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way
if v.OriginalData == "" { if v.OriginalData == "" {
//originalData, distance, durationTime, err := GetCyclingLine(origin, destination) //originalData, distance, durationTime, err := GetCyclingLine(origin, destination)
originalData, distance, durationTime, err := GetCyclingLine(sLng, sLat, uLng, uLat) originalData, distance, durationTime, err := GetCyclingLine(sLng, sLat, uLng, uLat)
if err != nil { if err == nil {
return nil, err
}
v.OriginalData = strings.Join(originalData, ";") v.OriginalData = strings.Join(originalData, ";")
v.Distance = distance v.Distance = distance
v.DurationTime = durationTime v.DurationTime = durationTime
} }
}
//} //}
if vendorMaps[v.WaybillVendorID] == model.YES { if vendorMaps[v.WaybillVendorID] == model.YES {
@@ -684,7 +683,7 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way
} }
// 当这个运单为假物流/门店真实自送/获取运单骑手信息为空的时候使用假的骑手信息 // 当这个运单为假物流/门店真实自送/获取运单骑手信息为空的时候使用假的骑手信息
if v.WaybillVendorID == model.VendorJXFakeWL || v.WaybillVendorID == model.VendorIDUnknown || v.CourierCoordinate == "" { if (v.WaybillVendorID == model.VendorJXFakeWL || v.WaybillVendorID == model.VendorIDUnknown || v.CourierCoordinate == "") && v.OriginalData != "" {
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)) // 当前骑手骑行距离
@@ -741,8 +740,9 @@ func GetCyclingLine(sLng, sLat, uLng, uLat float64) (polyLineList []string, dist
if err := json.Unmarshal([]byte(data.(string)), path); err != nil { if err := json.Unmarshal([]byte(data.(string)), path); err != nil {
return nil, 0, 0, err return nil, 0, 0, err
} }
globals.SugarLogger.Debugf("===========data := %s", data) if path.Status != model.NO {
globals.SugarLogger.Debugf("===========path := %s", utils.Format4Output(path, false)) return nil, 0, 0, fmt.Errorf("%d,%s", path.Status, path.Message)
}
distance = int64(path.Result.Routes[0].Distance) // 距离 distance = int64(path.Result.Routes[0].Distance) // 距离
duration = int64(path.Result.Routes[0].Duration) // 时间 duration = int64(path.Result.Routes[0].Duration) // 时间

3
business/partner/delivery/rider.go
View File

@@ -328,8 +328,7 @@ func makeRiderInfo(fakeWayBill *model.Waybill, riderInfo *utils.RiderInfo) {
waybill2, err := cms.GetSToURidingDistance2(jxutils.IntCoordinate2Standard(storeDetail.Lng), jxutils.IntCoordinate2Standard(storeDetail.Lat), jxutils.IntCoordinate2Standard(order.ConsigneeLng), jxutils.IntCoordinate2Standard(order.ConsigneeLat), fakeWayBill.VendorOrderID) waybill2, err := cms.GetSToURidingDistance2(jxutils.IntCoordinate2Standard(storeDetail.Lng), jxutils.IntCoordinate2Standard(storeDetail.Lat), jxutils.IntCoordinate2Standard(order.ConsigneeLng), jxutils.IntCoordinate2Standard(order.ConsigneeLat), fakeWayBill.VendorOrderID)
if err != nil { if err != nil {
ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "高德地图骑行方案获取错误:", utils.Format4Output(err.Error(), false)) ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "百度地图骑行方案获取错误:", utils.Format4Output(err.Error(), false))
return
} }
courierCoordinate := strings.Split(waybill2.CourierCoordinate, ",") courierCoordinate := strings.Split(waybill2.CourierCoordinate, ",")
if len(courierCoordinate) < 2 && fakeWayBill.Status < model.WaybillStatusDelivered { if len(courierCoordinate) < 2 && fakeWayBill.Status < model.WaybillStatusDelivered {