* 添加预选房源接口代码优化

src/main/java/com/huiju/estateagents/common/DateUtils.java

@@ -30,11 +30,22 @@ public class DateUtils {
 
     public static LocalDateTime day2LocalDateime(String day) {
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        return LocalDateTime.parse(day + " 00:00:00",df);
+        return LocalDateTime.parse(day + " 00:00:00", df);
     }
 
     public static LocalDateTime dayToLocalDateime(String day) {
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        return LocalDateTime.parse(day,df);
+        return LocalDateTime.parse(day, df);
+    }
+
+    public static boolean checkTimeRange(LocalDateTime start, LocalDateTime end, LocalDateTime dt) {
+        if(dt == null){
+            dt = LocalDateTime.now();
+        }
+
+        if(dt.isAfter(start) && dt.isBefore(end)){
+            return true;
+        }
+        return false;
     }
 }

src/main/java/com/huiju/estateagents/controller/TaHousingResourcesController.java

@@ -13,8 +13,8 @@ import javax.servlet.http.HttpServletRequest;
 
 /**
  * <p>
-    * 房源表  前端控制器
-    * </p>
+ * 房源表  前端控制器
+ * </p>
  *
  * @author jobob
  * @since 2020-02-10
@@ -31,22 +31,26 @@ public class TaHousingResourcesController extends BaseController {
 
     /**
      * 分页查询列表
-     * @param pageNum
+     *
+     * @param salesBatchId
+     * @param buildingId
+     * @param pageNumber
      * @param pageSize
+     * @param request
      * @return
      */
-    @RequestMapping(value="/admin/taHousingResources",method= RequestMethod.GET)
-    public ResponseBean taHousingResourcesList(@RequestParam(value = "salesBatchId",required = true) Integer salesBatchId,
-                                               @RequestParam(value = "buildingId",required = true) String buildingId,
-                                               @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                               @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                               HttpServletRequest request){
+    @RequestMapping(value = "/admin/taHousingResources", method = RequestMethod.GET)
+    public ResponseBean taHousingResourcesList(@RequestParam(value = "salesBatchId", required = true) Integer salesBatchId,
+                                               @RequestParam(value = "buildingId", required = true) String buildingId,
+                                               @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                               @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                               HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaHousingResourcesService.selectPageList(salesBatchId, buildingId,pageNumber,pageSize,getOrgId(request));
-        }catch (Exception e){
+            responseBean = iTaHousingResourcesService.selectPageList(salesBatchId, buildingId, pageNumber, pageSize, getOrgId(request));
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taHousingResourcesList -=- {}",e.toString());
+            logger.error("taHousingResourcesList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -54,21 +58,22 @@ public class TaHousingResourcesController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taHousingResources 实体对象
      * @return
      */
-    @RequestMapping(value="/taHousingResources",method= RequestMethod.POST)
-    public ResponseBean taHousingResourcesAdd(@RequestBody TaHousingResources taHousingResources){
+    @RequestMapping(value = "/taHousingResources", method = RequestMethod.POST)
+    public ResponseBean taHousingResourcesAdd(@RequestBody TaHousingResources taHousingResources) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaHousingResourcesService.save(taHousingResources)){
+            if (iTaHousingResourcesService.save(taHousingResources)) {
                 responseBean.addSuccess(taHousingResources);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taHousingResourcesAdd -=- {}",e.toString());
+            logger.error("taHousingResourcesAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -76,21 +81,22 @@ public class TaHousingResourcesController extends BaseController {
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taHousingResources/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taHousingResourcesDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/taHousingResources/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taHousingResourcesDelete(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaHousingResourcesService.removeById(id)){
+            if (iTaHousingResourcesService.removeById(id)) {
                 responseBean.addSuccess("success");
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taHousingResourcesDelete -=- {}",e.toString());
+            logger.error("taHousingResourcesDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -98,23 +104,24 @@ public class TaHousingResourcesController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id                 实体ID
      * @param taHousingResources 实体对象
      * @return
      */
-    @RequestMapping(value="/taHousingResources/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/taHousingResources/{id}", method = RequestMethod.PUT)
     public ResponseBean taHousingResourcesUpdate(@PathVariable Integer id,
-                                                 @RequestBody TaHousingResources taHousingResources){
+                                                 @RequestBody TaHousingResources taHousingResources) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaHousingResourcesService.updateById(taHousingResources)){
+            if (iTaHousingResourcesService.updateById(taHousingResources)) {
                 responseBean.addSuccess(taHousingResources);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taHousingResourcesUpdate -=- {}",e.toString());
+            logger.error("taHousingResourcesUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -122,16 +129,17 @@ public class TaHousingResourcesController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/taHousingResources/{id}",method= RequestMethod.GET)
-    public ResponseBean taHousingResourcesGet(@PathVariable Integer id){
+    @RequestMapping(value = "/taHousingResources/{id}", method = RequestMethod.GET)
+    public ResponseBean taHousingResourcesGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTaHousingResourcesService.getById(id));
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taHousingResourcesDelete -=- {}",e.toString());
+            logger.error("taHousingResourcesDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -185,10 +193,11 @@ public class TaHousingResourcesController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/wx/getHousingDetailById", method = RequestMethod.POST)
-    public ResponseBean getHousingDetailById(@RequestParam(value = "houseId") String houseId) {
+    public ResponseBean getHousingDetailById(@RequestParam(value = "houseId") String houseId,
+                                             @RequestParam(value = "personId") String personId) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaHousingResourcesService.getHousingDetailById(houseId));
+            responseBean.addSuccess(iTaHousingResourcesService.getHousingDetailById(personId, houseId));
         } catch (Exception e) {
             logger.error("getHousingDetailById -=- {}", e);
             responseBean.addError(e.getMessage());

src/main/java/com/huiju/estateagents/controller/TaPreselectionRecordController.java

@@ -82,20 +82,9 @@ public class TaPreselectionRecordController extends BaseController {
                 return responseBean;
             }
 
-            // 校验用户是否已经预选房源
-            TaPreselectionRecord record = iTaPreselectionRecordService
-                    .checkPreselect(taPreselectionRecord.getPersonId(), taPreselectionRecord.getHouseId());
-            if (record != null) {
-                logger.info("taPreselectionRecordAdd 用户已经预选该房源");
-                responseBean.addError("您已经预选过该房源");
-                return responseBean;
-            }
+            responseBean = iTaPreselectionRecordService.taPreselectionRecordAdd(taPreselectionRecord);
+            logger.info("taPreselectionRecordAdd 返回结果，responseBean：{}", JSONObject.toJSONString(responseBean));
 
-            if (iTaPreselectionRecordService.save(taPreselectionRecord)) {
-                responseBean.addSuccess(taPreselectionRecord);
-            } else {
-                responseBean.addError("fail");
-            }
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taPreselectionRecordAdd -=- {}", e.toString());

src/main/java/com/huiju/estateagents/mapper/TaHousingResourcesMapper.java

@@ -49,6 +49,7 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
 
     /**
      * 增加热度值
+     *
      * @param houseId
      * @return
      */
@@ -56,6 +57,7 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
 
     /**
      * 减少热度值
+     *
      * @param houseId
      * @return
      */
@@ -65,7 +67,9 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
      * 根据房源ID获取房源详情
      *
      * @param houseId
+     * @param type    是否只查询已发布数据，1是 0否
      * @return
      */
-    TaHousingResourcesPO getHousingDetailById(String houseId);
+    TaHousingResourcesPO getHousingDetailById(@Param("houseId") String houseId,
+                                              @Param("type") String type);
 }

src/main/java/com/huiju/estateagents/po/TaHousingResourcesPO.java

@@ -1,10 +1,13 @@
 package com.huiju.estateagents.po;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.huiju.estateagents.entity.TaHousingResources;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.time.LocalDateTime;
+
 /**
  * @Auther: gusy
  * @Date: 2020/2/11 14:26
@@ -13,7 +16,34 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 public class TaHousingResourcesPO extends TaHousingResources {
+
+    /**
+     * 户型名称
+     */
+    private String apartmentName;
+
     private Double insideArea;
 
     private Double buildingArea;
+
+    /**
+     * 是否预选已经预选，1 是 0 否
+     */
+    @TableField(exist = false)
+    private Boolean isPreselect;
+
+    /**
+     * 预选开始时间
+     */
+    private LocalDateTime preselectionStartTime;
+
+    /**
+     * 预选结束时间
+     */
+    private LocalDateTime preselectionEndTime;
+
+    /**
+     * 销售批次状态
+     */
+    private Integer saleBatchStatus;
 }

src/main/java/com/huiju/estateagents/service/ITaHousingResourcesService.java

@@ -53,8 +53,9 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
     /**
      * 根据房源ID获取房源详情
      *
+     * @param personId
      * @param houseId
      * @return
      */
-    TaHousingResourcesPO getHousingDetailById(String houseId);
+    TaHousingResourcesPO getHousingDetailById(String personId,String houseId);
 }

src/main/java/com/huiju/estateagents/service/ITaPreselectionRecordService.java

@@ -2,6 +2,7 @@ package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPreselectionRecord;
 import com.huiju.estateagents.po.TaPreselectionRecordPO;
 
@@ -31,7 +32,7 @@ public interface ITaPreselectionRecordService extends IService<TaPreselectionRec
      * @param taPreselectionRecord
      * @return
      */
-    Boolean taPreselectionRecordAdd(TaPreselectionRecord taPreselectionRecord);
+    ResponseBean taPreselectionRecordAdd(TaPreselectionRecord taPreselectionRecord);
 
     /**
      * 取消预选

src/main/java/com/huiju/estateagents/service/impl/TaHousingResourcesServiceImpl.java

@@ -34,6 +34,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
 
     @Autowired
     private TaHousingResourcesMapper taHousingResourcesMapper;
+
     /**
      * 分页获取房源详情数据
      *
@@ -50,9 +51,9 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
         IPage<TaHousingResources> pg = new Page<>(pageNumber, pageSize);
         QueryWrapper<TaHousingResources> queryWrapper = new QueryWrapper<>();
         //销售批次id
-        queryWrapper.eq("sales_batch_id",salesBatchId);
-        queryWrapper.eq("building_id",buildingId);
-        queryWrapper.eq("org_id",orgId);
+        queryWrapper.eq("sales_batch_id", salesBatchId);
+        queryWrapper.eq("building_id", buildingId);
+        queryWrapper.eq("org_id", orgId);
         queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
         queryWrapper.orderByDesc("create_date");
         IPage<TaHousingResources> list = this.page(pg, queryWrapper);
@@ -96,13 +97,14 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
     /**
      * 根据房源ID获取房源详情
      *
+     * @param personId
      * @param houseId
      * @return
      */
     @Override
-    public TaHousingResourcesPO getHousingDetailById(String houseId) {
-        logger.info("getHousingDetailById 接收参数：houseId：{}", houseId);
+    public TaHousingResourcesPO getHousingDetailById(String personId, String houseId) {
+        logger.info("getHousingDetailById 接收参数：personId：{}，houseId：{}", personId, houseId);
 
-        return taHousingResourcesMapper.getHousingDetailById(houseId);
+        return taHousingResourcesMapper.getHousingDetailById(houseId, "1");
     }
 }

src/main/java/com/huiju/estateagents/service/impl/TaPreselectionRecordServiceImpl.java

@@ -4,10 +4,12 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.entity.TaPreselectionRecord;
 import com.huiju.estateagents.mapper.TaHousingResourcesMapper;
 import com.huiju.estateagents.mapper.TaPreselectionRecordMapper;
+import com.huiju.estateagents.po.TaHousingResourcesPO;
 import com.huiju.estateagents.po.TaPreselectionRecordPO;
 import com.huiju.estateagents.service.ITaPreselectionRecordService;
 import org.slf4j.Logger;
@@ -47,16 +49,56 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
 
     @Override
     @Transactional
-    public Boolean taPreselectionRecordAdd(TaPreselectionRecord taPreselectionRecord) {
+    public ResponseBean taPreselectionRecordAdd(TaPreselectionRecord taPreselectionRecord) {
         logger.info("listPreselectionRecord 接收参数：taPreselectionRecord:{}", JSONObject.toJSONString(taPreselectionRecord));
 
+        ResponseBean responseBean = new ResponseBean();
+
+        // 校验用户是否已经预选房源
+        TaPreselectionRecord record = taPreselectionRecordMapper
+                .getRecordByPersonIdAndHouseId(taPreselectionRecord.getPersonId(), taPreselectionRecord.getHouseId());
+        if (record != null) {
+            responseBean.addError("您已经预选过该房源");
+            return responseBean;
+        }
+
+        TaHousingResourcesPO resourcesPO = taHousingResourcesMapper.getHousingDetailById(taPreselectionRecord.getHouseId(), "0");
+        if (resourcesPO == null) {
+            responseBean.addError("fail");
+            return responseBean;
+        }
+
+        // 校验当前批次状态是否为已发布
+        if (resourcesPO.getSaleBatchStatus() != 1) {
+            responseBean.addError("当前销售批次已临时取消发布，请稍后再试或联系置业顾问了解详情。");
+            return responseBean;
+        }
+
+        // 校验当前房源状态是否为已发布
+        if (!"1".equals(resourcesPO.getStatus())) {
+            responseBean.addError("当前房源已临时取消发布，请稍后再试或联系置业顾问了解详情。");
+            return responseBean;
+        }
+
+        // 校验预选操作时间是否在规定范围内
+        if (DateUtils.checkTimeRange(resourcesPO.getPreselectionStartTime(), resourcesPO.getPreselectionEndTime(), null)) {
+            responseBean.addError("当前时间不在预选时间范围内，请联系置业顾问了解详情。");
+            return responseBean;
+        }
+
         // 添加预选记录
         taPreselectionRecord.setStatus(1);
         taPreselectionRecord.setCreateDate(LocalDateTime.now());
         save(taPreselectionRecord);
 
         // 更新房源表热度
-        return taHousingResourcesMapper.updateForAddHeat(taPreselectionRecord.getHouseId());
+        Boolean result = taHousingResourcesMapper.updateForAddHeat(taPreselectionRecord.getHouseId());
+        if (result) {
+            responseBean.addSuccess(taPreselectionRecord);
+            return responseBean;
+        }
+        responseBean.addError("fail");
+        return responseBean;
     }
 
     @Override

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -4,40 +4,40 @@
 
     <select id="listHousingResources" resultType="com.huiju.estateagents.po.TaHousingResourcesPO">
         SELECT
-            t.house_id,
-            t.building_id,
-            t.block_id,
-            t.block_name,
-            t.sales_batch_id,
-            t.unit_id,
-            t.unit_name,
-            t.floor_id,
-            t.floor_name,
-            t.room_id,
-            t.room_name,
-            t.price,
-            t.heat,
-            t.apartment_id,
-            t.`status`,
-            t.org_id,
-            t2.inside_area,
-            t2.building_area
+        t.house_id,
+        t.building_id,
+        t.block_id,
+        t.block_name,
+        t.sales_batch_id,
+        t.unit_id,
+        t.unit_name,
+        t.floor_id,
+        t.floor_name,
+        t.room_id,
+        t.room_name,
+        t.price,
+        t.heat,
+        t.apartment_id,
+        t.`status`,
+        t.org_id,
+        t2.inside_area,
+        t2.building_area
         FROM
-            ta_housing_resources t,
-            ta_building_apartment t2
+        ta_housing_resources t,
+        ta_building_apartment t2
         WHERE
-            t.sales_batch_id = #{salesBatchId}
-            <if test="startPrice != null and startPrice != '' and endPrice != null and endPrice != ''">
-              AND ( t.price BETWEEN #{startPrice} AND #{endPrice} )
-            </if>
-            <if test="apartmentId != null and apartmentId != ''">
-              AND t.apartment_id = #{apartmentId}
-            </if>
-            AND t.apartment_id = t2.apartment_id
-            AND t.`status` = 1
-            AND t2.`status` = 1
+        t.sales_batch_id = #{salesBatchId}
+        <if test="startPrice != null and startPrice != '' and endPrice != null and endPrice != ''">
+            AND ( t.price BETWEEN #{startPrice} AND #{endPrice} )
+        </if>
+        <if test="apartmentId != null and apartmentId != ''">
+            AND t.apartment_id = #{apartmentId}
+        </if>
+        AND t.apartment_id = t2.apartment_id
+        AND t.`status` = 1
+        AND t2.`status` = 1
         ORDER BY
-            t.create_date DESC
+        t.create_date DESC
     </select>
 
     <select id="listBuildApartmentBySalesBatchId" resultType="com.huiju.estateagents.entity.TaBuildingApartment">
@@ -72,32 +72,41 @@
 
     <select id="getHousingDetailById" resultType="com.huiju.estateagents.po.TaHousingResourcesPO">
         SELECT
-            t.house_id,
-            t.building_id,
-            t.block_id,
-            t.block_name,
-            t.sales_batch_id,
-            t.unit_id,
-            t.unit_name,
-            t.floor_id,
-            t.floor_name,
-            t.room_id,
-            t.room_name,
-            t.price,
-            t.heat,
-            t.apartment_id,
-            t.`status`,
-            t.org_id,
-            t2.inside_area,
-            t2.building_area
+        t.house_id,
+        t.building_id,
+        t.block_id,
+        t.block_name,
+        t.sales_batch_id,
+        t.unit_id,
+        t.unit_name,
+        t.floor_id,
+        t.floor_name,
+        t.room_id,
+        t.room_name,
+        t.price,
+        t.heat,
+        t.apartment_id,
+        t.`status`,
+        t.org_id,
+        t2.apartment_name,
+        t2.inside_area,
+        t2.building_area,
+        t3.preselection_start_time,
+        t3.preselection_end_time,
+        t3.`status` saleBatchStatus
         FROM
-            ta_housing_resources t,
-            ta_building_apartment t2
+        ta_housing_resources t,
+        ta_building_apartment t2,
+        ta_sales_batch t3
         WHERE
-            t.house_id = #{houseId}
-            AND t.apartment_id = t2.apartment_id
+        t.house_id = #{houseId}
+        AND t.apartment_id = t2.apartment_id
+        AND t.sales_batch_id = t3.sales_batch_id
+        <if test="type != null and type == '1' ">
             AND t.`status` = 1
-            AND t2.`status` = 1
+            AND t3.`status` = 1
+        </if>
+        AND t2.`status` = 1
     </select>
 
 </mapper>