This commit is contained in:
邹宗楠
2024-05-31 13:34:11 +08:00
parent 165988ec58
commit d7263034f3
4 changed files with 17 additions and 16 deletions

View File

@@ -658,15 +658,15 @@ func GetVendorRiderInfo(wayBillVendorId, vendorId int, vendorOrderId, vendorWayb
return nil, err
}
if order.Status >= model.OrderStatusEndBegin {
riderInfo.Longitude = utils.Float64ToStr(utils.Int2Float64(order.ConsigneeLng) / 1000000)
riderInfo.Latitude = utils.Float64ToStr(utils.Int2Float64(order.ConsigneeLat) / 1000000)
riderInfo.Longitude = utils.Float64ToStr(jxutils.IntCoordinate2Standard(order.ConsigneeLng))
riderInfo.Latitude = utils.Float64ToStr(jxutils.IntCoordinate2Standard(order.ConsigneeLat))
} else {
store, err := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode)
if err != nil {
return nil, err
}
riderInfo.Longitude = utils.Float64ToStr(utils.Int2Float64(store.Lng) / 1000000)
riderInfo.Latitude = utils.Float64ToStr(utils.Int2Float64(store.Lat) / 1000000)
riderInfo.Longitude = utils.Float64ToStr(jxutils.IntCoordinate2Standard(store.Lng))
riderInfo.Latitude = utils.Float64ToStr(jxutils.IntCoordinate2Standard(store.Lat))
}
}