From eba7ff322d676102b70058b26cfcffefdc22b53e Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 30 四月 2024 16:28:42 +0800
Subject: [PATCH] 更新线上bug

---
 guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/HouseResourceService.java |   34 +++++++++++++++-------------------
 1 files changed, 15 insertions(+), 19 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 3d683c2..1a3baf9 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
@@ -134,24 +134,6 @@
             }
             // 根据用户历史搜索 推荐对应的区域
         }
-//        if(StringUtils.hasLength(req.getDistrict())){
-//            cityIds = new ArrayList<>();
-//            districtIds = new ArrayList<>();
-//            JSONArray jsonArray = JSON.parseArray(req.getDistrict());
-//            for (int i = 0; i < jsonArray.size(); i++) {
-//                JSONObject jsonObject = jsonArray.getJSONObject(i);
-//                Integer cityId = jsonObject.getInteger("cityId");
-//                Integer districtId = jsonObject.getInteger("districtId");
-//                //不限区域
-//                if(0 == districtId || null == districtId){
-//                    List<Region> regions = regionService.selectList(new EntityWrapper<Region>().eq("parent_id", cityId));
-//                    districtIds.addAll(regions.stream().map(Region::getId).collect(Collectors.toList()));
-//                }
-//                cityIds.add(cityId);
-//                districtIds.add(districtId);
-//            }
-//        }
-
         //价格范围
         Double saleAmountStart = null;
         Double saleAmountEnd = null;
@@ -185,7 +167,6 @@
         }
         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()))
@@ -404,6 +385,9 @@
             SearchHouseResourceListRes searchHouseResourceListRes = new SearchHouseResourceListRes();
             searchHouseResourceListRes.setId(resource.getId());
             AppUser appUser = appUserService.selectById(resource.getAppUserId());
+            if (appUser==null){
+                continue;
+            }
             searchHouseResourceListRes.setHouseResource(appUser.getUserType());
             if(StringUtils.hasLength(resource.getHousePhoto())){
                 searchHouseResourceListRes.setImgUrl(resource.getHousePhoto().split(",")[0]);
@@ -713,6 +697,18 @@
             }
             return ResultUtil.success(3-size);
         }
+        if (appUser.getUserType()==1){
+            // 最多只能发布三条房源信息
+            int size = this.baseMapper.selectList(new EntityWrapper<HouseResource>()
+                    .eq("app_user_id", appUser.getId())
+                    .eq("is_delete", 0)
+                    .eq("type",2)
+            ).size();
+            if (3-size<0){
+                return ResultUtil.success(0);
+            }
+            return ResultUtil.success(3-size);
+        }
         if (appUser.getUserType()==3){
             // 如果是中介 判断他是否认证成功
             if (appUser.getAuth()==2){

--
Gitblit v1.7.1