From c0786b12e2a590b0dd6b6d5358cbd66f2134a212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Fri, 17 May 2024 19:51:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=95=88=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/open/controllers/AddrSvcController.java | 7 +++++-- .../com/fangjia/open/controllers/GdBankController.java | 9 +++++---- 2 files changed, 10 insertions(+), 6 deletions(-) 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); }