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 304f4813b..4f46c6782 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 @@ -89,7 +89,7 @@ public class GdBankController { } /** - * 涉农识别-新规则-光大银行 + * 涉农识别-新规则-光大银行对公识别接口 * * @param model * @return @@ -108,15 +108,15 @@ public class GdBankController { JSONObject json = null; Map params = new HashMap(); params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : null); - params.put("type", type); - params.put("redis", (model.getRadius() != null && model.getRadius() != 0) ? model.getRadius().toString() : null); + //params.put("type", type); + //params.put("redis", (model.getRadius() != null && model.getRadius() != 0) ? model.getRadius().toString() : null); params.put("address", model.getAddress()); - params.put("showFullValue", "2"); + //params.put("showFullValue", "2"); try { - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/villageIdentify", params, "UTF-8"); + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/cebEnterpriseVillageIdentify", params, "UTF-8"); } catch (Exception e) { try { - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/villageIdentify", params, "UTF-8"); + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/cebEnterpriseVillageIdentify", params, "UTF-8"); } catch (Exception ex) { ex.printStackTrace(); } @@ -131,11 +131,14 @@ public class GdBankController { //我们省级及以上有开发区,直接用我们的结果 if (result.containsKey("devDistrictName")) { basicModel.setResult(result); - - } else if (!"2".equals(type)) { // 对私的不用齐梁 - basicModel.setResult(result); } else { try { + // 我们是县政府,且涉农结果为农,取我们结果,因为光大部分逻辑调整 + if ("是".equals(result.get("countyGov")) && "农".equals(result.get("verifyFlag"))) { + basicModel.setResult(result); + mav.setModel(basicModel); + return mav; + } //如果是江苏省或者浙江省 调用齐梁的结果 if ("江苏省".equals(result.getString("province")) || "浙江省".equals(result.getString("province"))) { //结果比较,如果涉农结果不一致