diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java index dbbad6549..c0f3d23ac 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java @@ -435,8 +435,11 @@ public class AddrSvcController { if (json.containsKey("result")) { //我们的结果 JSONObject result = json.getJSONObject("result"); - //我们省级及以上有开发区,直接用我们的结果 - if (result.containsKey("devDistrictName")) { + // 如果是无效信息,则用我们的 + if (result.containsKey("addrVerify") && !"地址有效".equals(result.getString("addrVerify"))) { + basicModel.setResult(result); + }//我们省级及以上有开发区,直接用我们的结果 + else if (result.containsKey("devDistrictName")) { basicModel.setResult(result); } else { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/GdBankController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/GdBankController.java index 4edaec18d..06d3ef504 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/GdBankController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/GdBankController.java @@ -95,10 +95,12 @@ public class GdBankController { } else if (("否").equals(result.get("countyLevelCity"))) { result.put("prefectureLevelCity", "是"); } - //我们省级及以上有开发区,直接用我们的结果 - if (result.containsKey("devDistrictName")) { + // 如果是无效信息,则用我们的 + if (result.containsKey("addrVerify") && !"地址有效".equals(result.getString("addrVerify"))) { + basicModel.setResult(result); + //我们省级及以上有开发区,直接用我们的结果 + } else if (result.containsKey("devDistrictName")) { basicModel.setResult(result); - } else { try { //如果是江苏省或者浙江省 调用齐梁的结果 @@ -128,7 +130,6 @@ public class GdBankController { map.put("typeName", areaMap.get(map.get("typeCode"))); basicModel.setResult(map); } - } else { basicModel.setResult(result); }