From f46687ac5de2f79a277efba1f3c1f9e224cbf623 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 30 一月 2024 16:43:05 +0800
Subject: [PATCH] 修改附近方圆报错
---
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/HouseResourceService.java | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/HouseResourceService.java b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/HouseResourceService.java
index 16223e3..bc20bf7 100644
--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/HouseResourceService.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/HouseResourceService.java
@@ -186,8 +186,10 @@
SearchHouseResourceRes searchHouseResource = new SearchHouseResourceRes();
List<SearchHouseResourceListRes> searchHouseResourceListRes = this.baseMapper.searchHouseResource(req, cityIds, districtIds, saleAmountStart, saleAmountEnd, houseModels, houseTypeIds);
+
// 如果有根据用户历史来搜索必看 如果没有搜索出数据 那么查询所有必看
- if (req.getDataType()!=null&&req.getDataType()==1 && (!StringUtils.hasLength(req.getDistrict())) && searchHouseResourceListRes!=null&&searchHouseResourceListRes.size()==0){
+ if (req.getDataType()!=null&&req.getDataType()==1 && (!StringUtils.hasLength(req.getDistrict()))
+ && searchHouseResourceListRes!=null&&searchHouseResourceListRes.size()==0){
cityIds=null;
districtIds=null;
searchHouseResourceListRes = this.baseMapper.searchHouseResource(req, cityIds, districtIds, saleAmountStart, saleAmountEnd, houseModels, houseTypeIds);
@@ -198,6 +200,27 @@
t.setHouseResource(3);
}
}
+ if (req.getUserType()==5){
+ // 中介房源
+ List<SearchHouseResourceListRes> collect = searchHouseResourceListRes.stream()
+ .filter(t -> t.getHouseResource() == 3)
+ .sorted(Comparator.comparing(SearchHouseResourceListRes::getInsertTime).reversed())
+ .collect(Collectors.toList());
+
+ // 个人房源
+ List<SearchHouseResourceListRes> collect1 = searchHouseResourceListRes.stream()
+ .filter(t -> t.getHouseResource() == 2)
+ .sorted(Comparator.comparing(SearchHouseResourceListRes::getInsertTime).reversed())
+ .collect(Collectors.toList());
+ searchHouseResourceListRes = collect;
+ searchHouseResourceListRes.addAll(collect1);
+ }else{
+ List<SearchHouseResourceListRes> collect = searchHouseResourceListRes.stream()
+ .sorted(Comparator.comparing(SearchHouseResourceListRes::getInsertTime).reversed())
+ .collect(Collectors.toList());
+ searchHouseResourceListRes = collect;
+ }
+
searchHouseResource.setList(searchHouseResourceListRes);
List<SearchHouseResourceListRes> searchHouseResourceListRes1 = this.baseMapper.searchHouseResource1(req, cityIds, districtIds, saleAmountStart, saleAmountEnd, houseModels, houseTypeIds);
searchHouseResource.setTotal(searchHouseResourceListRes1.size());
@@ -369,7 +392,9 @@
List<Integer> ids = pointLocations.stream().map(PointLocation::getHouseId).collect(Collectors.toList());
if (ids.size()!= 0){
List<HouseResource> houseResources = this.selectBatchIds(ids);
- List<HouseResource> collect = houseResources.stream().filter(t -> !t.getId().equals(id) && t.getAuthStatus() == 2 && t.getType() == 2
+ List<HouseResource> collect = houseResources.stream()
+ .filter(t -> !t.getId().equals(id)
+ && t.getAuthStatus() == 2 && t.getType() == 2
&& t.getStatus() == 1 && t.getIsDelete() == 0 && t.getDataType() == houseResource.getDataType())
.collect(Collectors.toList());
List<SearchHouseResourceListRes> list = new ArrayList<>();
@@ -379,13 +404,17 @@
searchHouseResourceListRes.setId(resource.getId());
AppUser appUser = appUserService.selectById(resource.getAppUserId());
searchHouseResourceListRes.setHouseResource(appUser.getUserType());
- searchHouseResourceListRes.setImgUrl(resource.getHousePhoto().split(",")[0]);
+ if(StringUtils.hasLength(resource.getHousePhoto())){
+ searchHouseResourceListRes.setImgUrl(resource.getHousePhoto().split(",")[0]);
+ }
searchHouseResourceListRes.setTitle(resource.getTitle());
searchHouseResourceListRes.setHouseArea(resource.getHouseArea());
searchHouseResourceListRes.setHouseModel(resource.getHouseModel());
Region region = regionService.selectById(houseResource.getDistrictId());
Region region1 = regionService.selectById(houseResource.getCityId());
- searchHouseResourceListRes.setAddress(region1.getName() + " > " + region.getName() + "/" + houseResource.getHouseAddress());
+ if (region!=null && region1!=null){
+ searchHouseResourceListRes.setAddress(region1.getName() + " > " + region.getName() + "/" + houseResource.getHouseAddress());
+ }
searchHouseResourceListRes.setSaleAmount(resource.getSaleAmount().doubleValue());
searchHouseResourceListRes.setElevator(resource.getElevator());
searchHouseResourceListRes.setDryingArea(resource.getDryingArea());
@@ -456,6 +485,11 @@
houseResource.setPlatform(req.getPlatform());
BeanUtils.copyProperties(req,houseResource);
houseResource.setType(req.getType());
+ if (StringUtils.hasLength(req.getHousePhoto())){
+ houseResource.setHousePhoto(req.getHousePhoto());
+ }else{
+ houseResource.setHousePhoto("");
+ }
houseResource.setInsertTime(new Date());
houseResource.setGoodHouse(0);
houseResource.setIsDelete(0);
@@ -465,7 +499,7 @@
// todo 修改回审核和上下架状态
houseResource.setStatus(1);
houseResource.setDataType(req.getDataType());
- houseResource.setAuthStatus(1);
+ houseResource.setAuthStatus(2);
houseResource.setLeaseTime(req.getTime());
houseResource.setAppUserId(appUserId);
houseResource.setFirmHouse(req.getFirmHouse());
@@ -478,17 +512,21 @@
}
if (req.getType()==2){
if (req.getId()==null){
+ houseResource.setAuthTime(new Date());
houseResource.setAuthStatus(2);
this.baseMapper.insert(houseResource);
}else{
+ houseResource.setAuthTime(new Date());
houseResource.setAuthStatus(2);
this.baseMapper.updateById(houseResource);
}
}else{
if (req.getId()==null){
+ houseResource.setAuthTime(new Date());
houseResource.setAuthStatus(2);
this.baseMapper.insert(houseResource);
}else{
+ houseResource.setAuthTime(new Date());
houseResource.setAuthStatus(2);
this.baseMapper.updateById(houseResource);
}
@@ -501,6 +539,7 @@
mongoTemplate.insert(pointLocation);
houseResource.setCode(pointLocation.getId());
houseResource.setAuthStatus(2);
+ houseResource.setAuthTime(new Date());
this.baseMapper.updateById(houseResource);
InputStream inputStream = null;
OutputStream outputStream = null;
--
Gitblit v1.7.1