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 ad67c363d..cbe20025e 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 @@ -434,38 +434,46 @@ public class AddrSvcController { if (json.containsKey("result")) { //我们的结果 JSONObject result = json.getJSONObject("result"); - try { - //如果是江苏省或者浙江省 调用齐梁的结果 - if ("江苏省".equals(result.getString("province")) || "浙江省".equals(result.getString("province"))) { + //我们省级及以上有开发区,直接用我们的结果 + if (result.containsKey("devDistrictName")) { + basicModel.setResult(result); - //结果比较,如果涉农结果不一致 - //调用齐梁 type :1 对公 0 对私 - //我们 type :1 对私 2 对共 - String qltype = "2".equals(type) ? "1" : "0"; - Map map = senRequest(address, qltype); - // 涉农结果不一样 - if (!map.get("verifyFlag").equals(result.get("verifyFlag"))) { - //有市辖建制镇,用我们 - if ("是".equals(result.get("administrativeTowns"))) { - basicModel.setResult(result); + } else { + try { + //如果是江苏省或者浙江省 调用齐梁的结果 + if ("江苏省".equals(result.getString("province")) || "浙江省".equals(result.getString("province"))) { + + //结果比较,如果涉农结果不一致 + //调用齐梁 type :1 对公 0 对私 + //我们 type :1 对私 2 对共 + String qltype = "2".equals(type) ? "1" : "0"; + Map map = senRequest(address, qltype); + // 涉农结果不一样 + if (!map.get("verifyFlag").equals(result.get("verifyFlag"))) { + //有市辖建制镇,用我们 + if ("是".equals(result.get("administrativeTowns"))) { + basicModel.setResult(result); + } else { + map.put("addrVerify", result.getString("addrVerify")); + map.put("typeName", areaMap.get(map.get("typeCode"))); + basicModel.setResult(map); + } } else { - map.put("addrVerify", result.getString("addrVerify")); - map.put("typeName", areaMap.get(map.get("typeCode"))); - basicModel.setResult(map); + basicModel.setResult(result); } + } else { basicModel.setResult(result); + } - } else { + } catch (Exception e) { + e.printStackTrace(); basicModel.setResult(result); - } - } catch (Exception e) { - e.printStackTrace(); - basicModel.setResult(result); } + } mav.setModel(basicModel); } else {