Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

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

@@ -167,15 +167,14 @@ public class TaPreselectionRecordController extends BaseController {
     /**
      * 取消房源预选
      *
-     * @param personId 用户ID
      * @return
      */
     @RequestMapping(value = "/wx/taPreselectionRecordCancel", method = RequestMethod.DELETE)
-    public ResponseBean taPreselectionRecordCancel(@RequestParam("personId") String personId,
-                                                   @RequestParam("houseId") String houseId) {
+    public ResponseBean taPreselectionRecordCancel(@RequestParam("houseId") String houseId,
+                                                   @RequestParam("preselectionRecordId") String preselectionRecordId) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaPreselectionRecordService.taPreselectionRecordCancel(personId, houseId);
+            responseBean = iTaPreselectionRecordService.taPreselectionRecordCancel( houseId, preselectionRecordId);
         } catch (Exception e) {
             logger.error("taPreselectionRecordCancel -=- {}", e);
             responseBean.addError(e.getMessage());

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

@@ -38,20 +38,11 @@ public interface ITaPreselectionRecordService extends IService<TaPreselectionRec
     /**
      * 取消预选
      *
-     * @param personId 用户ID
-     * @param houseId  房源ID
+     * @param houseId     房源ID
+     * @param preselectionRecordId 预选表ID
      * @return
      */
-    ResponseBean taPreselectionRecordCancel(String personId, String houseId);
-
-    /**
-     * 校验用户是否预选
-     *
-     * @param personId 用户ID
-     * @param houseId  房源ID
-     * @return
-     */
-    TaPreselectionRecord checkPreselect(String personId, String houseId);
+    ResponseBean taPreselectionRecordCancel(String houseId, String preselectionRecordId);
 
     ResponseBean selectPreSelectRecordList(Integer pageNum, Integer pageSize, String salesBatchId, Integer houseId, Integer orgId, String phone, String apartmentId, Integer status);
 

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

@@ -161,7 +161,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
 
         // 获取该用户是否预选房源信息
         TaPreselectionRecord taPreselectionRecord = taPreselectionRecordMapper.getRecordByPersonIdAndHouseId(personId, houseId);
-        if (taPreselectionRecord != null && taPreselectionRecord.getStatus() == 1) {
+        if (taPreselectionRecord != null) {
             resourcesPO.setIsPreselect(true);
         } else {
             resourcesPO.setIsPreselect(false);

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

@@ -99,7 +99,7 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
         // 校验用户是否已经预选房源
         TaPreselectionRecord record = taPreselectionRecordMapper
                 .getRecordByPersonIdAndHouseId(taPreselectionRecord.getPersonId(), taPreselectionRecord.getHouseId());
-        if (record != null && 1 == record.getStatus()) {
+        if (record != null) {
             responseBean.addError("已预选过此房源，请到选房记录中查看。");
             return responseBean;
         }
@@ -146,12 +146,12 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
 
     @Override
     @Transactional
-    public ResponseBean taPreselectionRecordCancel(String personId, String houseId) {
-        logger.info("taPreselectionRecordCancel 接收参数：personId：{}，houseId：{}", personId, houseId);
+    public ResponseBean taPreselectionRecordCancel(String houseId, String preselectionRecordId) {
+        logger.info("taPreselectionRecordCancel 接收参数：houseId：{}，preselectionRecordId：{}", houseId, preselectionRecordId);
 
         ResponseBean responseBean = new ResponseBean<>();
         // 校验是否已经取消
-        TaPreselectionRecord preselectionRecord = taPreselectionRecordMapper.getRecordByPersonIdAndHouseId(personId, houseId);
+        TaPreselectionRecord preselectionRecord = getById(preselectionRecordId);
         if (preselectionRecord == null || 1 != preselectionRecord.getStatus()) {
             responseBean.addError("未预选过此房源，或已取消预选此房源");
             return responseBean;
@@ -181,13 +181,6 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
         return responseBean;
     }
 
-    @Override
-    public TaPreselectionRecord checkPreselect(String personId, String houseId) {
-        logger.info("checkPreselect 接收参数：personId：{}，houseId：{}", personId, houseId);
-
-        return taPreselectionRecordMapper.getRecordByPersonIdAndHouseId(personId, houseId);
-    }
-
     @Override
     public ResponseBean selectPreSelectRecordList(Integer pageNum, Integer pageSize, String salesBatchId, Integer houseId, Integer orgId, String phone, String apartmentId, Integer status) {
         Page page = new Page(pageNum, pageSize);

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -57,11 +57,11 @@
             AND t.`status` > 0
           ) t5
         ORDER BY
-            REPLACE ( CONVERT ( t5.termName USING ascii ), '?', '' ) + 0,
-            REPLACE ( CONVERT ( t5.block_name USING ascii ), '?', '' ) + 0,
-            REPLACE ( CONVERT ( t5.unit_name USING ascii ), '?', '' ) + 0,
-            REPLACE ( CONVERT ( t5.floor_name USING ascii ), '?', '' ) + 0 desc ,
-            REPLACE ( CONVERT ( t5.room_name USING ascii ), '?', '' ) + 0
+            REPLACE ( CONVERT ( t5.termName USING ascii ), '?', '' ) ,
+            REPLACE ( CONVERT ( t5.block_name USING ascii ), '?', '' ) ,
+            REPLACE ( CONVERT ( t5.unit_name USING ascii ), '?', '' ) ,
+            REPLACE ( CONVERT ( t5.floor_name USING ascii ), '?', '' ) desc ,
+            REPLACE ( CONVERT ( t5.room_name USING ascii ), '?', '' )
     </select>
 
     <select id="listBuildApartmentBySalesBatchId" resultType="com.huiju.estateagents.entity.TaBuildingApartment">

src/main/resources/mapper/TaPreselectionRecordMapper.xml

@@ -47,6 +47,7 @@
         WHERE
             t.person_id = #{personId}
             AND t.house_id = #{houseId}
+            AND t.status = 1
     </select>
 
     <select id="selectPreSelectRecordList" resultType="com.huiju.estateagents.po.TaPreselectionRecordPO">