diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 9f2412144..9a974dc5a 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -4369,25 +4369,34 @@ func RefreshPageStore() { ` dao.GetRows(db, &jds, sql, nil) for _, v := range jds { + var ( + lng, lat float64 + dis string + ) if (v.Lat == "" && v.Lng == "") || (v.Lat == "0" && v.Lng == "0") { if v.Address != "" { if v.BakInfo != "" { - result, _ := api.AutonaviAPI.GetCoordinateFromAddressAll(v.Address, v.BakInfo) - lng, lat, dis := utils.Float64ToStr(result.Lng), utils.Float64ToStr(result.Lat), result.AdName - if lng == "" || lat == "" { - result1, _ := api.AutonaviAPI.GetCoordinateFromAddressAll(v.Address, "") - lng, lat, dis = utils.Float64ToStr(result1.Lng), utils.Float64ToStr(result1.Lat), result1.AdName + //result, _ := api.AutonaviAPI.GetCoordinateFromAddressAll(v.Address, v.Remark) + //lng, lat, dis := utils.Float64ToStr(result.Lng), utils.Float64ToStr(result.Lat), result.AdName + place, _ := dao.GetPlaceByName(db, v.BakInfo, 2, 0) + if result1, _ := api.AutonaviAPI.GetCoordinateFromAddressByPageAll(v.Address, place.Code); result1 != nil { + if result1.Lng == 0 || result1.Lat == 0 { + result2, _ := api.AutonaviAPI.GetCoordinateFromAddressByPageAll(v.Address, 0) + lng, lat, dis = result2.Lng, result2.Lat, result2.AdName + } else { + lng, lat, dis = result1.Lng, result1.Lat, result1.AdName + } } sql := ` - UPDATE jingdong_showd SET lng = ?, lat = ?, district_name = ? WHERE id = ? + UPDATE jingdong_showd SET lng = ?, lat = ?, district_name = ? WHERE id = ? ` sqlparams := []interface{}{ lng, lat, dis, v.ID, } dao.ExecuteSQL(db, sql, sqlparams) } else { - result1, _ := api.AutonaviAPI.GetCoordinateFromAddressAll(v.Address, "") - lng, lat, dis := utils.Float64ToStr(result1.Lng), utils.Float64ToStr(result1.Lat), result1.AdName + result1, _ := api.AutonaviAPI.GetCoordinateFromAddressByPageAll(v.Address, 0) + lng, lat, dis = result1.Lng, result1.Lat, result1.AdName sql := ` UPDATE jingdong_showd SET lng = ?, lat = ?, district_name = ? WHERE id = ? ` @@ -4405,25 +4414,34 @@ func RefreshPageStore() { ` dao.GetRows(db, &mts, sql2, nil) for _, v := range mts { + var ( + lng, lat float64 + dis string + ) if (v.Lat == "" && v.Lng == "") || (v.Lat == "0" && v.Lng == "0") { if v.Address != "" { if v.CityName != "" { - result, _ := api.AutonaviAPI.GetCoordinateFromAddressAll(v.Address, v.CityName) - lng, lat, dis := utils.Float64ToStr(result.Lng), utils.Float64ToStr(result.Lat), result.AdName - if lng == "" || lat == "" { - result1, _ := api.AutonaviAPI.GetCoordinateFromAddressAll(v.Address, "") - lng, lat, dis = utils.Float64ToStr(result1.Lng), utils.Float64ToStr(result1.Lat), result1.AdName + //result, _ := api.AutonaviAPI.GetCoordinateFromAddressAll(v.Address, v.Remark) + //lng, lat, dis := utils.Float64ToStr(result.Lng), utils.Float64ToStr(result.Lat), result.AdName + place, _ := dao.GetPlaceByName(db, v.CityName, 2, 0) + if result1, _ := api.AutonaviAPI.GetCoordinateFromAddressByPageAll(v.Address, place.Code); result1 != nil { + if result1.Lng == 0 || result1.Lat == 0 { + result2, _ := api.AutonaviAPI.GetCoordinateFromAddressByPageAll(v.Address, 0) + lng, lat, dis = result2.Lng, result2.Lat, result2.AdName + } else { + lng, lat, dis = result1.Lng, result1.Lat, result1.AdName + } } sql := ` - UPDATE meituan_showd SET lng = ?, lat = ?, district_name = ? WHERE id = ? + UPDATE meituan_showd SET lng = ?, lat = ?, district_name = ? WHERE id = ? ` sqlparams := []interface{}{ lng, lat, dis, v.ID, } dao.ExecuteSQL(db, sql, sqlparams) } else { - result1, _ := api.AutonaviAPI.GetCoordinateFromAddressAll(v.Address, "") - lng, lat, dis := utils.Float64ToStr(result1.Lng), utils.Float64ToStr(result1.Lat), result1.AdName + result1, _ := api.AutonaviAPI.GetCoordinateFromAddressByPageAll(v.Address, 0) + lng, lat, dis = result1.Lng, result1.Lat, result1.AdName sql := ` UPDATE meituan_showd SET lng = ?, lat = ?, district_name = ? WHERE id = ? ` @@ -4442,14 +4460,23 @@ func RefreshPageStore() { ` dao.GetRows(db, &ebais, sqlebai, nil) for _, v := range ebais { + var ( + lng, lat float64 + dis string + ) if (v.Lat == "" && v.Lng == "") || (v.Lat == "0" && v.Lng == "0") { if v.Address != "" { if v.Remark != "" { - result, _ := api.AutonaviAPI.GetCoordinateFromAddressAll(v.Address, v.Remark) - lng, lat, dis := utils.Float64ToStr(result.Lng), utils.Float64ToStr(result.Lat), result.AdName - if lng == "" || lat == "" { - result1, _ := api.AutonaviAPI.GetCoordinateFromAddressAll(v.Address, "") - lng, lat, dis = utils.Float64ToStr(result1.Lng), utils.Float64ToStr(result1.Lat), result1.AdName + //result, _ := api.AutonaviAPI.GetCoordinateFromAddressAll(v.Address, v.Remark) + //lng, lat, dis := utils.Float64ToStr(result.Lng), utils.Float64ToStr(result.Lat), result.AdName + place, _ := dao.GetPlaceByName(db, v.Remark, 2, 0) + if result1, _ := api.AutonaviAPI.GetCoordinateFromAddressByPageAll(v.Address, place.Code); result1 != nil { + if result1.Lng == 0 || result1.Lat == 0 { + result2, _ := api.AutonaviAPI.GetCoordinateFromAddressByPageAll(v.Address, 0) + lng, lat, dis = result2.Lng, result2.Lat, result2.AdName + } else { + lng, lat, dis = result1.Lng, result1.Lat, result1.AdName + } } sql := ` UPDATE elm_showd SET lng = ?, lat = ?, district_name = ? WHERE store_id = ? @@ -4459,8 +4486,8 @@ func RefreshPageStore() { } dao.ExecuteSQL(db, sql, sqlparams) } else { - result1, _ := api.AutonaviAPI.GetCoordinateFromAddressAll(v.Address, "") - lng, lat, dis := utils.Float64ToStr(result1.Lng), utils.Float64ToStr(result1.Lat), result1.AdName + result1, _ := api.AutonaviAPI.GetCoordinateFromAddressByPageAll(v.Address, 0) + lng, lat, dis = result1.Lng, result1.Lat, result1.AdName sql := ` UPDATE elm_showd SET lng = ?, lat = ?, district_name = ? WHERE store_id = ? `