* 批量删除/作废认筹单时，如果房源为锁定则改为未锁定状态

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

@@ -213,7 +213,6 @@ public class TaRaiseRecordController extends BaseController {
 
             // 获取用户信息
             TaUser taUser = taUserService.getUserInfoById(getUserId(request), getOrgId(request));
-
             raiseRecord.getTaRaiseRecords().stream().forEach(record -> {
                 if (taUser != null) {
                     record.setUpdateUserName(taUser.getUserName());
@@ -225,7 +224,13 @@ public class TaRaiseRecordController extends BaseController {
                 // 更新房源认筹热度
                 iTaRaiseRecordService.updateForSubtractRaiseHeat(record.getRaiseRecordId());
 
-                //发送订阅消息
+                // 如果房源状态为已锁定，则修改房源锁定状态
+                if (CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(record.getHouseLockingStatus())) {
+                    record.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
+                    iTaRaiseRecordService.updateHouseLockingStatus(record.getRaiseRecordId(), CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
+                }
+
+                // 发送订阅消息
                 iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(), record.getRaiseId(), "认筹通知", "认筹单已作废", "点击详情查看认筹单", "具体原因查看详情", false);
             });
 
@@ -272,7 +277,13 @@ public class TaRaiseRecordController extends BaseController {
                 // 更新房源认筹热度
                 iTaRaiseRecordService.updateForSubtractRaiseHeat(record.getRaiseRecordId());
 
-                //发送订阅消息
+                // 如果房源状态为已锁定，则修改房源锁定状态
+                if (CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(record.getHouseLockingStatus())) {
+                    record.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
+                    iTaRaiseRecordService.updateHouseLockingStatus(record.getRaiseRecordId(), CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
+                }
+
+                // 发送订阅消息
                 iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(), record.getRaiseId(), "认筹通知", "认筹单已作废", "点击详情查看认筹单", "具体原因查看详情", false);
             });
 
@@ -744,6 +755,7 @@ public class TaRaiseRecordController extends BaseController {
             taRaiseRecordQueryWrapper.eq(StringUtils.isNotEmpty(buildingId), "building_id", buildingId);
             taRaiseRecordQueryWrapper.eq(null != salesBatchId, "sales_batch_id", salesBatchId);
             taRaiseRecordQueryWrapper.eq(StringUtils.isNotEmpty(houseLockingStatus), "house_locking_status", houseLockingStatus);
+            taRaiseRecordQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
             taRaiseRecordQueryWrapper.orderByDesc("create_date");
             IPage<TaRaiseRecord> page = iTaRaiseRecordService.page(pg, taRaiseRecordQueryWrapper);
             List<TaRaiseRecord> list = page.getRecords();

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

@@ -89,6 +89,16 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
      */
     Boolean updateForSubtractRaiseHeat(@Param("raiseRecordId") Integer raiseRecordId);
 
+    /**
+     * 更新房源锁定状态
+     *
+     * @param raiseRecordId
+     * @param houseLockingStatus
+     * @return
+     */
+    Boolean updateHouseLockingStatus(@Param("raiseRecordId") Integer raiseRecordId,
+                                     @Param("houseLockingStatus") String houseLockingStatus);
+
     /**
      * 根据房源ID获取房源详情
      *

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

@@ -84,7 +84,22 @@ public interface ITaRaiseRecordService extends IService<TaRaiseRecord> {
     /**
      * 发送认筹消息
      */
-    void sendRaiseMsg(Integer raiseRecordId, String personId, String title, String result, String reason,String remark, Boolean isSuccess);
+    void sendRaiseMsg(Integer raiseRecordId, String personId, String title, String result, String reason, String remark, Boolean isSuccess);
 
+    /**
+     * 减少房源表认筹实际热度值
+     *
+     * @param raiseRecordId
+     * @return
+     */
     Boolean updateForSubtractRaiseHeat(Integer raiseRecordId);
+
+    /**
+     * 更新房源锁定状态
+     *
+     * @param raiseRecordId
+     * @param houseLockingStatus
+     * @return
+     */
+    Boolean updateHouseLockingStatus(Integer raiseRecordId, String houseLockingStatus);
 }

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

@@ -311,6 +311,13 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
 
     @Override
     public Boolean updateForSubtractRaiseHeat(Integer raiseRecordId) {
+        logger.info("TaRaiseRecordServiceImpl.updateForSubtractRaiseHeat 接收参数:raiseRecordId:{}", raiseRecordId);
         return taHousingResourcesMapper.updateForSubtractRaiseHeat(raiseRecordId);
     }
+
+    @Override
+    public Boolean updateHouseLockingStatus(Integer raiseRecordId, String houseLockingStatus) {
+        logger.info("TaRaiseRecordServiceImpl.updateHouseLockingStatus 接收参数:raiseRecordId:{},houseLockingStatus:{}", raiseRecordId, houseLockingStatus);
+        return taHousingResourcesMapper.updateHouseLockingStatus(raiseRecordId, houseLockingStatus);
+    }
 }

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -214,6 +214,14 @@
             AND t.raise_real_heat > 0
     </update>
 
+    <update id="updateHouseLockingStatus">
+        UPDATE ta_housing_resources t
+        SET t.house_locking_status = #{houseLockingStatus},
+            t.update_date = now()
+        WHERE
+            t.house_id IN ( SELECT tr.house_id FROM ta_raise_house tr WHERE tr.raise_record_id = #{raiseRecordId})
+    </update>
+
     <select id="getHousingDetailById" resultType="com.huiju.estateagents.po.TaHousingResourcesPO">
         SELECT
         t.house_id,