diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java index db70eae13..3bb471310 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java @@ -66,7 +66,7 @@ public class Seawater implements SeawaterEntity { private String url; private String root; private Integer avgPrice; - private Integer unitPrice; + private Number unitPrice; private String purpose; private String estateType; private String buildType; @@ -458,11 +458,11 @@ public class Seawater implements SeawaterEntity { this.maxFloor = maxFloor; } - public Integer getUnitPrice() { + public Number getUnitPrice() { return unitPrice; } - public void setUnitPrice(Integer unitPrice) { + public void setUnitPrice(Number unitPrice) { this.unitPrice = unitPrice; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java index 516d54bd4..bb3602076 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java @@ -57,6 +57,7 @@ import com.fangjia.service.sql.ApiUserService; import com.fangjia.service.sql.UserService; import com.fangjia.service.web.MenuService; import net.sf.json.JSONObject; +import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; import org.bson.types.ObjectId; import org.sothis.core.util.Closure; @@ -980,6 +981,7 @@ public class HouseController { List houseSelf = new ArrayList(); List houseAround = new ArrayList(); List houseList = new ArrayList(); + String[] categories = {"rent", "shop_rent", "office_rent"}; // if (cat.contains("_")) { // 商铺,写字楼有经纬度,直接查 SeawaterQuery query = new SeawaterQuery(); @@ -1043,6 +1045,9 @@ public class HouseController { query.setTable("latest_seawater"); if (StringUtils.isNotBlank(city) && StringUtils.isNotBlank(region) && StringUtils.isNotBlank(districtName)) { houseSelf = seawaterDao.findSeawatersByQuery(query); + for(Seawater house : houseSelf){ + house.setDistance(0); + } houses.addAll(houseSelf); } // 如果自身样本数不够,再查周边 @@ -1088,7 +1093,15 @@ public class HouseController { } } seawater.setSize(house.getArea() == null || house.getArea() == 0 ? null : house.getArea()); - seawater.setUnitPrice(house.getAvgPrice() == null || house.getAvgPrice() == 0 ? null : house.getAvgPrice()); + if(ArrayUtils.contains(categories, cat)){ + if(house.getAvgPrice() != null){ + double dayRentPrice = (double)(house.getAvgPrice()/30.0); + seawater.setUnitPrice(DataUtil.getDoubleRound(2,dayRentPrice)); + } + }else{ + seawater.setUnitPrice(house.getAvgPrice() == null || house.getAvgPrice() == 0 ? null : house.getAvgPrice()); + } + seawater.setTotalPrice(house.getTotalPrice() == null || house.getTotalPrice() == 0 ? null : house.getTotalPrice()); seawater.setDirection(house.getDirection()); seawater.setFloor(house.getFloor() == null || house.getFloor() == 0 ? null : house.getFloor()); @@ -1096,7 +1109,7 @@ public class HouseController { // seawater.setRoom(house.getRoom() == null || house.getRoom() == 0 ? null : house.getRoom()); // seawater.setHall(house.getHall() == null || house.getHall() == 0 ? null : house.getHall()); // seawater.setToilet(house.getToilet() == null || house.getToilet() == 0 ? null : house.getToilet()); - seawater.setDayUnitPrice(house.getDayUnitPrice() == null || house.getDayUnitPrice() == 0 ? null : house.getDayUnitPrice()); +// seawater.setDayUnitPrice(house.getDayUnitPrice() == null || house.getDayUnitPrice() == 0 ? null : house.getDayUnitPrice()); seawater.setRentType(house.getRentType()); seawater.setPayType(house.getPayType()); seawater.setBusinessStatus(house.getBusinessStatus());