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

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

                 record.setInvalidReason(raiseRecord.getInvalidReason());
                 record.setUpdateDate(LocalDateTime.now());
                 record.setStatus(0);
+
+                // 更新房源认筹热度
+                iTaRaiseRecordService.updateForSubtractRaiseHeat(record.getRaiseRecordId());
+
                 //发送订阅消息
                 iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"在线选房认筹通知","认筹单已作废","点击详情查看认筹单","具体原因查看详情",false);
             });
                 }
                 record.setStatus(CommConstant.STATUS_DELETE);
                 record.setUpdateDate(LocalDateTime.now());
+
+                // 更新房源认筹热度
+                iTaRaiseRecordService.updateForSubtractRaiseHeat(record.getRaiseRecordId());
+
                 //发送订阅消息
                 iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"在线选房认筹通知","认筹单已作废","点击详情查看认筹单","具体原因查看详情",false);
             });

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

 
     /**
      * 减少认筹热度值
-     * @param houseId
+     * @param raiseRecordId
      * @return
      */
-    Boolean updateForSubtractRaiseHeat(@Param("houseId") Integer houseId);
+    Boolean updateForSubtractRaiseHeat(@Param("raiseRecordId") Integer raiseRecordId);
 
     /**
      * 根据房源ID获取房源详情

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

      */
     ResponseBean batchDeletePreselectRecord(List<TaPreselectionRecord> preselectionRecordList, Integer orgId, Integer userId);
 
-    Boolean updateForSubtractRaiseHeat(Integer houseId);
-
 }

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

      * 发送认筹消息
      */
     void sendRaiseMsg(Integer raiseRecordId, String personId, String title, String result, String reason,String remark, Boolean isSuccess);
+
+    Boolean updateForSubtractRaiseHeat(Integer raiseRecordId);
 }

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

             resourcesPO.setRaiseBtn(false);
         } else {
             //有认筹表的情况下判断是否认筹过这个房源
-            boolean raiseBtnStatus = checkRaiseBtn(taRaise,salesBatchId,personId,houseId,orgId);
+            boolean raiseBtnStatus = checkRaiseBtn(taRaise, salesBatchId, personId, houseId, orgId);
             resourcesPO.setTaRaise(taRaise);
         }
 
 
     /**
      * 校验认筹状态的按钮
+     *
      * @param taRaise
      * @param salesBatchId
      * @param personId
      * @return
      */
     private boolean checkRaiseBtn(TaRaise taRaise, Integer salesBatchId, String personId, Integer houseId, Integer orgId) {
-        if (taRaise.getStatus() != CommConstant.STATUS_NORMAL){
+        if (taRaise.getStatus() != CommConstant.STATUS_NORMAL) {
             return false;
         }
-        if (taRaise.getNeedPreselection()){
+        if (taRaise.getNeedPreselection()) {
             //查看是否有当前房源的预选记录
             QueryWrapper<TaPreselectionRecord> preselectionRecordQueryWrapper = new QueryWrapper<>();
-            preselectionRecordQueryWrapper.eq("sales_batch_id",salesBatchId);
-            preselectionRecordQueryWrapper.eq("building_id",taRaise.getBuildingId());
-            preselectionRecordQueryWrapper.eq("org_id",orgId);
-            preselectionRecordQueryWrapper.eq("house_id",houseId);
-            preselectionRecordQueryWrapper.eq("person_id",personId);
+            preselectionRecordQueryWrapper.eq("sales_batch_id", salesBatchId);
+            preselectionRecordQueryWrapper.eq("building_id", taRaise.getBuildingId());
+            preselectionRecordQueryWrapper.eq("org_id", orgId);
+            preselectionRecordQueryWrapper.eq("house_id", houseId);
+            preselectionRecordQueryWrapper.eq("person_id", personId);
             TaPreselectionRecord taPreselectionRecord = taPreselectionRecordMapper.selectOne(preselectionRecordQueryWrapper);
-            if (null == taPreselectionRecord){
+            if (null == taPreselectionRecord) {
                 return false;
             }
         }
         LocalDateTime raiseStartTime = taRaise.getRaiseStartTime();
         LocalDateTime raiseEndTime = taRaise.getRaiseEndTime();
         LocalDateTime now = LocalDateTime.now();
-        if (now.isBefore(raiseStartTime) || now.isAfter(raiseEndTime)){
+        if (now.isBefore(raiseStartTime) || now.isAfter(raiseEndTime)) {
             return false;
         }
         //销售批次校验
         TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(salesBatchId);
-        if (taSalesBatch.getStatus() != CommConstant.STATUS_NORMAL){
+        if (taSalesBatch.getStatus() != CommConstant.STATUS_NORMAL) {
             return false;
         }
 
         //房源信息
         TaHousingResources taHousingResources = taHousingResourcesMapper.selectById(houseId);
-        if (taHousingResources.getStatus() != CommConstant.STATUS_NORMAL || CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(taHousingResources.getHouseLockingStatus())){
+        if (taHousingResources.getStatus() != CommConstant.STATUS_NORMAL || CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(taHousingResources.getHouseLockingStatus())) {
             return false;
         }
 
         //查询我的认筹记录表
         QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
-        taRaiseHouseQueryWrapper.eq("org_id",orgId);
-        taRaiseHouseQueryWrapper.eq("house_id",houseId);
-        taRaiseHouseQueryWrapper.eq("person_id",personId);
+        taRaiseHouseQueryWrapper.eq("org_id", orgId);
+        taRaiseHouseQueryWrapper.eq("house_id", houseId);
+        taRaiseHouseQueryWrapper.eq("person_id", personId);
         List<TaRaiseHouse> list = taRaiseHouseService.list(taRaiseHouseQueryWrapper);
-        if (list.size() > 0){
+        if (list.size() > 0) {
             return false;
         }
 
         }
 
         // 更新销售批次里的房源数
-        taSalesBatchMapper.addSalesNumberById(taHousingResources.getSalesBatchId(),taHousingResources.getOrgId());
+        taSalesBatchMapper.addSalesNumberById(taHousingResources.getSalesBatchId(), taHousingResources.getOrgId());
 
         // 获取楼盘名称
         TaBuilding taBuilding = taBuildingMapper.selectById(taHousingResources.getBuildingId());
         personQueryWrapper.eq("person_id", personId);
         TaPerson person = taPersonService.getOne(personQueryWrapper);
         if (person == null) {
-            responseBean.addError("权限不足");
+            logger.info("updateLockingStatus 用户未找到");
+            responseBean.addError("fail");
             return responseBean;
         }
 
         // 更新为锁定状态
         if ("lock".equals(type)) {
 
-            // 校验当前用户是否有修改权限
-            if (StringUtils.isEmpty(po.getLockingPersonId()) && !"locked".equals(po.getHouseLockingStatus())) {
+            // 校验当前房源状态
+            if (!"locked".equals(po.getHouseLockingStatus())) {
                 // 更行房源表状态
                 TaHousingResources housingResources = new TaHousingResources();
                 housingResources.setHouseId(po.getHouseId());
                 housingResources.setHouseLockingStatus("locked");
+                housingResources.setHouseLockingPerson(personId);
                 housingResources.setUpdateUser(person.getUserId());
                 housingResources.setUpdateDate(LocalDateTime.now());
                 updateById(housingResources);
                 responseBean.addSuccess(taRaiseHouseService.updateById(raiseHouse));
                 return responseBean;
             }
-            responseBean.addError("权限不足");
+            responseBean.addError("当前房源已为锁定状态");
             return responseBean;
         }
 
         // 更新为解锁状态
         if ("unlock".equals(type)) {
 
-            // 校验当前用户是否有修改权限
-            if (personId.equals(po.getLockingPersonId()) && "locked".equals(po.getHouseLockingStatus())) {
+            // 校验当前房源状态
+            if ("locked".equals(po.getHouseLockingStatus())) {
                 // 更新房源表状态
                 TaHousingResources housingResources = new TaHousingResources();
                 housingResources.setHouseId(po.getHouseId());
                 housingResources.setHouseLockingStatus("unlocked");
+                housingResources.setHouseLockingPerson("");
                 housingResources.setUpdateUser(person.getUserId());
                 housingResources.setUpdateDate(LocalDateTime.now());
                 updateById(housingResources);
                 responseBean.addSuccess(taRaiseHouseService.updateById(raiseHouse));
                 return responseBean;
             }
-            responseBean.addError("权限不足");
+            responseBean.addError("当前房源已为解锁状态");
             return responseBean;
         }
         responseBean.addError("fail");

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

         return responseBean;
     }
 
-    @Override
-    public Boolean updateForSubtractRaiseHeat(Integer houseId) {
-        return taHousingResourcesMapper.updateForSubtractRaiseHeat(houseId);
-    }
-
     /**
      * 发送订阅消息
      *

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

             logger.info("sendSubscribeMsg 结束");
         });
     }
+
+    @Override
+    public Boolean updateForSubtractRaiseHeat(Integer raiseRecordId) {
+        return taHousingResourcesMapper.updateForSubtractRaiseHeat(raiseRecordId);
+    }
 }

src/main/resources/mapper/TaHousingResourcesMapper.xml

 
     <update id="updateForSubtractRaiseHeat" parameterType="java.lang.Integer">
         UPDATE ta_housing_resources t
-        SET t.raise_real_heat = IFNULL(t.raise_real_heat, 0) - 1
+        SET t.raise_real_heat = IFNULL( t.raise_real_heat, 0 ) - 1
         WHERE
-            t.house_id = #{houseId}
+            t.house_id IN ( SELECT tr.house_id FROM ta_raise_house tr WHERE tr.raise_record_id = #{raiseRecordId})
             AND t.raise_real_heat > 0
     </update>
 

src/main/resources/mapper/TaPreselectionRecordMapper.xml

 <mapper namespace="com.huiju.estateagents.mapper.TaPreselectionRecordMapper">
 
     <select id="listPreselectionRecord" resultType="com.huiju.estateagents.po.TaPreselectionRecordPO">
-        SELECT
-            t3.*,
-            t4.building_name,
-            t5.`status` saleBatchStatus
-        FROM
-            (
         SELECT
             t.*,
             t2.term_name,
             t2.apartment_id,
             t2.building_id buildingId,
             t2.`status` housingStatus,
-            t2.sales_batch_id saleBatchId
+            t3.`status` saleBatchStatus
         FROM
-            ta_preselection_record t,
-            ta_housing_resources t2
+            ta_preselection_record t
+        LEFT JOIN ta_housing_resources t2 ON t.house_id = t2.house_id
+        LEFT JOIN ta_sales_batch t3 ON t.sales_batch_id = t3.sales_batch_id
         WHERE
             t.person_id = #{personId}
             AND t.org_id = #{orgId}
-            AND t.house_id = t2.house_id
-            <if test="buildingId != null and buildingId != ''">
-                AND t2.building_id = #{buildingId}
-            </if>
-            <if test="salesBatchId != null and salesBatchId != ''">
-                AND t2.sales_batch_id = #{salesBatchId}
-            </if>
-            <if test="apartmentId != null and apartmentId != ''">
-                AND t2.apartment_id = #{apartmentId}
-            </if>
-            <if test="houseLockingStatus == 'locked'">
-                AND t2.house_locking_status = 'locked'
-            </if>
-            <if test="houseLockingStatus == 'unlocked'">
-                AND ( t2.house_locking_status != 'locked' OR t2.house_locking_status IS NULL )
-            </if>
-            ) t3
-            LEFT JOIN ta_building t4 ON t3.buildingId = t4.building_id
-            LEFT JOIN ta_sales_batch t5 ON t3.saleBatchId = t5.sales_batch_id
-            left join ta_raise_house t6 on t3.house_id = t6.house_id
-        where 1=1
-            <if test="customerLocked == 'mine'">
-                AND t6.person_id = #{personId}
-            </if>
-            <if test="customerLocked == 'other'">
-                AND t6.person_id != #{personId}
-            </if>
-          GROUP BY
-            t3.preselection_record_id
-         ORDER BY
-            t3.create_date DESC
-
+        <if test="customerLocked == 'mine'">
+            AND t2.house_locking_person = #{personId}
+        </if>
+        <if test="customerLocked == 'other'">
+            AND t2.house_locking_person != #{personId}
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            AND t2.building_id = #{buildingId}
+        </if>
+        <if test="salesBatchId != null and salesBatchId != ''">
+            AND t2.sales_batch_id = #{salesBatchId}
+        </if>
+        <if test="apartmentId != null and apartmentId != ''">
+            AND t2.apartment_id = #{apartmentId}
+        </if>
+        <if test="houseLockingStatus == 'locked'">
+            AND t2.house_locking_status = 'locked'
+        </if>
+        <if test="houseLockingStatus == 'unlocked'">
+            AND ( t2.house_locking_status != 'locked' OR t2.house_locking_status IS NULL )
+        </if>
+        GROUP BY
+         t.preselection_record_id
+        ORDER BY
+          t.create_date DESC
     </select>
 
     <select id="getRecordByPersonIdAndHouseId" resultType="com.huiju.estateagents.entity.TaPreselectionRecord">