傅行帆 5 vuotta sitten
vanhempi
commit
9f326e8212

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaHousingResourcesController.java Näytä tiedosto

410
             }
410
             }
411
             responseBean.addError("当前房源已下架");
411
             responseBean.addError("当前房源已下架");
412
         } catch (Exception e) {
412
         } catch (Exception e) {
413
-            logger.error("getHousingDetailById -=- {}", e);
414
-            responseBean.addError(e.getMessage());
413
+            logger.error("根据房源ID获取房源详情 -=- {}", e);
414
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_ILLEGAL_PARAMS);
415
         }
415
         }
416
         return responseBean;
416
         return responseBean;
417
     }
417
     }

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaHousingResourcesService.java Näytä tiedosto

57
      * @param houseId  房源ID
57
      * @param houseId  房源ID
58
      * @return
58
      * @return
59
      */
59
      */
60
-    TaHousingResourcesPO getHousingDetailById(String personId, Integer houseId);
60
+    TaHousingResourcesPO getHousingDetailById(String personId, Integer houseId) throws Exception;
61
 
61
 
62
     /**
62
     /**
63
      * 校验楼栋信息存不存在
63
      * 校验楼栋信息存不存在

+ 19
- 1
src/main/java/com/huiju/estateagents/service/impl/TaHousingResourcesServiceImpl.java Näytä tiedosto

14
 import com.huiju.estateagents.po.BuildingImgPO;
14
 import com.huiju.estateagents.po.BuildingImgPO;
15
 import com.huiju.estateagents.po.TaHousingResourcesPO;
15
 import com.huiju.estateagents.po.TaHousingResourcesPO;
16
 import com.huiju.estateagents.service.ITaHousingResourcesService;
16
 import com.huiju.estateagents.service.ITaHousingResourcesService;
17
+import com.huiju.estateagents.service.ITaRaiseInviteService;
17
 import org.apache.commons.collections.CollectionUtils;
18
 import org.apache.commons.collections.CollectionUtils;
18
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
19
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
19
 import org.apache.poi.ss.usermodel.Row;
20
 import org.apache.poi.ss.usermodel.Row;
102
     @Autowired
103
     @Autowired
103
     private TaUserServiceImpl taUserService;
104
     private TaUserServiceImpl taUserService;
104
 
105
 
106
+    @Autowired
107
+    private ITaRaiseInviteService iTaRaiseInviteService;
108
+
105
     /**
109
     /**
106
      * 分页获取房源列表
110
      * 分页获取房源列表
107
      *
111
      *
197
      * @return
201
      * @return
198
      */
202
      */
199
     @Override
203
     @Override
200
-    public TaHousingResourcesPO getHousingDetailById(String personId, Integer houseId) {
204
+    public TaHousingResourcesPO getHousingDetailById(String personId, Integer houseId) throws Exception {
201
         logger.info("getHousingDetailById 接收参数:personId:{},houseId:{}", personId, houseId);
205
         logger.info("getHousingDetailById 接收参数:personId:{},houseId:{}", personId, houseId);
202
 
206
 
203
         // 查询房源详情
207
         // 查询房源详情
287
             resourcesPO.setTaRaise(taRaise);
291
             resourcesPO.setTaRaise(taRaise);
288
         }
292
         }
289
 
293
 
294
+        // 查询批次下认筹是否开启邀请制
295
+        TaPerson person = taPersonService.getById(personId);
296
+        if (null != taRaise && CommConstant.STATUS_NORMAL == taRaise.getInvite()) {
297
+            // 若开启邀请制,校验该用户是否在邀请列表中
298
+            QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
299
+            taRaiseInviteQueryWrapper.eq("org_id", orgId);
300
+            taRaiseInviteQueryWrapper.eq("invite_tel", person.getPhone());
301
+            taRaiseInviteQueryWrapper.eq("sales_batch_id", salesBatchId);
302
+            TaRaiseInvite taRaiseInvite = iTaRaiseInviteService.getOne(taRaiseInviteQueryWrapper);
303
+            if (null == taRaiseInvite) {
304
+                throw new Exception("仅限被邀请用户查看房源");
305
+            }
306
+        }
307
+
290
         return resourcesPO;
308
         return resourcesPO;
291
     }
309
     }
292
 
310