liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
suyl
2021-06-18 09:16:33 +08:00
parent e9e8859406
commit a63ac58140
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
business/jxcallback/orderman/order.go
View File

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