合并

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

@@ -89,11 +89,6 @@ public class TpRentalHouse {
      */
     private String mattress;
 
-    /**
-     * 衣柜 1 有
-     */
-    private String wardrobe;
-
     /**
      * 餐桌
      */
@@ -129,10 +124,6 @@ public class TpRentalHouse {
      */
     private String smartLock;
 
-    /**
-     * 热水器 1 有
-     */
-    private String waterHeater;
 
     /**
      * 空调

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

@@ -105,6 +105,19 @@ public class TpShop {
      */
     private List<TpShopType> tpShopTypeList;
 
+    /**
+     * 商铺首页图
+     */
+    private String tpShopImgUrl;
+
+    public String getTpShopImgUrl() {
+        return tpShopImgUrl;
+    }
+
+    public void setTpShopImgUrl(String tpShopImgUrl) {
+        this.tpShopImgUrl = tpShopImgUrl;
+    }
+
     public List<TpShopType> getTpShopTypeList() {
         return tpShopTypeList;
     }

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

@@ -89,7 +89,8 @@ public class TpShopServicelmpl implements TpShopServicel {
             for (TpShop tpShop : tpShopList) {
                 // 1 表示查询当前首页图片
                 List<TpShopImg> tpShopImgList = tpShopImgMapper.selectShopIdCommunity(userElement.getCommunityId(), tpShop.getId(), 1);
-                tpShop.setTpShopImgList(tpShopImgList);
+               TpShopImg tpShopImg= tpShopImgList.get(0);
+                tpShop.setTpShopImgUrl(tpShopImg.getImgUrl());
             }
             // 查询当前商铺类型
             tpShopTypeList = tpShopTypeMapper.selectCommunityIdShop(userElement.getCommunityId());

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

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