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

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

@@ -82,6 +82,13 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
      */
     Boolean updateForSubtractHeat(@Param("houseId") Integer houseId);
 
+    /**
+     * 减少认筹热度值
+     * @param houseId
+     * @return
+     */
+    Boolean updateForSubtractRaiseHeat(@Param("houseId") Integer houseId);
+
     /**
      * 根据房源ID获取房源详情
      *
@@ -133,7 +140,7 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
                                  @Param("orgId") Integer orgId);
 
     /**
-     * 批量更新房源认筹基础认读
+     * 批量更新房源认筹基础热度
      *
      * @param housingResourcesList
      * @param heat

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

@@ -59,4 +59,6 @@ public interface ITaPreselectionRecordService extends IService<TaPreselectionRec
      */
     ResponseBean batchDeletePreselectRecord(List<TaPreselectionRecord> preselectionRecordList, Integer orgId, Integer userId);
 
+    Boolean updateForSubtractRaiseHeat(Integer houseId);
+
 }

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

@@ -240,11 +240,21 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
     public ResponseBean batchDeletePreselectRecord(List<TaPreselectionRecord> preselectionRecordList, Integer orgId, Integer userId) {
         ResponseBean responseBean = new ResponseBean();
 
+        // 更新房源表热度信息
+        for (TaPreselectionRecord tp : preselectionRecordList) {
+            taHousingResourcesMapper.updateForSubtractHeat(tp.getHouseId());
+        }
+
         taPreselectionRecordMapper.batchDeletePreselectRecord(preselectionRecordList, orgId, userId);
         responseBean.addSuccess("success");
         return responseBean;
     }
 
+    @Override
+    public Boolean updateForSubtractRaiseHeat(Integer houseId) {
+        return taHousingResourcesMapper.updateForSubtractRaiseHeat(houseId);
+    }
+
     /**
      * 发送订阅消息
      *

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -230,6 +230,14 @@
             AND t.real_heat > 0
     </update>
 
+    <update id="updateForSubtractRaiseHeat" parameterType="java.lang.Integer">
+        UPDATE ta_housing_resources t
+        SET t.raise_real_heat = IFNULL(t.raise_real_heat, 0) - 1
+        WHERE
+            t.house_id = #{houseId}
+            AND t.raise_real_heat > 0
+    </update>
+
     <select id="getHousingDetailById" resultType="com.huiju.estateagents.po.TaHousingResourcesPO">
         SELECT
         t.house_id,
@@ -257,6 +265,7 @@
         t3.preselection_start_time,
         t3.preselection_end_time,
         t3.`status` saleBatchStatus,
+        t3.display_house_price,
         t4.building_name buildingName
         FROM
         ta_housing_resources t

src/main/resources/mapper/TaPreselectionRecordMapper.xml

@@ -55,7 +55,7 @@
                 AND t6.person_id != #{personId}
             </if>
           GROUP BY
-            t6.house_id
+            t6.preselection_record_id
          ORDER BY
             t3.create_date DESC