商铺房源字段修改
This commit is contained in:
@@ -380,6 +380,18 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl<Seawater> i
|
||||
if (source.containsKey("business_range")) {
|
||||
seawater.setBusinessRange(source.getString("business_range"));
|
||||
}
|
||||
if (source.containsKey("day_rent_price")) {
|
||||
seawater.setDayUnitPrice(source.getDouble("day_rent_price"));
|
||||
}
|
||||
if (source.containsKey("pay_type")) {
|
||||
seawater.setPayType(source.getString("pay_type"));
|
||||
}
|
||||
if (source.containsKey("rent_type")) {
|
||||
seawater.setRentType(source.getString("rent_type"));
|
||||
}
|
||||
if (source.containsKey("business_status")) {
|
||||
seawater.setBusinessStatus(source.getString("business_status"));
|
||||
}
|
||||
try {
|
||||
seawater.setDistance((int) jsonList.get(i).getJSONArray("sort").getDouble(0));
|
||||
} catch (Exception e) {
|
||||
|
||||
@@ -96,6 +96,13 @@ public class Seawater implements SeawaterEntity {
|
||||
// 写字楼等级
|
||||
private String level;
|
||||
|
||||
private Double dayUnitPrice;
|
||||
|
||||
private String payType;
|
||||
|
||||
private String rentType;
|
||||
|
||||
private String businessStatus;
|
||||
|
||||
|
||||
@Id
|
||||
@@ -529,4 +536,40 @@ public class Seawater implements SeawaterEntity {
|
||||
public void setBusinessRange(String businessRange) {
|
||||
this.businessRange = businessRange;
|
||||
}
|
||||
|
||||
@Column(name = "day_rent_price")
|
||||
public Double getDayUnitPrice() {
|
||||
return dayUnitPrice;
|
||||
}
|
||||
|
||||
public void setDayUnitPrice(Double dayUnitPrice) {
|
||||
this.dayUnitPrice = dayUnitPrice;
|
||||
}
|
||||
|
||||
@Column(name = "pay_type")
|
||||
public String getPayType() {
|
||||
return payType;
|
||||
}
|
||||
|
||||
public void setPayType(String payType) {
|
||||
this.payType = payType;
|
||||
}
|
||||
|
||||
@Column(name = "rent_type")
|
||||
public String getRentType() {
|
||||
return rentType;
|
||||
}
|
||||
|
||||
public void setRentType(String rentType) {
|
||||
this.rentType = rentType;
|
||||
}
|
||||
|
||||
@Column(name = "business_status")
|
||||
public String getBusinessStatus() {
|
||||
return businessStatus;
|
||||
}
|
||||
|
||||
public void setBusinessStatus(String businessStatus) {
|
||||
this.businessStatus = businessStatus;
|
||||
}
|
||||
}
|
||||
|
||||
+7
-72
@@ -1039,9 +1039,13 @@ public class HouseController {
|
||||
seawater.setDirection(house.getDirection());
|
||||
seawater.setFloor(house.getFloor() == null || house.getFloor() == 0 ? null : house.getFloor());
|
||||
seawater.setMaxFloor(house.getHeight() == null || house.getHeight() == 0 ? null : house.getHeight());
|
||||
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.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.setRentType(house.getRentType());
|
||||
seawater.setPayType(house.getPayType());
|
||||
seawater.setBusinessStatus(house.getBusinessStatus());
|
||||
seawater.setDecoration(house.getFitment());
|
||||
if (house.getpDate() != null && house.getpDate() > 10000000) {
|
||||
String numberStr = String.valueOf(house.getpDate());
|
||||
@@ -1072,75 +1076,6 @@ public class HouseController {
|
||||
houseList.add(seawater);
|
||||
}
|
||||
}
|
||||
// } else {
|
||||
// if ("sell".equals(cat)) {
|
||||
// List<House> houseByLocation = houseService.findNearestHasHouseByLocation(model.getCity(), lat, lng, cat, model.getRadius(), 5);
|
||||
// for (House house : houseByLocation) {
|
||||
// Seawater seawater = new Seawater();
|
||||
// seawater.setId(house.getId());
|
||||
// seawater.setCity(house.getCity());
|
||||
// seawater.setDistrict(house.getRegion());
|
||||
// seawater.setAddress(house.getAddress());
|
||||
// seawater.setName(house.getDistrictName());
|
||||
// seawater.setSize(house.getArea() == null || house.getArea() == 0 ? null : house.getArea());
|
||||
// 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());
|
||||
// seawater.setMaxFloor(house.getHeight() == null || house.getHeight() == 0 ? null : house.getHeight());
|
||||
// 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());
|
||||
// if (house.getAvgPrice() != null && house.getAvgPrice() != 0) {
|
||||
// seawater.setUnitPrice(house.getAvgPrice());
|
||||
// } else {
|
||||
// if (house.getTotalPrice() != null && house.getTotalPrice() > 0 && house.getArea() != null && house.getArea() > 0) {
|
||||
// int price = (int) (house.getTotalPrice() / house.getArea());
|
||||
// seawater.setUnitPrice(price == 0 ? null : price);
|
||||
// }
|
||||
// }
|
||||
// seawater.setDecoration(house.getFitment());
|
||||
// if (house.getPublishDate() != null) {
|
||||
// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
||||
// seawater.setPublishDate(sdf.format(house.getPublishDate()));
|
||||
// }
|
||||
// houseList.add(seawater);
|
||||
// }
|
||||
// } else if ("rent".equals(cat)) {
|
||||
// List<RentHouse> rentHouseByLocation = rentHouseService.findNearestHasHouseByLocation(model.getCity(), lat, lng, cat, model.getRadius(), 5);
|
||||
// for (RentHouse house : rentHouseByLocation) {
|
||||
// Seawater seawater = new Seawater();
|
||||
// seawater.setId(house.getId());
|
||||
// seawater.setCity(house.getCity());
|
||||
// seawater.setDistrict(house.getRegion());
|
||||
// seawater.setAddress(house.getAddress());
|
||||
// seawater.setName(house.getDistrictName());
|
||||
// seawater.setSize(house.getArea() == null || house.getArea() == 0 ? null : house.getArea());
|
||||
// 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());
|
||||
// seawater.setMaxFloor(house.getHeight() == null || house.getHeight() == 0 ? null : house.getHeight());
|
||||
// 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());
|
||||
// if (house.getAvgPrice() != null && house.getAvgPrice() != 0) {
|
||||
// seawater.setUnitPrice(house.getAvgPrice());
|
||||
// } else {
|
||||
// if (house.getTotalPrice() != null && house.getTotalPrice() > 0 && house.getArea() != null && house.getArea() > 0) {
|
||||
// int price = (int) (house.getTotalPrice() / house.getArea());
|
||||
// seawater.setUnitPrice(price == 0 ? null : price);
|
||||
// }
|
||||
// }
|
||||
// seawater.setDecoration(house.getFitment());
|
||||
// if (house.getPublishDate() != null) {
|
||||
// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
||||
// seawater.setPublishDate(sdf.format(house.getPublishDate()));
|
||||
// }
|
||||
// houseList.add(seawater);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
|
||||
BasicModel basicModel = new BasicModel(200, "ok");
|
||||
|
||||
Reference in New Issue
Block a user