From 34b90844c51d522cc7c5b439d801fbb3e125ef1e Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Fri, 19 Dec 2025 10:09:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E8=BE=B9=E6=88=BF=E6=BA=90=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E4=BF=AE=E6=94=B9=E5=8F=8A=E5=B9=B3=E7=B1=B3=E7=A7=9F?= =?UTF-8?q?=E9=87=91=E6=8E=A5=E5=8F=A3=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/HouseController.java | 42 +++++++++++-------- .../controllers/SqmetreRentController.java | 6 ++- 2 files changed, 29 insertions(+), 19 deletions(-) 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 dc37725aa..516d54bd4 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 @@ -975,6 +975,21 @@ public class HouseController { mav.setModel(BasicModel.buildBadRequestModel("非中国经纬度")); return mav; } + + List houses = new ArrayList(); + List houseSelf = new ArrayList(); + List houseAround = new ArrayList(); + List houseList = new ArrayList(); +// if (cat.contains("_")) { + // 商铺,写字楼有经纬度,直接查 + SeawaterQuery query = new SeawaterQuery(); + // 先用名字查自身的样本 + query.setCityDisplay(city); + query.setRegion(region); + query.setDistrictName(districtName); + query.setStartDate(model.getStartTime()); + query.setEndDate(model.getEndTime()); + String category = "district"; if ("1".equals(model.getPropertyType())) { category = "office"; @@ -991,6 +1006,11 @@ public class HouseController { } else { cat = "rent"; } + if (model.getPrice() != null) { + query.setStartPrice((int) (model.getPrice() * 0.9 * 30)); + query.setEndPrice((int) (model.getPrice() * 1.1 * 30)); + } + } else { if ("1".equals(model.getPropertyType())) { cat = "office_sell"; @@ -998,21 +1018,13 @@ public class HouseController { if ("2".equals(model.getPropertyType())) { cat = "shop_sell"; } + if (model.getPrice() != null) { + query.setStartPrice((int) (model.getPrice() * 0.9)); + query.setEndPrice((int) (model.getPrice() * 1.1)); + } + } - List houses = new ArrayList(); - List houseSelf = new ArrayList(); - List houseAround = new ArrayList(); - List houseList = new ArrayList(); -// if (cat.contains("_")) { - // 商铺,写字楼有经纬度,直接查 - SeawaterQuery query = new SeawaterQuery(); - // 先用名字查自身的样本 - query.setCityDisplay(city); - query.setRegion(region); - query.setDistrictName(districtName); query.setCat(cat); - query.setStartDate(model.getStartTime()); - query.setEndDate(model.getEndTime()); if (model.getSize() != null && model.getSize() != 0) { query.setStartArea(model.getSize() * 0.9); @@ -1025,10 +1037,6 @@ public class HouseController { } else { pager.setPageSize(5); } - if (model.getPrice() != null) { - query.setStartPrice((int) (model.getPrice() * 0.9)); - query.setEndPrice((int) (model.getPrice() * 1.1)); - } query.setPager(pager); query.setSortField("p_date"); query.setOrder(false); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SqmetreRentController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SqmetreRentController.java index d00eb39d5..17c168e00 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SqmetreRentController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SqmetreRentController.java @@ -1,6 +1,7 @@ package com.fangjia.open.controllers; import com.fangjia.core.RegionData; +import com.fangjia.core.util.DataUtil; import com.fangjia.core.util.DateUtil; import com.fangjia.dal.mongo.model.SqmetreRent; import com.fangjia.dal.seaweed.model.District; @@ -232,7 +233,8 @@ public class SqmetreRentController { item.put("district", sqmetreRent.getRegion()); item.put("name", sqmetreRent.getDistrictName()); Integer currentRent = (sqmetreRent.getAvgPrice() != null) ? sqmetreRent.getAvgPrice().intValue() : 0; - item.put("rent", currentRent); + Double dayRentPrice = currentRent/30.0; + item.put("rent", DataUtil.getRound(2, dayRentPrice)); item.put("date", sqmetreRent.getWeekend() != null ? DateUtil.formatByPattern(sqmetreRent.getWeekend(), "yyyy-MM") : "未知日期"); // 计算月涨幅 @@ -249,7 +251,7 @@ public class SqmetreRentController { } // 设置返回结果,防止 subList 越界 - if (result.size() > 1) { + if (result.size() > 0) { mav.setModel(BasicModel.buildOKModel().setResult(result.subList(1, result.size()))); } else { mav.setModel(BasicModel.buildOKModel().setResult(null));