From 563cfb5fba1acd1f8bfde3ccd299e9b34fe9fccf Mon Sep 17 00:00:00 2001
From: richboo111 <yangsiqi1376@163.com>
Date: Tue, 9 May 2023 11:44:53 +0800
Subject: [PATCH] 1

---
 business/jxstore/cms/cms.go           | 24 ++++++++++++++++++++++++
 business/partner/delivery/rider.go    |  6 +++---
 controllers/cms.go                    | 16 ++++++++++++++++
 routers/commentsRouter_controllers.go |  9 +++++++++
 4 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go
index 5c4560a9b..c620a586c 100644
--- a/business/jxstore/cms/cms.go
+++ b/business/jxstore/cms/cms.go
@@ -583,3 +583,27 @@ func GetCityBankBranches(ctx *jxcontext.Context, cityCode int, bankCode string)
 	}
 	return info, err
 }
+
+// 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
+//}
diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go
index 91bc7c61c..3bddf1f27 100644
--- a/business/partner/delivery/rider.go
+++ b/business/partner/delivery/rider.go
@@ -87,9 +87,9 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
 	//3.当同一个订单已经上传了一次配送信息，如再次同步会更新配送信息，以最新的一次为准。
 	//4.如订单已完成、已取消等状态发货将失败。
 	for _, v := range orders {
-		if v.Status >= model.OrderStatusFinished || v.Status < model.OrderStatusDelivering {
-			continue
-		}
+		//if v.Status >= model.OrderStatusFinished || v.Status < model.OrderStatusDelivering {
+		//	continue
+		//}
 		if orderId == "" && v.VendorID == model.VendorIDDD { // 抖音门店订单除了三方配送回调时推送,不在主动推送配送消息
 			continue
 		}
diff --git a/controllers/cms.go b/controllers/cms.go
index 42162f966..e9c9b37cc 100644
--- a/controllers/cms.go
+++ b/controllers/cms.go
@@ -359,3 +359,19 @@ func (c *CmsController) GetVendorOrgCodeInfo() {
 		return retVal, "", err
 	})
 }
+
+// @Title 得到商家与用户之间步行距离
+// @Description 得到商家与用户之间步行距离
+// @Param	token	header	string	true	"认证token"
+// @Param	sLng	query	int	    true	"商家经度"
+// @Param	sLat	query	int	    true	"商家纬度"
+// @Param	uLng	query	int		true	"用户经度"
+// @Param	uLat	query	int		true	"用户纬度"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetSToUWalkingDistance [get]
+func (c *CmsController) GetSToUWalkingDistance() {
+	c.callGetSToUWalkingDistance(func(params *tCmsGetSToUWalkingDistanceParams) (interface{}, string, error) {
+		return nil, "", nil
+	})
+}
diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go
index d9d7150a2..0bdaa32f5 100644
--- a/routers/commentsRouter_controllers.go
+++ b/routers/commentsRouter_controllers.go
@@ -448,6 +448,15 @@ func init() {
 			Filters:          nil,
 			Params:           nil})
 
+	web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:CmsController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:CmsController"],
+		web.ControllerComments{
+			Method:           "GetSToUWalkingDistance",
+			Router:           `/GetSToUWalkingDistance`,
+			AllowHTTPMethods: []string{"get"},
+			MethodParams:     param.Make(),
+			Filters:          nil,
+			Params:           nil})
+
 	web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:CmsController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:CmsController"],
 		web.ControllerComments{
 			Method:           "NewConfig",