From d0acb420a4bee9907e8c6e8e242f6bb413729e30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Tue, 12 Sep 2023 18:59:37 +0800
Subject: [PATCH] 1

---
 business/jxstore/cms/cms.go        | 18 +++++++++---------
 business/partner/delivery/rider.go |  3 +--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go
index b044b5ceb..631c3480c 100644
--- a/business/jxstore/cms/cms.go
+++ b/business/jxstore/cms/cms.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"git.rosy.net.cn/baseapi/platformapi/autonavi"
 	"git.rosy.net.cn/baseapi/platformapi/baidunavi"
-	"git.rosy.net.cn/jx-callback/globals"
 	"math"
 	"reflect"
 	"regexp"
@@ -636,12 +635,12 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way
 			if v.OriginalData == "" {
 				//originalData, distance, durationTime, err := GetCyclingLine(origin, destination)
 				originalData, distance, durationTime, err := GetCyclingLine(sLng, sLat, uLng, uLat)
-				if err != nil {
-					return nil, err
+				if err == nil {
+					v.OriginalData = strings.Join(originalData, ";")
+					v.Distance = distance
+					v.DurationTime = durationTime
 				}
-				v.OriginalData = strings.Join(originalData, ";")
-				v.Distance = distance
-				v.DurationTime = durationTime
+
 			}
 			//}
 
@@ -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, ";") // 路线坐标点
 
 				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 {
 		return nil, 0, 0, err
 	}
-	globals.SugarLogger.Debugf("===========data := %s", data)
-	globals.SugarLogger.Debugf("===========path := %s", utils.Format4Output(path, false))
+	if path.Status != model.NO {
+		return nil, 0, 0, fmt.Errorf("%d,%s", path.Status, path.Message)
+	}
 	distance = int64(path.Result.Routes[0].Distance) // 距离
 	duration = int64(path.Result.Routes[0].Duration) // 时间
 
diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go
index 9f4b66e5f..8f41ed78e 100644
--- a/business/partner/delivery/rider.go
+++ b/business/partner/delivery/rider.go
@@ -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)
 	if err != nil {
-		ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "高德地图骑行方案获取错误:", utils.Format4Output(err.Error(), false))
-		return
+		ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "百度地图骑行方案获取错误:", utils.Format4Output(err.Error(), false))
 	}
 	courierCoordinate := strings.Split(waybill2.CourierCoordinate, ",")
 	if len(courierCoordinate) < 2 && fakeWayBill.Status < model.WaybillStatusDelivered {