合并

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

@@ -23,7 +23,14 @@ public interface TpShopTypeMapper {
     int updateByPrimaryKey(TpShopType record);
 
     /**
-     * 获取当前小区的所有类型商铺
+     * 获取当前小区首页所有类型商铺
      */
     List<TpShopType> selectCommunityIdShop(@Param("communityId") Integer communityId);
+
+    /**
+     *获取小区所有店铺
+     * @param communityId
+     * @return
+     */
+    List<TpShopType> selectCommunityIdShopAll(@Param("communityId") Integer communityId);
 }

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

@@ -60,7 +60,7 @@ public class TpHotelServiceimpl implements TpHotelServicel {
     public ResponseBean getHotelCommunity(UserElement userElement) {
         ResponseBean response= new ResponseBean<>();
         // 查询当前的酒店是否展示
-        TpHotel tpHotel = null;
+        TpHotel tpHotel = new TpHotel();
         String img = null;
         String  hotelSetting= tpHotelMapper.hotelSetting(userElement.getCommunityId());
         if (null != hotelSetting){

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

@@ -55,7 +55,7 @@ public class TpShopServicelmpl implements TpShopServicel {
                 }
             }
         }
-        List<TpShopType> tpShopTypeList = tpShopTypeMapper.selectCommunityIdShop(userElement.getCommunityId());
+        List<TpShopType> tpShopTypeList = tpShopTypeMapper.selectCommunityIdShopAll(userElement.getCommunityId());
         parameter.put("total", pageShopList.getTotal());
         parameter.put("list", tpShopList);
         parameter.put("tpShopTypeList",tpShopTypeList);

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

@@ -186,7 +186,7 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
 
-  <select id="selectHotelRoomList" resultType="com.community.huiju.model.TpHotelRoom">
+  <select id="selectHotelRoomList" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
     from tp_hotel_room

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

@@ -265,7 +265,7 @@
     from tp_shop
     <where>
       <if test="houseName != null and houseName != ''" >
-        shop_name = #{houseName,jdbcType=INTEGER}
+         shop_name like concat('%',#{houseName},'%')
       </if>
       <if test="tpShopTypeId != null and tpShopTypeId != ''" >
        and shop_type_id = #{tpShopTypeId,jdbcType=INTEGER}

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

@@ -120,4 +120,10 @@
     from  tp_shop_type where community_id = #{communityId,jdbcType=INTEGER} and source = 'sys'
   </select>
 
+  <select id="selectCommunityIdShopAll" resultMap="BaseResultMap">
+    select
+    *
+    from  tp_shop_type where community_id = #{communityId,jdbcType=INTEGER}
+  </select>
+
 </mapper>