1

business/jxstore/cms/cms.go

@@ -8,6 +8,8 @@ import (
 	"strings"
 	"time"
 
+	"git.rosy.net.cn/baseapi/platformapi/baidunavi"
+
 	"git.rosy.net.cn/jx-callback/business/partner/purchase/ebai"
 
 	"git.rosy.net.cn/baseapi/utils/errlist"
@@ -585,25 +587,21 @@ func GetCityBankBranches(ctx *jxcontext.Context, cityCode int, bankCode string)
 }
 
 // GetSToUWalkingDistance 获取商家与用户间步行距离
-//func GetSToUWalkingDistance(sLng, sLat, uLng, uLat float64) (distance float64, err error) {
-//	var (
-//		coords []*baidunavi.Coordinate
-//		sCoord *baidunavi.Coordinate
-//		uCoord *baidunavi.Coordinate
-//	)
-//	coords = append(coords, &baidunavi.Coordinate{
-//		Lng: sLng,
-//		Lat: sLat,
-//	}, &baidunavi.Coordinate{
-//		Lat: uLng,
-//		Lng: uLat,
-//	})
-//	if coords, err = api.BaiDuNaviAPI.BatchCoordinateConvert(coords, baidunavi.CoordSysGCJ02, baidunavi.CoordSysBaiDu); err == nil {
-//		if len(coords) > 0 {
-//			//distance=baidunavi.
-//			//todo 修改为百度地图
-//			return jxutils.WalkingDistance(sLng, sLat, uLng, uLat), nil
-//		}
-//	}
-//	return 0, err
-//}
+func GetSToURidingDistance(sLng, sLat, uLng, uLat float64) (stepInfo interface{}, err error) {
+	var coords []*baidunavi.Coordinate
+	coords = append(coords, &baidunavi.Coordinate{
+		Lng: sLng,
+		Lat: sLat,
+	}, &baidunavi.Coordinate{
+		Lat: uLat,
+		Lng: uLng,
+	})
+	if coords, err = api.BaiDuNaviAPI.BatchCoordinateConvert(coords, baidunavi.CoordSysGCJ02, baidunavi.CoordSysBaiDu); err == nil {
+		if len(coords) > 0 {
+			if stepInfo, err = api.BaiDuNaviAPI.DirectionLiteRide(coords); err == nil && stepInfo.(string) != "" {
+				return stepInfo, nil
+			}
+		}
+	}
+	return 0, err
+}