From a6e48b011266fe2192b7c79f2ead03443297998f Mon Sep 17 00:00:00 2001 From: gaojuan Date: Fri, 17 Nov 2023 18:01:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=BC=B0=E5=80=BC=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E5=88=AB=E5=A2=85=E5=88=A4=E6=96=AD=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=9C=B0=E5=9D=80=E6=A0=A1=E5=87=86=E5=8C=96=E9=93=BE?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/PropertyController.java | 16 +++++++++++++--- .../open/model/PropertyEvaluationModel.java | 12 ++++++------ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index 5943c0a20..d838ffcca 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -1568,6 +1568,9 @@ public class PropertyController { model.setDistrict(fangjiaOfficialAreaMap.getFangjiaDistrict()); } } + + boolean villaFlag = DataUtil.isVilla(model.getSize(), model.getName(), model.getHeight(), model.getRoom()); + District district = null; Map params = new HashMap(); params.put("city", model.getCity()); @@ -1585,7 +1588,14 @@ public class PropertyController { if(json.getInt("code")==200){ Map map = (Map) json.get("result"); if((Integer)map.get("precise")>=0){ - district = districtService.findByNameAndAlias((String) map.get("city"), (String) map.get("district"), (String) map.get("name"), "district"); + String propertyType = (String) map.get("propertyType"); + if(villaFlag && StringUtils.isNotBlank(propertyType) && !propertyType.equals("别墅")){ + district = districtService.findByNameAndAlias((String) map.get("city"), (String) map.get("district"), (String) map.get("name")+"别墅", "district"); + } + if(null == district){ + district = districtService.findByNameAndAlias((String) map.get("city"), (String) map.get("district"), (String) map.get("name"), "district"); + } + } } } @@ -2792,7 +2802,7 @@ public class PropertyController { evaluation.setOtherFactor(model.getOtherFactor()); } evaluation.setRegion(model.getDistrict()); - if (0 != model.getRoom()) { + if (null != model.getRoom()) { evaluation.setRoom(model.getRoom()); } if (StringUtils.isNotBlank(model.getRoomNumber())) { @@ -5549,7 +5559,7 @@ public class PropertyController { //周边相似小区租金 Integer room = null; - if(model.getRoom()!=0){ + if(model.getRoom()!=null && model.getRoom()>0){ room = model.getRoom(); }else{ room = houseService.getDistrictRoomType((float)model.getSize()); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertyEvaluationModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertyEvaluationModel.java index 859658742..2abc1acf1 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertyEvaluationModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertyEvaluationModel.java @@ -70,12 +70,12 @@ public class PropertyEvaluationModel extends FangjiaApiModel { /** * 总楼层 */ - private int height; + private Integer height; /** * 室数 */ - private int room; + private Integer room; /** * 厅数 @@ -345,19 +345,19 @@ public class PropertyEvaluationModel extends FangjiaApiModel { this.floor = floor; } - public int getHeight() { + public Integer getHeight() { return height; } - public void setHeight(int height) { + public void setHeight(Integer height) { this.height = height; } - public int getRoom() { + public Integer getRoom() { return room; } - public void setRoom(int room) { + public void setRoom(Integer room) { this.room = room; }