1

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
+//}

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
 		}