Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/TpHotelController.java

     private TpHotelServicel tpHotelServicel;
 
 
-    @ApiOperation(value = "获取所有酒店", notes = "获取所有酒店")
+    @ApiOperation(value = "获取本小区酒店", notes = "获取本小区酒店")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/hotel",method = RequestMethod.GET)
     public Object getHotel(HttpSession session){

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/TpRentalHouseController.java

                                     @RequestParam(value = "rentalPriceValue",required = false) Integer rentalPriceValue,
                                     @RequestParam(value = "priceFluctuateValue",required = false) Integer priceFluctuateValue,
                                  @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                                 @RequestParam(value = "pageSize", defaultValue = "3") Integer pageSize){
+                                 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize){
         UserElement userElement = getUserElement(session);
         ResponseBean responseBean = tpRentalHouseServicel.getRentalHouse(userElement,houseName,rentalTypeValue,houseTypeValue,rentalPriceValue,priceFluctuateValue,pageNum,pageSize);
         return responseBean;

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/TpShopController.java

             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "shopName",value = "搜所名称"),
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "tpShopTypeId",value = "商铺类型"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")
     })
     @RequestMapping(value = "/shop",method = RequestMethod.GET)
     public Object getShop(HttpSession session,
                           @RequestParam(value = "shopName",required = false ) String houseName,
-                          @RequestParam(value = "tpShopTypeId",required = false ) Integer tpShopTypeId){
+                          @RequestParam(value = "tpShopTypeId",required = false ) Integer tpShopTypeId,
+                          @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize){
         UserElement userElement = getUserElement(session);
-        ResponseBean responseBean = tpShopServicel.getShop(userElement,houseName,tpShopTypeId);
+        ResponseBean responseBean = tpShopServicel.getShop(userElement,houseName,tpShopTypeId,pageNum,pageSize);
         return responseBean;
     }
 

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

+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpHotelRoom;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface TpHotelRoomMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpHotelRoom record);
+
+    int insertSelective(TpHotelRoom record);
+
+    TpHotelRoom selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpHotelRoom record);
+
+    int updateByPrimaryKey(TpHotelRoom record);
+
+    /**
+     * 获取当前所有房间
+     * @return
+     */
+    List<TpHotelRoom> selectHotelRoomList(@Param("communityId") Integer communityId,@Param("hotelId") Integer hotelId);
+}

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

 package com.community.huiju.model;
 
 import java.util.Date;
+import java.util.List;
 
 public class TpHotel {
     private Integer id;
      */
     private String hotelIntroduction;
 
+    /**
+     * 房间
+     * @return
+     */
+    private List<TpHotelRoom> tpHotelRoomsList;
+
+    public void setTpHotelRoomsList(List<TpHotelRoom> tpHotelRoomsList) {
+        this.tpHotelRoomsList = tpHotelRoomsList;
+    }
+
+    public List<TpHotelRoom> getTpHotelRoomsList() {
+        return tpHotelRoomsList;
+    }
+
     public Integer getId() {
         return id;
     }

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

+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpHotelRoom {
+
+    private Integer id;
+
+    /**
+     * 小区ID
+     */
+    private Integer communityId;
+
+    /**
+     * 酒店ID
+      */
+    private Integer hotelId;
+
+    /**
+     * 房间编号
+     */
+    private String roomNo;
+
+    /**
+     * 房间名称
+     */
+    private String roomName;
+
+    /**
+     * 排序（权重）
+     */
+    private Integer sort;
+
+    /**
+     * 房间价格
+     */
+    private String price;
+
+    /**
+     * 上架状态 1 是已上架 2是已下架
+     */
+    private String roomStatus;
+
+    /**
+     * 房间备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private Date createDate;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 更新时间
+     */
+    private Date updateDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getHotelId() {
+        return hotelId;
+    }
+
+    public void setHotelId(Integer hotelId) {
+        this.hotelId = hotelId;
+    }
+
+    public String getRoomNo() {
+        return roomNo;
+    }
+
+    public void setRoomNo(String roomNo) {
+        this.roomNo = roomNo == null ? null : roomNo.trim();
+    }
+
+    public String getRoomName() {
+        return roomName;
+    }
+
+    public void setRoomName(String roomName) {
+        this.roomName = roomName == null ? null : roomName.trim();
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    public String getPrice() {
+        return price;
+    }
+
+    public void setPrice(String price) {
+        this.price = price == null ? null : price.trim();
+    }
+
+    public String getRoomStatus() {
+        return roomStatus;
+    }
+
+    public void setRoomStatus(String roomStatus) {
+        this.roomStatus = roomStatus == null ? null : roomStatus.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+}

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

      * @param userElement
      * @return
      */
-    ResponseBean getShop(UserElement userElement,String houseName,Integer tpShopTypeId);
+    ResponseBean getShop(UserElement userElement,String houseName,Integer tpShopTypeId,Integer pageNum,Integer pageSize);
 
     /**
      * 获取线下商铺详情

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

 import com.community.commom.session.UserElement;
 import com.community.huiju.dao.TpHotelImgMapper;
 import com.community.huiju.dao.TpHotelMapper;
+import com.community.huiju.dao.TpHotelRoomMapper;
 import com.community.huiju.model.TpHotel;
 import com.community.huiju.model.TpHotelImg;
+import com.community.huiju.model.TpHotelRoom;
 import com.community.huiju.service.TpHotelServicel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
     @Autowired
     private TpHotelImgMapper tpHotelImgMapper;
 
+    @Autowired
+    private TpHotelRoomMapper tpHotelRoomMapper;
+
     @Override
     public ResponseBean getHotel(UserElement userElement) {
        ResponseBean responseBean= new ResponseBean<>();
         // 每个小区只有一个酒店
         TpHotel tpHotel= tpHotelMapper.selectCommunityHotel(userElement.getCommunityId());
         if (null != tpHotel) {
+            // 获取当前酒店所有房间
+            List<TpHotelRoom> tpHotelRoom = tpHotelRoomMapper.selectHotelRoomList(userElement.getCommunityId(),tpHotel.getId());
+            tpHotel.setTpHotelRoomsList(tpHotelRoom);
             // 查询当前酒店所有的banner图
             List<String> img = tpHotelImgMapper.selectHotelImg(tpHotel.getId(), userElement.getCommunityId());
             Map map = new HashMap<>();

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

 import com.community.commom.session.UserElement;
 import com.community.huiju.dao.TpRentalHouseImgMapper;
 import com.community.huiju.dao.TpRentalHouseMapper;
+import com.community.huiju.model.TpAnnouncement;
 import com.community.huiju.model.TpRentalHouse;
 import com.community.huiju.model.TpRentalHouseImg;
 import com.community.huiju.service.TpRentalHouseServicel;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.google.common.collect.Maps;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
     @Override
     public ResponseBean getRentalHouse(UserElement userElement, String houseName, Integer rentalType, Integer houseType, Integer rentalPrice, Integer priceFluctuate,Integer pageNum,Integer pageSize) {
         ResponseBean response= new ResponseBean<>();
-
+        Map<String, Object> parameter = Maps.newHashMap();
+        //使用分页插件
+        Page<TpRentalHouse> pageTpRentalHouseList = PageHelper.startPage(pageNum, pageSize);
         List<TpRentalHouse> tpRentalHouseList= tpRentalHouseMapper.getRentalHouse(houseName,rentalType,houseType,rentalPrice,priceFluctuate);
         for (TpRentalHouse tpRentalHouse:tpRentalHouseList){
             // 根据 tpRentalHouse.getId()和img_type为2查询列表图
                  }
              }
         }
-        response.addSuccess(tpRentalHouseList);
+        parameter.put("total", pageTpRentalHouseList.getTotal());
+        parameter.put("list", tpRentalHouseList);
+        response.addSuccess(parameter);
         return response;
     }
 

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

 import com.community.huiju.dao.TpShopImgMapper;
 import com.community.huiju.dao.TpShopMapper;
 import com.community.huiju.dao.TpShopTypeMapper;
+import com.community.huiju.model.TpAnnouncement;
 import com.community.huiju.model.TpShop;
 import com.community.huiju.model.TpShopImg;
 import com.community.huiju.model.TpShopType;
 import com.community.huiju.service.TpShopServicel;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.google.common.collect.Maps;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
     @Autowired
     private TpShopImgMapper tpShopImgMapper;
     @Override
-    public ResponseBean getShop(UserElement userElement,String houseName,Integer tpShopTypeId) {
+    public ResponseBean getShop(UserElement userElement,String houseName,Integer tpShopTypeId,Integer pageNum,Integer pageSize) {
         ResponseBean responseBean= new ResponseBean<>();
+        Map<String, Object> parameter = Maps.newHashMap();
+        //使用分页插件
+        Page<TpShop> pageShopList = PageHelper.startPage(pageNum, pageSize);
         List<TpShop> tpShopList= tpShopMapper.selectcommunityIdShop(userElement.getCommunityId(),houseName,tpShopTypeId);
         if (null != tpShopList) {
             for (TpShop tpShop : tpShopList) {
             }
         }
         List<TpShopType> tpShopTypeList = tpShopTypeMapper.selectCommunityIdShop(userElement.getCommunityId());
-        Map map= new HashMap<>();
-        map.put("tpShopTypeList",tpShopTypeList);
-        map.put("tpShopList",tpShopList);
-        responseBean.addSuccess(map);
+        parameter.put("total", pageShopList.getTotal());
+        parameter.put("list", tpShopList);
+        parameter.put("tpShopTypeList",tpShopTypeList);
+        responseBean.addSuccess(parameter);
         return responseBean;
     }
 

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TpHotelRoomMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpHotelRoom" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="hotel_id" property="hotelId" jdbcType="INTEGER" />
+    <result column="room_no" property="roomNo" jdbcType="VARCHAR" />
+    <result column="room_name" property="roomName" jdbcType="VARCHAR" />
+    <result column="sort" property="sort" jdbcType="INTEGER" />
+    <result column="price" property="price" jdbcType="VARCHAR" />
+    <result column="room_status" property="roomStatus" jdbcType="VARCHAR" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+    <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="update_user" property="updateUser" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, hotel_id, room_no, room_name, sort, price, room_status, remark, 
+    create_date, create_user, update_date, update_user
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_hotel_room
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_hotel_room
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpHotelRoom" >
+    insert into tp_hotel_room (id, community_id, hotel_id, 
+      room_no, room_name, sort, 
+      price, room_status, remark, 
+      create_date, create_user, update_date, 
+      update_user)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{hotelId,jdbcType=INTEGER}, 
+      #{roomNo,jdbcType=VARCHAR}, #{roomName,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, 
+      #{price,jdbcType=VARCHAR}, #{roomStatus,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, 
+      #{createDate,jdbcType=TIMESTAMP}, #{createUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}, 
+      #{updateUser,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpHotelRoom" >
+    insert into tp_hotel_room
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="hotelId != null" >
+        hotel_id,
+      </if>
+      <if test="roomNo != null" >
+        room_no,
+      </if>
+      <if test="roomName != null" >
+        room_name,
+      </if>
+      <if test="sort != null" >
+        sort,
+      </if>
+      <if test="price != null" >
+        price,
+      </if>
+      <if test="roomStatus != null" >
+        room_status,
+      </if>
+      <if test="remark != null" >
+        remark,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="updateDate != null" >
+        update_date,
+      </if>
+      <if test="updateUser != null" >
+        update_user,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="hotelId != null" >
+        #{hotelId,jdbcType=INTEGER},
+      </if>
+      <if test="roomNo != null" >
+        #{roomNo,jdbcType=VARCHAR},
+      </if>
+      <if test="roomName != null" >
+        #{roomName,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null" >
+        #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="price != null" >
+        #{price,jdbcType=VARCHAR},
+      </if>
+      <if test="roomStatus != null" >
+        #{roomStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null" >
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpHotelRoom" >
+    update tp_hotel_room
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="hotelId != null" >
+        hotel_id = #{hotelId,jdbcType=INTEGER},
+      </if>
+      <if test="roomNo != null" >
+        room_no = #{roomNo,jdbcType=VARCHAR},
+      </if>
+      <if test="roomName != null" >
+        room_name = #{roomName,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null" >
+        sort = #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="price != null" >
+        price = #{price,jdbcType=VARCHAR},
+      </if>
+      <if test="roomStatus != null" >
+        room_status = #{roomStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null" >
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUser != null" >
+        create_user = #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        update_date = #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        update_user = #{updateUser,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpHotelRoom" >
+    update tp_hotel_room
+    set community_id = #{communityId,jdbcType=INTEGER},
+      hotel_id = #{hotelId,jdbcType=INTEGER},
+      room_no = #{roomNo,jdbcType=VARCHAR},
+      room_name = #{roomName,jdbcType=VARCHAR},
+      sort = #{sort,jdbcType=INTEGER},
+      price = #{price,jdbcType=VARCHAR},
+      room_status = #{roomStatus,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      create_user = #{createUser,jdbcType=INTEGER},
+      update_date = #{updateDate,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="selectHotelRoomList" resultType="com.community.huiju.model.TpHotelRoom">
+    select
+    <include refid="Base_Column_List" />
+    from tp_hotel_room
+    where  community_id = #{communityId,jdbcType=INTEGER}
+    and hotel_id = #{hotelId,jdbcType=INTEGER}
+    and room_status = 1
+  </select>
+</mapper>

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TpShopController.java

 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.common.base.BaseController;
+import com.community.huiju.model.TpShop;
+import com.community.huiju.model.TpShopType;
 import com.community.huiju.service.ITpShopService;
+import com.netflix.ribbon.proxy.annotation.Http;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpSession;
+import java.time.LocalDateTime;
 
 /**
  * <p>
 		responseBean = shopService.getShopList(id,shopName,shopTypeId,shopStatus,userElement,pageNum,pageSize);
 		return responseBean;
 	}
+	
+	@ApiOperation(value = "添加商铺", notes = "添加商铺")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "TpShop", name = "shop", value = "商铺"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/shop/add",method = RequestMethod.POST)
+	public ResponseBean saveShop(@RequestBody TpShop shop, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = shopService.saveShop(shop,userElement);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "获取商铺信息", notes = "获取商铺信息")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "id", value = "商铺Id"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/shop/get/{id}",method = RequestMethod.GET)
+	public ResponseBean getShop(@PathVariable Integer id, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		TpShop tpShop = shopService.getShopById(id);
+		responseBean.addSuccess(tpShop);
+		return responseBean;
+	}
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TpShopImgController.java

+package com.community.huiju.controller;
+
+
+import com.community.huiju.common.base.BaseController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 商铺图片 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@RestController
+@RequestMapping("/")
+public class TpShopImgController extends BaseController {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpShopImgMapper.java

+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TpShopImg;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 商铺图片 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+public interface TpShopImgMapper extends BaseMapper<TpShopImg> {
+	
+	int batchSave(List<TpShopImg> carouselList);
+}

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

 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
      */
     @TableField(exist = false)
     private String userName;
+    
+    /**
+     * 首页图片地址
+     */
+    @TableField(exist = false)
+    private String appIndexImg;
+    
+    /**
+     * app列表展示图
+     */
+    @TableField(exist = false)
+    private String appListImg;
+    
+    /**
+     * app商铺轮播图
+     */
+    @TableField(exist = false)
+    private List<String> appCarouselImg;
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpShopImg.java

+package com.community.huiju.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 商铺图片
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TpShopImg implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区ID
+     */
+    private Integer communityId;
+
+    /**
+     * 商铺ID
+     */
+    private Integer shopId;
+
+    /**
+     * 商铺图片地址
+     */
+    private String imgUrl;
+
+    /**
+     * 商铺图片类型 1是app首页图片每个商铺唯一，2是app列表图片,3是app商铺轮播图
+     */
+    private String imgType;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITpShopImgService.java

+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.TpShopImg;
+
+/**
+ * <p>
+ * 商铺图片 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+public interface ITpShopImgService extends IService<TpShopImg> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITpShopService.java

 	 * @return
 	 */
 	ResponseBean getShopList(Integer id, String shopName, Integer shopTypeId, String shopStatus, UserElement userElement, Integer pageNum, Integer pageSize);
+	
+	/**
+	 * 保存商铺
+	 * @param shop
+	 * @param userElement
+	 * @return
+	 */
+	ResponseBean saveShop(TpShop shop, UserElement userElement);
+	
+	/**
+	 * 获取商铺信息
+	 * @param id
+	 * @return
+	 */
+	TpShop getShopById(Integer id);
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpShopImgServiceImpl.java

+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.dao.TpShopImgMapper;
+import com.community.huiju.model.TpShopImg;
+import com.community.huiju.service.ITpShopImgService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 商铺图片 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@Service
+public class TpShopImgServiceImpl extends ServiceImpl<TpShopImgMapper, TpShopImg> implements ITpShopImgService {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpShopServiceImpl.java

 package com.community.huiju.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
+import com.community.huiju.dao.TpShopImgMapper;
 import com.community.huiju.dao.TpShopMapper;
 import com.community.huiju.model.TpShop;
+import com.community.huiju.model.TpShopImg;
 import com.community.huiju.service.ITpShopService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 	@Autowired
 	private TpShopMapper shopMapper;
 	
+	@Autowired
+	private TpShopImgMapper shopImgMapper;
+	
 	/**
 	 * 根据条件查询商铺列表
 	 *
 		responseBean.addSuccess(map);
 		return responseBean;
 	}
+	
+	/**
+	 * 保存商铺
+	 *
+	 * @param shop
+	 * @param userElement
+	 * @return
+	 */
+	@Override
+	public ResponseBean saveShop(TpShop shop, UserElement userElement) {
+		ResponseBean responseBean = new ResponseBean();
+		//添加商铺信息
+		Integer communityId = userElement.getCommunityId();
+		LocalDateTime localDateTime = LocalDateTime.now();
+		shop.setCommunityId(communityId);
+		shop.setCreateUser(userElement.getId());
+		shop.setUpdateDate(localDateTime);
+		shopMapper.insert(shop);
+		//添加商铺app首页图片信息
+		TpShopImg appIndexShopImg = new TpShopImg();
+		appIndexShopImg.setCommunityId(communityId);
+		appIndexShopImg.setCreateDate(localDateTime);
+		appIndexShopImg.setImgType("1");
+		appIndexShopImg.setShopId(shop.getId());
+		appIndexShopImg.setImgUrl(shop.getAppIndexImg());
+		shopImgMapper.insert(appIndexShopImg);
+		//添加商铺app列表图片信息
+		TpShopImg appListShopImg = new TpShopImg();
+		appListShopImg.setCommunityId(communityId);
+		appListShopImg.setCreateDate(localDateTime);
+		appListShopImg.setImgType("2");
+		appListShopImg.setShopId(shop.getId());
+		appListShopImg.setImgUrl(shop.getAppListImg());
+		shopImgMapper.insert(appListShopImg);
+		//批量添加app轮播图片
+		List<String> list = shop.getAppCarouselImg();
+		List<TpShopImg> carouselList = new ArrayList<>();
+		list.stream().forEach(e -> {
+			TpShopImg appCarouselImg = new TpShopImg();
+			appCarouselImg.setCommunityId(communityId);
+			appCarouselImg.setCreateDate(localDateTime);
+			appCarouselImg.setImgType("3");
+			appCarouselImg.setShopId(shop.getId());
+			appCarouselImg.setImgUrl(e);
+			carouselList.add(appCarouselImg);
+		});
+		shopImgMapper.batchSave(carouselList);
+		responseBean.addSuccess("添加成功");
+		return responseBean;
+	}
+	
+	/**
+	 * 获取商铺信息
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public TpShop getShopById(Integer id) {
+		TpShop tpShop = shopMapper.selectById(id);
+		//获取商铺app首页图片信息
+		QueryWrapper<TpShopImg> tpShopImgQueryWrapper = new QueryWrapper<>();
+		tpShopImgQueryWrapper.eq("community_id",tpShop.getCommunityId());
+		tpShopImgQueryWrapper.eq("shop_id",tpShop.getId());
+		tpShopImgQueryWrapper.eq("img_type","1");
+		TpShopImg tpShopImg = shopImgMapper.selectOne(tpShopImgQueryWrapper);
+		tpShop.setAppIndexImg(tpShopImg.getImgUrl());
+		//获取商铺APP列表图片信息
+		QueryWrapper<TpShopImg> tpShopImgListWrapper = new QueryWrapper<>();
+		tpShopImgListWrapper.eq("community_id",tpShop.getCommunityId());
+		tpShopImgListWrapper.eq("shop_id",tpShop.getId());
+		tpShopImgListWrapper.eq("img_type","2");
+		TpShopImg listShopImg = shopImgMapper.selectOne(tpShopImgListWrapper);
+		tpShop.setAppListImg(listShopImg.getImgUrl());
+		//获取商铺轮播图列表
+		QueryWrapper<TpShopImg> tpShopImgCarouselWrapper = new QueryWrapper<>();
+		tpShopImgCarouselWrapper.eq("community_id",tpShop.getCommunityId());
+		tpShopImgCarouselWrapper.eq("shop_id",tpShop.getId());
+		tpShopImgCarouselWrapper.eq("img_type","3");
+		List<TpShopImg> carouselList = shopImgMapper.selectList(tpShopImgCarouselWrapper);
+		List<String> carouselUrlList = new ArrayList<>();
+		carouselList.stream().forEach(e -> {
+			carouselUrlList.add(e.getImgUrl());
+		});
+		tpShop.setAppCarouselImg(carouselUrlList);
+		return tpShop;
+	}
 }

CODE/smart-community/property-api/src/main/resources/mapper/TpShopImgMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.community.huiju.dao.TpShopImgMapper">
+
+    <insert id="batchSave" useGeneratedKeys="true" keyProperty="id" parameterType="java.util.ArrayList">
+        insert into tp_shop_img(community_id,shop_id,img_url,img_type,create_date)
+        VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{item.communityId},#{item.shopId},#{item.imgUrl},#{item.imgType},#{item.createDate})
+        </foreach>
+    </insert>
+
+</mapper>

VUECODE/smart-property-manage/index.html

     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <title>智慧社区物业平台</title>
-    <script src="//webapi.amap.com/maps?v=1.4.10&key=81f5560856a88eb5b3da440f18a97845&plugin=AMap.DistrictLayer"></script>
-    <script src="//webapi.amap.com/ui/1.0/main.js"></script>
   </head>
   <body>
     <div id="app"></div>

VUECODE/smart-property-manage/src/api/shopType.js

   })
 }
 
+export function addShop(listQuery) {
+  return request({
+    url: '/shop/add',
+    method: 'post',
+    data: listQuery
+  })
+}
+
 export function getShopType(id) {
   return request({
     url: '/shop/get/type/' + id,
   })
 }
 
+export function getShop(id) {
+  return request({
+    url: '/shop/get/' + id,
+    method: 'get'
+  })
+}
+
 export function updateShopType(listQuery) {
   return request({
     url: '/shop/update/type',

VUECODE/smart-property-manage/src/router/index.js

         component: () => import('@/views/shop/shopIndex'),
         name: 'shop-index',
         meta: { title: '商铺列表', icon: 'table' }
+      },
+      {
+        path: '/shop/add',
+        component: () => import('@/views/shop/shopAdd'),
+        name: 'shop-add',
+        hidden: true,
+        meta: { title: '添加商铺信息', icon: 'table' }
+      },
+      {
+        path: '/shop/edit',
+        component: () => import('@/views/shop/shopEdit'),
+        name: 'shop-edit',
+        hidden: true,
+        meta: { title: '修改商铺信息', icon: 'table' }
       }
     ]
   },

VUECODE/smart-property-manage/src/store/modules/shopType.js

-import { fetchShopTypeList, changeShopSetting, addShopType, getShopType, updateShopType, deleteShopType, fetchShopList, fetchShopTypeSelect } from '@/api/shopType'
+import { fetchShopTypeList, changeShopSetting, addShopType, getShopType, updateShopType, deleteShopType, fetchShopList, fetchShopTypeSelect, addShop, getShop } from '@/api/shopType'
 
 const transaction = {
   namespaced: true,
         })
       })
     },
+    AddShop({ commit }, listQuery) {
+      return new Promise((resolve, reject) => {
+        addShop(listQuery).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     GetShopType({ commit }, id) {
       return new Promise((resolve, reject) => {
         getShopType(id).then(response => {
         })
       })
     },
+    GetShop({ commit }, id) {
+      return new Promise((resolve, reject) => {
+        getShop(id).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     UpdateShopType({ commit }, listQuery) {
       return new Promise((resolve, reject) => {
         updateShopType(listQuery).then(response => {

VUECODE/smart-property-manage/src/views/shop/shopAdd.vue

+<template>
+  <div class="root">
+    <el-form ref="ruleForm" :model="listData" :rules="rules" label-width="150px" class="add-ruleForm">
+      <el-form-item label="商铺名称" prop="shopName">
+        <el-input v-model="listData.shopName"/>
+      </el-form-item>
+      <el-form-item label="商铺说明" prop="remark">
+        <el-input v-model="listData.remark"/>
+      </el-form-item>
+      <el-form-item label="app首页展示图" prop="appIndexImg">
+        <el-upload
+          class="avatar-uploader"
+          name="uploadFiles"
+          :action="uploadImgUrl"
+          :show-file-list="false"
+          :on-success="handleAppIndexSuccess"
+          :before-upload="beforeAvatarUpload">
+          <img v-if="listData.appIndexImg" :src="listData.appIndexImg" class="avatar">
+          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+      </el-form-item>
+      <el-form-item label="app列表展示图" prop="appListImg">
+        <el-upload
+          class="avatar-uploader"
+          name="uploadFiles"
+          :action="uploadImgUrl"
+          :show-file-list="false"
+          :on-success="handleAppListSuccess"
+          :before-upload="beforeAvatarUpload">
+          <img v-if="listData.appListImg" :src="listData.appListImg" class="avatar">
+          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+      </el-form-item>
+      <el-form-item label="app商铺轮播图" prop="appCarouselImg">
+        <el-upload
+          name="uploadFiles"
+          :limit="6"
+          :action="uploadImgUrl"
+          list-type="picture-card"
+          :on-preview="handlePictureCardPreview"
+          :on-remove="handleRemove"
+          :on-success="handleSuccessCarouselImg">
+          <i class="el-icon-plus"></i>
+        </el-upload>
+        <el-dialog :visible.sync="dialogVisible">
+          <img width="100%" :src="dialogImageUrl" alt="">
+        </el-dialog>
+      </el-form-item>
+      <el-form-item label="权重" prop="sort">
+        <el-input v-model="listData.sort"/>
+      </el-form-item>
+      <el-form-item label="商铺类型" prop="shopTypeId">
+        <el-select v-model="listData.shopTypeId" placeholder="商铺类型" clearable class="filter-item">
+          <el-option v-for="item in shopTypeList" :key="item.id" :value="item.id" :label="item.typeName"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="上架状态" prop="shopStatus">
+        <el-select v-model="listData.shopStatus" placeholder="请选择">
+          <el-option label="已上架" value="1"/>
+          <el-option label="已下架" value="2"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="联系电话" prop="shopTel">
+        <el-input v-model="listData.shopTel"/>
+      </el-form-item>
+      <el-form-item label="商铺地址" prop="shopAddress">
+        <el-input v-model="listData.shopAddress"/>
+      </el-form-item>
+      <el-form-item label="人均消费" prop="averagePrice">
+        <el-input v-model="listData.averagePrice"/>
+      </el-form-item>
+      <el-form-item label="高德坐标">
+        <el-input placeholder="经度" v-model="listData.shopLongitude" style="width: 150px;" />
+        <el-input placeholder="纬度" v-model="listData.shopLatitude" style="width: 150px;" />
+      </el-form-item>
+      <el-form-item label="">
+         <!-- 地图 -->
+        <div style="width:100%;height:300px;" class="amap-page-container">
+          <el-amap-search-box :search-option="searchOption" :on-search-result="onSearchResult" class="search-box"/>
+          <el-amap ref="map" :events="events" :center="mapCenter" :zoom="12" class="amap-demo" vid="amapDemo">
+            <el-amap-marker v-for="(item,index) in markers" :key="index" :position="item" />
+          </el-amap>
+        </div>
+      </el-form-item>
+      <el-form-item label="商铺介绍">
+          <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/> -->
+          <div id="father">
+            <wangeditor @wangeditorEvent="wangeditorValue"/>
+          </div>
+        </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm('ruleForm')">立即创建</el-button>
+        <el-button @click="resetForm('ruleForm')">重置</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
+import Wangeditor from '@/components/Wangeditor'
+
+export default {
+  components: { Pagination, Wangeditor },
+  data() {
+    return {
+      events: {
+        click: e => {
+          // _self.postData.Coordinate = e.lnglat.lat + ',' + e.lnglat.lng
+          this.listData.shopLongitude = e.lnglat.lng
+          this.listData.shopLatitude = e.lnglat.lat
+        }
+      },
+      listData: {
+        shopName: '',
+        remark: '',
+        appIndexImg: '',
+        appListImg: '',
+        appCarouselImg: [],
+        sort: '',
+        shopTypeId: '',
+        shopStatus: '',
+        shopTel: '',
+        shopAddress: '',
+        averagePrice: '',
+        shopLongitude: '',
+        shopLatitude: '',
+        shopIntroduction: ''
+      },
+      dialogImageUrl: '',
+      dialogVisible: false,
+      uploadImgUrl: process.env.BASE_API + '/uploadimage',
+      markers: [],
+      shopTypeList: [],
+      searchOption: {
+        city: '南京',
+        citylimit: false
+      },
+      mapCenter: [118.789509, 32.019989],
+      tableKey: 0,
+      rules: {
+        typeName: [
+          { required: true, message: '请输入商铺名称', trigger: 'blur' }
+        ],
+        remark: [
+          { required: true, message: '请输入商铺说明', trigger: 'blur' }
+        ],
+        shopTel: [
+          { required: true, message: '请输入联系电话', trigger: 'blur' }
+        ],
+        shopAddress: [
+          { required: true, message: '请输入商铺地址', trigger: 'blur' }
+        ],
+        appIndexImg: [
+          { required: true, message: 'app首页展示图', trigger: 'blur' }
+        ],
+        appListImg: [
+          { required: true, message: 'app列表展示图', trigger: 'blur' }
+        ],
+        appCarouselImg: [
+          { required: true, message: 'app商铺轮播图', trigger: 'blur' }
+        ],
+      }
+    }
+  },
+  mounted() {
+    this.getShopTypeList()
+  },
+  methods: {
+     addMarker() {
+      const lng = 121.5 + Math.round(Math.random() * 1000) / 10000
+      const lat = 31.197646 + Math.round(Math.random() * 500) / 10000
+      this.markers.push([lng, lat])
+    },
+    beforeAvatarUpload(file) {
+    },
+    handleAppIndexSuccess(res, file) {
+      this.listData.appIndexImg = res.data[0]
+    },
+    handleAppListSuccess(res, file) {
+      this.listData.appListImg = res.data[0]
+    },
+    handleRemove(file, fileList) {
+      this.listData.appCarouselImg = []
+      for (let i = 0; i < fileList.length; i++) {
+        this.listData.appCarouselImg.push(fileList[i].response.data[0])
+      }
+    },
+    handleSuccessCarouselImg(response, file, fileList) { // 活动配图上传成功时回调
+      const resImg = response.data[0]
+      this.listData.appCarouselImg.push(resImg)
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    getShopTypeList() {
+      this.$store.dispatch('shopType/FetchShopTypeSelect', this.listData).then((res) => {
+        this.shopTypeList = res.data
+      }).catch(() => {
+        console.log('error ListAnnouncement')
+      })
+    },
+    onSearchResult(pois) {
+      // 搜索地图
+      let latSum = 0
+      let lngSum = 0
+      if (pois.length > 0) {
+        pois.forEach(poi => {
+          const { lng, lat } = poi
+          lngSum += lng
+          latSum += lat
+          this.markers.push([poi.lng, poi.lat])
+        })
+        const center = {
+          lng: lngSum / pois.length,
+          lat: latSum / pois.length
+        }
+        this.mapCenter = [center.lng, center.lat]
+      }
+    },
+    wangeditorValue(value) {
+      this.listData.shopIntroduction = value // 在这里接受子组件传过来的参数，赋值给data里的参数
+    },
+    submitForm(formName) { // 提交
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.addShop()
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
+    resetForm(formName) { // 重置
+      // 重置为未注册
+      this.isRegistered = true
+      // 重置为非户主
+      this.roleDisabled = false
+
+      console.log(this.isRegistered)
+      this.$refs[formName].resetFields()
+    },
+    addShop() {
+      // 加载框
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      this.$store.dispatch('shopType/AddShop', this.listData).then((res) => {
+        if (res.code === '0') {
+          this.$message({
+            message: res.message,
+            type: 'success'
+          })
+          this.$router.push({ name: 'shop-index' })
+          loading.close()
+          return
+        }
+        this.$message.error(res.message)
+        loading.close()
+      }).catch(() => {
+        loading.close()
+        console.log('error AddBuilding')
+      })
+    }
+  }
+}
+</script>
+
+<style>
+.avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
+  
+.add-ruleForm{
+  width: 800px;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 50px;
+}
+</style>
+<style scoped>
+.search-box {
+  position: absolute;
+  top: 25px;
+  left: 20px;
+}
+
+.amap-page-container {
+  position: relative;
+}
+</style>

VUECODE/smart-property-manage/src/views/shop/shopEdit.vue

+<template>
+  <div class="root">
+    <el-form ref="ruleForm" :model="listData" :rules="rules" label-width="150px" class="add-ruleForm">
+      <el-form-item label="商铺名称" prop="shopName">
+        <el-input v-model="listData.shopName"/>
+      </el-form-item>
+      <el-form-item label="商铺说明" prop="remark">
+        <el-input v-model="listData.remark"/>
+      </el-form-item>
+      <el-form-item label="app首页展示图" prop="appIndexImg">
+        <el-upload
+          class="avatar-uploader"
+          name="uploadFiles"
+          :action="uploadImgUrl"
+          :show-file-list="false"
+          :on-success="handleAppIndexSuccess"
+          :before-upload="beforeAvatarUpload">
+          <img v-if="listData.appIndexImg" :src="listData.appIndexImg" class="avatar">
+          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+      </el-form-item>
+      <el-form-item label="app列表展示图" prop="appListImg">
+        <el-upload
+          class="avatar-uploader"
+          name="uploadFiles"
+          :action="uploadImgUrl"
+          :show-file-list="false"
+          :on-success="handleAppListSuccess"
+          :before-upload="beforeAvatarUpload">
+          <img v-if="listData.appListImg" :src="listData.appListImg" class="avatar">
+          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+      </el-form-item>
+      <el-form-item label="app商铺轮播图" prop="appCarouselImg">
+        <el-upload
+          name="uploadFiles"
+          :limit="6"
+          :action="uploadImgUrl"
+          list-type="picture-card"
+          :file-list="displayAppCarouselImg"
+          :on-preview="handlePictureCardPreview"
+          :on-remove="handleRemove"
+          :on-success="handleSuccessCarouselImg">
+          <i class="el-icon-plus"></i>
+        </el-upload>
+        <el-dialog :visible.sync="dialogVisible">
+          <img width="100%" :src="dialogImageUrl" alt="">
+        </el-dialog>
+      </el-form-item>
+      <el-form-item label="权重" prop="sort">
+        <el-input v-model="listData.sort"/>
+      </el-form-item>
+      <el-form-item label="商铺类型" prop="shopTypeId">
+        <el-select v-model="listData.shopTypeId" placeholder="商铺类型" clearable class="filter-item">
+          <el-option v-for="item in shopTypeList" :key="item.id" :value="item.id" :label="item.typeName"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="上架状态" prop="shopStatus">
+        <el-select v-model="listData.shopStatus" placeholder="请选择">
+          <el-option label="已上架" value="1"/>
+          <el-option label="已下架" value="2"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="联系电话" prop="shopTel">
+        <el-input v-model="listData.shopTel"/>
+      </el-form-item>
+      <el-form-item label="商铺地址" prop="shopAddress">
+        <el-input v-model="listData.shopAddress"/>
+      </el-form-item>
+      <el-form-item label="人均消费" prop="averagePrice">
+        <el-input v-model="listData.averagePrice"/>
+      </el-form-item>
+      <el-form-item label="高德坐标">
+        <el-input placeholder="经度" v-model="listData.shopLongitude" style="width: 150px;" />
+        <el-input placeholder="纬度" v-model="listData.shopLatitude" style="width: 150px;" />
+      </el-form-item>
+      <el-form-item label="">
+         <!-- 地图 -->
+        <div style="width:100%;height:300px;" class="amap-page-container">
+          <el-amap-search-box :search-option="searchOption" :on-search-result="onSearchResult" class="search-box"/>
+          <el-amap ref="map" :events="events" :center="mapCenter" :zoom="12" class="amap-demo" vid="amapDemo">
+            <el-amap-marker v-for="(item,index) in markers" :key="index" :position="item" />
+          </el-amap>
+        </div>
+      </el-form-item>
+      <el-form-item label="商铺介绍">
+          <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/> -->
+          <div id="father">
+            <wangeditor :content="listData.shopIntroduction" @wangeditorEvent="wangeditorValue"/>
+          </div>
+        </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm('ruleForm')">修改</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
+import Wangeditor from '@/components/Wangeditor'
+
+export default {
+  components: { Pagination, Wangeditor },
+  data() {
+    return {
+      events: {
+        click: e => {
+          // _self.postData.Coordinate = e.lnglat.lat + ',' + e.lnglat.lng
+          this.listData.shopLongitude = e.lnglat.lng
+          this.listData.shopLatitude = e.lnglat.lat
+        }
+      },
+      listData: {
+        id: '',
+        shopName: '',
+        remark: '',
+        appIndexImg: '',
+        appListImg: '',
+        appCarouselImg: [],
+        sort: '',
+        shopTypeId: '',
+        shopStatus: '',
+        shopTel: '',
+        shopAddress: '',
+        averagePrice: '',
+        shopLongitude: '',
+        shopLatitude: '',
+        shopIntroduction: ''
+      },
+      displayAppCarouselImg: [],
+      dialogImageUrl: '',
+      dialogVisible: false,
+      uploadImgUrl: process.env.BASE_API + '/uploadimage',
+      markers: [],
+      shopTypeList: [],
+      searchOption: {
+        city: '南京',
+        citylimit: false
+      },
+      mapCenter: [118.789509, 32.019989],
+      tableKey: 0,
+      rules: {
+        typeName: [
+          { required: true, message: '请输入商铺名称', trigger: 'blur' }
+        ],
+        remark: [
+          { required: true, message: '请输入商铺说明', trigger: 'blur' }
+        ],
+        shopTel: [
+          { required: true, message: '请输入联系电话', trigger: 'blur' }
+        ],
+        shopAddress: [
+          { required: true, message: '请输入商铺地址', trigger: 'blur' }
+        ],
+        appIndexImg: [
+          { required: true, message: 'app首页展示图', trigger: 'blur' }
+        ],
+        appListImg: [
+          { required: true, message: 'app列表展示图', trigger: 'blur' }
+        ],
+        appCarouselImg: [
+          { required: true, message: 'app商铺轮播图', trigger: 'blur' }
+        ],
+      }
+    }
+  },
+  created() {
+    this.listData.id = this.$route.query.id
+    this.getById()
+    this.getShopTypeList()
+  },
+  methods: {
+     addMarker() {
+      const lng = 121.5 + Math.round(Math.random() * 1000) / 10000
+      const lat = 31.197646 + Math.round(Math.random() * 500) / 10000
+      this.markers.push([lng, lat])
+    },
+    getById() {
+      this.$store.dispatch('shopType/GetShop', this.listData.id).then((res) => {
+        const shopData = res.data
+        this.listData = shopData
+        alert(this.listData.shopIntroduction)
+        // 多张图片进行遍历
+        for (let i = 0; i < shopData.appCarouselImg.length; i++) {
+          this.displayAppCarouselImg.push({ url: shopData.appCarouselImg[i] })
+        }
+      })
+    },
+    beforeAvatarUpload(file) {
+    },
+    handleAppIndexSuccess(res, file) {
+      this.listData.appIndexImg = res.data[0]
+    },
+    handleAppListSuccess(res, file) {
+      this.listData.appListImg = res.data[0]
+    },
+    handleRemove(file, fileList) {
+      this.listData.appCarouselImg = []
+      for (let i = 0; i < fileList.length; i++) {
+        this.listData.appCarouselImg.push(fileList[i].response.data[0])
+      }
+    },
+    handleSuccessCarouselImg(response, file, fileList) { // 活动配图上传成功时回调
+      const resImg = response.data[0]
+      this.listData.appCarouselImg.push(resImg)
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    getShopTypeList() {
+      this.$store.dispatch('shopType/FetchShopTypeSelect', this.listData).then((res) => {
+        this.shopTypeList = res.data
+      }).catch(() => {
+        console.log('error ListAnnouncement')
+      })
+    },
+    onSearchResult(pois) {
+      // 搜索地图
+      let latSum = 0
+      let lngSum = 0
+      if (pois.length > 0) {
+        pois.forEach(poi => {
+          const { lng, lat } = poi
+          lngSum += lng
+          latSum += lat
+          this.markers.push([poi.lng, poi.lat])
+        })
+        const center = {
+          lng: lngSum / pois.length,
+          lat: latSum / pois.length
+        }
+        this.mapCenter = [center.lng, center.lat]
+      }
+    },
+    wangeditorValue(value) {
+      this.listData.shopIntroduction = value // 在这里接受子组件传过来的参数，赋值给data里的参数
+    },
+    submitForm(formName) { // 提交
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.addShop()
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
+    resetForm(formName) { // 重置
+      // 重置为未注册
+      this.isRegistered = true
+      // 重置为非户主
+      this.roleDisabled = false
+
+      console.log(this.isRegistered)
+      this.$refs[formName].resetFields()
+    },
+    addShop() {
+      // 加载框
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      this.$store.dispatch('shopType/AddShop', this.listData).then((res) => {
+        if (res.code === '0') {
+          this.$message({
+            message: res.message,
+            type: 'success'
+          })
+          this.$router.push({ name: 'shop-index' })
+          loading.close()
+          return
+        }
+        this.$message.error(res.message)
+        loading.close()
+      }).catch(() => {
+        loading.close()
+        console.log('error AddBuilding')
+      })
+    }
+  }
+}
+</script>
+
+<style>
+.avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
+  
+.add-ruleForm{
+  width: 800px;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 50px;
+}
+</style>
+<style scoped>
+.search-box {
+  position: absolute;
+  top: 25px;
+  left: 20px;
+}
+
+.amap-page-container {
+  position: relative;
+}
+</style>

VUECODE/smart-property-manage/src/views/shop/shopIndex.vue

     <div class="button">
       <el-button type="primary" @click="add">添加</el-button>
       <el-button type="warning" @click="edit">修改</el-button>
-      <el-button type="danger" @click="deleteAnnouncement">作废</el-button>
+      <el-button type="danger" @click="deleteAnnouncement">下架商铺</el-button>
+      <el-button type="danger" @click="deleteAnnouncement">上架商铺</el-button>
     </div>
     <el-table
       v-loading="listLoading"
     },
     // 添加公告
     add() {
-      this.$router.push({ name: 'announcement-add' })
+      this.$router.push({ name: 'shop-add' })
     },
     edit(){// 编辑公告
       const ids = this.deleteIds
       }
        let ide= this.deleteIds[0]
        this.listQuery.id = ide
-      this.$store.dispatch('AnnouncementById', this.listQuery).then((res) => {
-        const resData = res.data
-        const announcement = resData.tpAnnouncement
-        const imgList = resData.studentList
-        this.listQuery = announcement
-        this.listQuery.announcementTitle = ''
-        console.log("1",this.listQuery.status)
-        if(this.listQuery.status == 0){
-          this.$message.error('已作废不可以修改')
-          return
-        } 
-       this.$router.push({ name: 'announcement-edit', query: { id: ide }})
-      }) 
+       this.$router.push({ name: 'shop-edit', query: { id: ide }})
       },
     deleteAnnouncement(){
        let ide= this.deleteIds[0]