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-11 16:06:34 +08:00
parent f7d3eee018
commit b53d8b9406
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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"
@@ -649,7 +648,6 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way
// 如果是三方配送,更新骑手信息 // 如果是三方配送,更新骑手信息
if handler := partner.GetDeliveryPlatformFromVendorID(v.WaybillVendorID); handler != nil { if handler := partner.GetDeliveryPlatformFromVendorID(v.WaybillVendorID); handler != nil {
riderInfo, _ := handler.Handler.GetRiderInfo(v.VendorOrderID, v.ID+1000000, v.VendorWaybillID) riderInfo, _ := handler.Handler.GetRiderInfo(v.VendorOrderID, v.ID+1000000, v.VendorWaybillID)
globals.SugarLogger.Debugf("=======riderInfo := %s", utils.Format4Output(riderInfo, false))
if riderInfo != nil { if riderInfo != nil {
if len(riderInfo.Longitude) < len("104.065861") || riderInfo.Longitude != "" { if len(riderInfo.Longitude) < len("104.065861") || riderInfo.Longitude != "" {
riderInfo.Longitude += "0" riderInfo.Longitude += "0"
@@ -668,7 +666,6 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way
// 如果是平台配送,获取骑手信息 // 如果是平台配送,获取骑手信息
if handler := partner.GetPurchaseOrderHandlerFromVendorID(v.WaybillVendorID); handler != nil { if handler := partner.GetPurchaseOrderHandlerFromVendorID(v.WaybillVendorID); handler != nil {
riderInfo, _ := handler.OrderLogisticsStatus(v.VendorOrderID) riderInfo, _ := handler.OrderLogisticsStatus(v.VendorOrderID)
globals.SugarLogger.Debugf("=======riderInfo := %s", utils.Format4Output(riderInfo, false))
if riderInfo != nil { if riderInfo != nil {
if len(riderInfo.Longitude) < len("104.065861") || riderInfo.Longitude != "" { if len(riderInfo.Longitude) < len("104.065861") || riderInfo.Longitude != "" {
riderInfo.Longitude += "0" riderInfo.Longitude += "0"
@@ -705,7 +702,6 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way
} }
} }
globals.SugarLogger.Debugf("=========v := %s", utils.Format4Output(v, false))
dao.UpdateEntity(db, v, "OriginalData", "CourierCoordinate", "Distance", "DurationTime") dao.UpdateEntity(db, v, "OriginalData", "CourierCoordinate", "Distance", "DurationTime")
if v.CourierName == "" || v.CourierMobile == "" { if v.CourierName == "" || v.CourierMobile == "" {
v.CourierName = "暂无骑手" v.CourierName = "暂无骑手"

2
business/partner/purchase/mtwm/order.go
View File

@@ -927,7 +927,7 @@ func (c *PurchaseHandler) OrderLogisticsStatus(orderId string) (*utils.RiderInfo
} }
// 获取骑手坐标最后一个 // 获取骑手坐标最后一个
lng, lat, _ := api.GetDeliveryPath(utils.Str2Int64(orderId), orderInfo.VendorOrderID) lng, lat, _ := api.GetDeliveryPath(utils.Str2Int64(orderId), orderInfo.VendorStoreID)
status.Longitude = utils.Float64ToStr(jxutils.IntCoordinate2Standard(int(lng))) status.Longitude = utils.Float64ToStr(jxutils.IntCoordinate2Standard(int(lng)))
status.Latitude = utils.Float64ToStr(jxutils.IntCoordinate2Standard(int(lat))) status.Latitude = utils.Float64ToStr(jxutils.IntCoordinate2Standard(int(lat)))
return status, nil return status, nil