| @@ -738,23 +738,24 @@ public class TtMerchantPoiServiceImpl implements TtMerchantPoiService { | |||||
| gaodeInfo.setErrMsg("高德匹配到多条信息"); | gaodeInfo.setErrMsg("高德匹配到多条信息"); | ||||
| }else { | }else { | ||||
| gaodeInfo.setSuccess(true); | gaodeInfo.setSuccess(true); | ||||
| String country = reo.getString("country"); | |||||
| JSONObject geo = geocodes.getJSONObject(0); | |||||
| String country = geo.getString("country"); | |||||
| if (StringUtils.isNotBlank(country)) { | if (StringUtils.isNotBlank(country)) { | ||||
| gaodeInfo.setCountry(country); | gaodeInfo.setCountry(country); | ||||
| } | } | ||||
| String province = reo.getString("province"); | |||||
| String province = geo.getString("province"); | |||||
| if (StringUtils.isNotBlank(province)) { | if (StringUtils.isNotBlank(province)) { | ||||
| gaodeInfo.setProvince(province); | gaodeInfo.setProvince(province); | ||||
| } | } | ||||
| String city = reo.getString("city"); | |||||
| String city = geo.getString("city"); | |||||
| if (StringUtils.isNotBlank(city)) { | if (StringUtils.isNotBlank(city)) { | ||||
| gaodeInfo.setCity(city); | gaodeInfo.setCity(city); | ||||
| } | } | ||||
| String district = reo.getString("district"); | |||||
| String district = geo.getString("district"); | |||||
| if (StringUtils.isNotBlank(district)) { | if (StringUtils.isNotBlank(district)) { | ||||
| gaodeInfo.setDistrict(district); | gaodeInfo.setDistrict(district); | ||||
| } | } | ||||
| String location = reo.getString("location"); | |||||
| String location = geo.getString("location"); | |||||
| if (StringUtils.isNotBlank(location)) { | if (StringUtils.isNotBlank(location)) { | ||||
| String[] locas = location.split(","); | String[] locas = location.split(","); | ||||
| if (null != locas && locas.length == 2) { | if (null != locas && locas.length == 2) { | ||||