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:
邹宗楠
2024-07-04 18:20:16 +08:00
parent 941544a209
commit 348d9a0351
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
business/jxstore/cms/cms.go
View File

@@ -632,7 +632,6 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way
// 获取骑行路线图 // 获取骑行路线图
if v.OriginalData == "" { if v.OriginalData == "" {
originalData, distance, durationTime, err := GetCyclingLine(sLng, sLat, uLng, uLat) originalData, distance, durationTime, err := GetCyclingLine(sLng, sLat, uLng, uLat)
globals.SugarLogger.Debugf("======originalData := %d", len(originalData))
if err == nil && len(originalData) != model.NO { if err == nil && len(originalData) != model.NO {
v.OriginalData = strings.Join(originalData, ";") v.OriginalData = strings.Join(originalData, ";")
v.Distance = distance v.Distance = distance
@@ -697,6 +696,13 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way
if v.Status >= model.WaybillStatusDelivered { if v.Status >= model.WaybillStatusDelivered {
v.CourierCoordinate = riderLine[len(riderLine)-1] v.CourierCoordinate = riderLine[len(riderLine)-1]
} }
if v.Status == model.WaybillStatusCourierArrived {
order, _ := partner.CurOrderManager.LoadOrder(orderId, v.OrderVendorID)
storeDetail, err := dao.GetStoreDetail2(dao.GetDB(), order.JxStoreID, order.VendorStoreID, order.VendorID)
if err == nil && storeDetail != nil {
v.CourierCoordinate = fmt.Sprintf("%s,%s", utils.Float64ToStr(jxutils.IntCoordinate2Standard(storeDetail.Lng)), utils.Float64ToStr(jxutils.IntCoordinate2Standard(storeDetail.Lat)))
}
}
if v.CourierCoordinate == "" { if v.CourierCoordinate == "" {
v.CourierCoordinate = riderLine[nowCourierDrop] v.CourierCoordinate = riderLine[nowCourierDrop]
} }
@@ -753,9 +759,7 @@ func GetCyclingLine(sLng, sLat, uLng, uLat float64) (polyLineList []string, dist
} }
} }
globals.SugarLogger.Debugf("polyLine========================%d", len(polyLine))
polyLineList = baiDuCoord2Gaode2(polyLine) polyLineList = baiDuCoord2Gaode2(polyLine)
globals.SugarLogger.Debugf("polyLineList========================%d", len(polyLineList))
if len(polyLineList) == 0 || polyLineList == nil { if len(polyLineList) == 0 || polyLineList == nil {
polyLineList = polyLine polyLineList = polyLine
} }