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 88cd97297..890ee0ddd 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 @@ -37,7 +37,7 @@ public class Seawater implements SeawaterEntity { private String id; private String category; @JsonInclude(JsonInclude.Include.NON_DEFAULT) - private int status; + private Integer status; private String city; private String region; private String district; @@ -100,11 +100,11 @@ public class Seawater implements SeawaterEntity { } @Column(name = "status") - public int getStatus() { + public Integer getStatus() { return status; } - public void setStatus(int status) { + public void setStatus(Integer status) { this.status = status; } 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 c56e7d63b..18d402e24 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 @@ -1021,7 +1021,13 @@ public class HouseController { seawater.setAddress(house.getAddress()); seawater.setName(house.getDistrictName()); seawater.setSize(house.getArea()); - seawater.setUnitPrice(house.getAvgPrice()); + if (house.getAvgPrice() != null) { + seawater.setUnitPrice(house.getAvgPrice()); + }else { + if (house.getTotalPrice() != null &&house.getTotalPrice()>0 && house.getArea()!=null && house.getArea()>0){ + seawater.setUnitPrice((int) (house.getTotalPrice() / house.getArea())); + } + } seawater.setTotalPrice(house.getTotalPrice()); seawater.setDirection(house.getDirection()); seawater.setFloor(house.getFloor());