diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index a415b3c16..aa8710ff6 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -2053,23 +2053,28 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o sql1 := "SELECT * FROM place WHERE jds_code = ?" sqlParams1 := []interface{}{shopDetail.AddCode2} if err2 := dao.GetRow(db, &place, sql1, sqlParams1); err2 == nil && place != nil { - cityCode = place.JdsCode + cityCode = place.Code } else { sql2 := "SELECT * FROM place WHERE jd_code = ?" sqlParams2 := []interface{}{shopDetail.AddCode2} if err3 := dao.GetRow(db, &place, sql2, sqlParams2); err3 == nil && place != nil { - cityCode = place.JdCode + cityCode = place.Code } } } } - if cityCode != 0 { - lng, lat, _ = api.AutonaviAPI.GetCoordinateFromAddressByPage(order.ConsigneeAddress, cityCode) + //if cityCode != 0 { + lng, lat, _ = api.AutonaviAPI.GetCoordinateFromAddressByPage(order.ConsigneeAddress, cityCode) + //} else { + lng2, lat2, _ = api.AutonaviAPI.GetCoordinateFromAddress(order.ConsigneeAddress, "") + if err == nil && lng != 0 && lat != 0 { + order.ConsigneeLng = jxutils.StandardCoordinate2Int(lng) + order.ConsigneeLat = jxutils.StandardCoordinate2Int(lat) } else { - lng2, lat2, _ = api.AutonaviAPI.GetCoordinateFromAddress(order.ConsigneeAddress, "") order.ConsigneeLng = jxutils.StandardCoordinate2Int(lng2) order.ConsigneeLat = jxutils.StandardCoordinate2Int(lat2) } + //} distance := jxutils.EarthDistance(lng, lat, lng2, lat2) if distance > 1 { order.OrderType = model.OrderTypeAddressErr