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 4f46c6782..8745f5969 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 @@ -129,65 +129,65 @@ public class GdBankController { //我们的结果 JSONObject result = json.getJSONObject("result"); //我们省级及以上有开发区,直接用我们的结果 - if (result.containsKey("devDistrictName")) { - 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"))) { - //结果比较,如果涉农结果不一致 - //调用齐梁 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"))) { - // 齐梁县政府但是涉农为农,取我们的结果 扬中市三茅街道中华村永固河路1号 - if ("是".equals(map.get("countyGov")) && "农".equals(map.get("verifyFlag"))) { - basicModel.setResult(result); - mav.setModel(basicModel); - return mav; - } - //城市不一样 用我们 - if (result.containsKey("city")) { - if ((!result.get("city").equals(map.get("city")) && StringUtils.isNotBlank(result.getString("city")))) { - basicModel.setResult(result); - } else { - map.put("addrVerify", "地址有效"); - map.put("typeName", areaMap.get(map.get("typeCode"))); - map.put("addrArea", addrArea(map, type)); - map.put("countyLevelCity", countyLevelCity(map)); - basicModel.setResult(map); - } - } else { - map.put("addrVerify", "地址有效"); - map.put("typeName", areaMap.get(map.get("typeCode"))); - map.put("addrArea", addrArea(map, type)); - map.put("countyLevelCity", countyLevelCity(map)); - basicModel.setResult(map); - } - - } else { - basicModel.setResult(result); - } - - } else { - basicModel.setResult(result); - - } - - } catch (Exception e) { - e.printStackTrace(); - basicModel.setResult(result); - } - - } + basicModel.setResult(result); +// if (result.containsKey("devDistrictName")) { +// } 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"))) { +// //结果比较,如果涉农结果不一致 +// //调用齐梁 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"))) { +// // 齐梁县政府但是涉农为农,取我们的结果 扬中市三茅街道中华村永固河路1号 +// if ("是".equals(map.get("countyGov")) && "农".equals(map.get("verifyFlag"))) { +// basicModel.setResult(result); +// mav.setModel(basicModel); +// return mav; +// } +// //城市不一样 用我们 +// if (result.containsKey("city")) { +// if ((!result.get("city").equals(map.get("city")) && StringUtils.isNotBlank(result.getString("city")))) { +// basicModel.setResult(result); +// } else { +// map.put("addrVerify", "地址有效"); +// map.put("typeName", areaMap.get(map.get("typeCode"))); +// map.put("addrArea", addrArea(map, type)); +// map.put("countyLevelCity", countyLevelCity(map)); +// basicModel.setResult(map); +// } +// } else { +// map.put("addrVerify", "地址有效"); +// map.put("typeName", areaMap.get(map.get("typeCode"))); +// map.put("addrArea", addrArea(map, type)); +// map.put("countyLevelCity", countyLevelCity(map)); +// basicModel.setResult(map); +// } +// +// } else { +// basicModel.setResult(result); +// } +// +// } else { +// basicModel.setResult(result); +// +// } +// +// } catch (Exception e) { +// e.printStackTrace(); +// basicModel.setResult(result); +// } +// +// } } mav.setModel(basicModel);