合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpRentalHouseMapper.java

      * @param priceFluctuate
      * @return
      */
-    List<TpRentalHouse> getRentalHouse(String houseName, Integer rentalType, Integer houseType, Integer rentalPrice, Integer priceFluctuate);
+    List<TpRentalHouse> getRentalHouse(String houseName, Integer rentalType, Integer houseType, Integer rentalPrice, Integer priceFluctuate,Integer communityId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpRentalHouse.java

      */
     private String wardrobe;
 
+    /**
+     * 床垫 1 有
+     */
+    private String mattress;
+
+    /**
+     * 衣柜 1 有
+     */
+    private String wardrobe;
+
     /**
      * 餐桌
      */
      * 洗衣机
      */
     private String washingMachine;
+    /**
+     * 冰箱 1 有
+     */
+    private String fridge;
+    /**
+     * 电视 1有
+     */
+    private String tv;
+
+    /**
+     * 智能锁 1有
+     */
+    private String smartLock;
+
+    /**
+     * 热水器 1 有
+     */
+    private String waterHeater;
 
     /**
      * 空调

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TpRentalHouseServicelImpl.java

         Map<String, Object> parameter = Maps.newHashMap();
         //使用分页插件
         Page<TpRentalHouse> pageTpRentalHouseList = PageHelper.startPage(pageNum, pageSize);
-        List<TpRentalHouse> tpRentalHouseList= tpRentalHouseMapper.getRentalHouse(houseName,rentalType,houseType,rentalPrice,priceFluctuate);
+        List<TpRentalHouse> tpRentalHouseList= tpRentalHouseMapper.getRentalHouse(houseName,rentalType,houseType,rentalPrice,priceFluctuate,userElement.getCommunityId());
             // 把字符串转数组
         for (TpRentalHouse tpRentalHouse:tpRentalHouseList){
             String [] result = tpRentalHouse.getHouseLabel().split(",");

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TpShopServicelmpl.java

             // 查询当前商铺类型
             tpShopTypeList = tpShopTypeMapper.selectCommunityIdShop(userElement.getCommunityId());
            for (TpShopType tpShopType:tpShopTypeList){
-               int a=tpShopType.getId().intValue();
+               int a=tpShopType.getSort().intValue();
              if (a == 1){
                  //美食图片
                  List<String> tpShopTypeImg = new ArrayList<>();

CODE/smart-community/app-api/src/main/resources/mapper/TpRentalHouseMapper.xml

     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="create_user" property="createUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+
+    <result column="mattress" property="mattress" jdbcType="VARCHAR" />
+    <result column="wardrobe" property="wardrobe" jdbcType="INTEGER" />
+    <result column="update_user" property="updateUser" jdbcType="INTEGER" />
+    <result column="update_user" property="updateUser" jdbcType="INTEGER" />
+    <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
   </resultMap>
   <resultMap id="ResultMapWithBLOBs" type="com.community.huiju.model.TpRentalHouse" extends="BaseResultMap" >
       <if test="priceFluctuate == 2" >
         and  order by rh.rental_price  desc
       </if>
+        and community_id = #{communityId}
         and rh.house_status = 1
     </where>
   </select>