商铺

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

@@ -0,0 +1,57 @@
+package com.community.huiju.controller;
+
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.common.base.BaseController;
+import com.community.huiju.service.ITpShopService;
+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.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;
+
+/**
+ * <p>
+ * 小区商铺表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@RestController
+@RequestMapping("/")
+public class TpShopController extends BaseController {
+	
+	@Autowired
+	private ITpShopService shopService;
+	
+	@ApiOperation(value = "根据搜索条件获取角色列表", notes = "根据搜索条件获取角色列表")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "商铺编号"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "shopName", value = "商铺名称"),
+			@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "shopTypeId", value = "商铺类型"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "shopStatus", value = "上架状态"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+	})
+	@RequestMapping(value = "/shops",method = RequestMethod.GET)
+	public ResponseBean getShopList(@RequestParam(value = "id") Integer id,
+	                                @RequestParam(value = "shopName") String shopName,
+	                                @RequestParam(value = "shopTypeId") Integer shopTypeId,
+	                                @RequestParam(value = "shopStatus") String shopStatus,
+	                                @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+	                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+	                                HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = shopService.getShopList(id,shopName,shopTypeId,shopStatus,userElement,pageNum,pageSize);
+		return responseBean;
+	}
+}

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

@@ -1,6 +1,7 @@
 package com.community.huiju.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.common.base.BaseController;
@@ -120,4 +121,23 @@ public class TpShopTypeController extends BaseController {
 		responseBean = shopTypeService.deleteShopType(jsonString);
 		return responseBean;
 	}
+	
+	@ApiOperation(value = "获取商铺配置列表", notes = "获取商铺配置列表")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/shop/type/select",method = RequestMethod.GET)
+	public ResponseBean getTypesSelect(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+	                                 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		QueryWrapper<TpShopType> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("community_id",userElement.getCommunityId());
+		queryWrapper.orderByAsc("sort");
+		queryWrapper.orderByAsc("create_date");
+		responseBean.addSuccess(shopTypeService.list(queryWrapper));
+		return responseBean;
+	}
 }

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

@@ -0,0 +1,23 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.community.huiju.model.TpShop;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 小区商铺表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@Mapper
+public interface TpShopMapper extends BaseMapper<TpShop> {
+	
+	List<TpShop> getShopList(Page page,@Param("tpShop") TpShop tpShop);
+}

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

@@ -0,0 +1,128 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+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 TpShop implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    
+    /**
+     * 小区ID
+     */
+    private Integer communityId;
+
+    /**
+     * 商铺名称
+     */
+    private String shopName;
+
+    /**
+     * 商铺说明
+     */
+    private String remark;
+
+    /**
+     * 排序(权重)
+     */
+    private String sort;
+
+    /**
+     * 商铺类型
+     */
+    private Integer shopTypeId;
+
+    /**
+     * 商铺状态 1是已上架 2是已下架
+     */
+    private String shopStatus;
+
+    /**
+     * 商铺电话
+     */
+    private String shopTel;
+
+    /**
+     * 商铺地址
+     */
+    private String shopAddress;
+
+    /**
+     * 均价
+     */
+    private String averagePrice;
+
+    /**
+     * 商铺经度
+     */
+    private String shopLongitude;
+
+    /**
+     * 商铺纬度
+     */
+    private String shopLatitude;
+
+    /**
+     * 商铺介绍
+     */
+    private String shopIntroduction;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+    
+    /**
+     * 类型名称
+     */
+    @TableField(exist = false)
+    private String typeName;
+    
+    /**
+     * 首页图片地址
+     */
+    @TableField(exist = false)
+    private String imgUrl;
+    
+    /**
+     * 更新人姓名
+     */
+    @TableField(exist = false)
+    private String userName;
+}

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

@@ -0,0 +1,30 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.TpShop;
+
+/**
+ * <p>
+ * 小区商铺表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+public interface ITpShopService extends IService<TpShop> {
+	
+	/**
+	 * 根据条件查询商铺列表
+	 * @param id
+	 * @param shopName
+	 * @param shopTypeId
+	 * @param shopStatus
+	 * @param userElement
+	 * @param pageNum
+	 * @param pageSize
+	 * @return
+	 */
+	ResponseBean getShopList(Integer id, String shopName, Integer shopTypeId, String shopStatus, UserElement userElement, Integer pageNum, Integer pageSize);
+}

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

@@ -0,0 +1,60 @@
+package com.community.huiju.service.impl;
+
+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.TpShopMapper;
+import com.community.huiju.model.TpShop;
+import com.community.huiju.service.ITpShopService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 小区商铺表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@Service
+public class TpShopServiceImpl extends ServiceImpl<TpShopMapper, TpShop> implements ITpShopService {
+
+	@Autowired
+	private TpShopMapper shopMapper;
+	
+	/**
+	 * 根据条件查询商铺列表
+	 *
+	 * @param id
+	 * @param shopName
+	 * @param shopTypeId
+	 * @param shopStatus
+	 * @param userElement
+	 * @param pageNum
+	 * @param pageSize
+	 * @return
+	 */
+	@Override
+	public ResponseBean getShopList(Integer id, String shopName, Integer shopTypeId, String shopStatus, UserElement userElement, Integer pageNum, Integer pageSize) {
+		ResponseBean responseBean = new ResponseBean();
+		Page page = new Page(pageNum,pageSize);
+		TpShop tpShop = new TpShop();
+		tpShop.setId(id);
+		tpShop.setShopName(shopName);
+		tpShop.setShopTypeId(shopTypeId);
+		tpShop.setShopStatus(shopStatus);
+		tpShop.setCommunityId(userElement.getCommunityId());
+		List<TpShop> list = shopMapper.getShopList(page,tpShop);
+		Map<String,Object> map = new HashMap<>();
+		map.put("list", list);
+		map.put("total", page.getTotal());
+		responseBean.addSuccess(map);
+		return responseBean;
+	}
+}

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

@@ -0,0 +1,38 @@
+<?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.TpShopMapper">
+
+    <select id="getShopList" resultType="com.community.huiju.model.TpShop">
+        SELECT
+            t.id,
+            t.shop_name,
+            t.sort,
+            t.shop_type_id,
+            t.shop_status,
+            t.update_user,
+            t.update_date,
+            s.type_name,
+            i.img_url,
+            u.user_name
+        FROM
+            tp_shop t
+            LEFT JOIN tp_shop_img i ON t.id = i.shop_id AND i.img_type = 1
+            LEFT JOIN  tp_shop_type s on t.shop_type_id = s.id
+            LEFT JOIN tp_user u on t.update_user = u.id
+        where 1=1
+        and t.community_id = #{tpShop.communityId}
+        <if test="tpShop.id != null and tpShop.id != ''">
+            and t.id like concat('%',#{tpShop.id},'%')
+        </if>
+        <if test="tpShop.shopName != null and tpShop.shopName != ''">
+            and t.shop_name like concat('%',#{tpShop.shopName},'%')
+        </if>
+        <if test="tpShop.shopTypeId != null and tpShop.shopTypeId != ''">
+            and t.shop_type_id  = #{tpShop.shopTypeId}
+        </if>
+        <if test="tpShop.shopStatus != null and tpShop.shopStatus != ''">
+            and t.shop_status  = #{tpShop.shopStatus}
+        </if>
+    </select>
+
+</mapper>

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

@@ -51,3 +51,18 @@ export function deleteShopType(ids) {
   })
 }
 
+export function fetchShopList(query) {
+  return request({
+    url: '/shops',
+    method: 'get',
+    params: query
+  })
+}
+
+export function fetchShopTypeSelect(query) {
+  return request({
+    url: '/shop/type/select',
+    method: 'get'
+  })
+}
+

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

@@ -1,4 +1,4 @@
-import { fetchShopTypeList, changeShopSetting, addShopType, getShopType, updateShopType, deleteShopType } from '@/api/shopType'
+import { fetchShopTypeList, changeShopSetting, addShopType, getShopType, updateShopType, deleteShopType, fetchShopList, fetchShopTypeSelect } from '@/api/shopType'
 
 const transaction = {
   namespaced: true,
@@ -65,6 +65,24 @@ const transaction = {
           reject(error)
         })
       })
+    },
+    FetchShopList({ commit }, listQuery) {
+      return new Promise((resolve, reject) => {
+        fetchShopList(listQuery).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    FetchShopTypeSelect({ commit }, listQuery) {
+      return new Promise((resolve, reject) => {
+        fetchShopTypeSelect(listQuery).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

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

@@ -1,9 +1,286 @@
+
 <template>
-  <div>商铺列表</div>
+  <div class="root">
+    <el-form :inline="true" :model="listQuery" class="form-listQuery">
+      <el-form-item class="filter-item" label="商铺编号">
+        <el-input v-model.trim="listQuery.id" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="商铺编号" />
+      </el-form-item>
+      <el-form-item class="filter-item" label="商铺名称" >
+        <el-input v-model.trim="listQuery.shopName" placeholder="商铺名称" />
+      </el-form-item>
+      <el-form-item class="filter-item" label="商铺类型" >
+        <el-select v-model="listQuery.shopTypeId" placeholder="商铺类型" clearable class="filter-item" style="width: 200px">
+          <el-option v-for="item in shopTypeList" :key="item.id" :value="item.id" :label="item.typeName"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item class="filter-item" label="上架状态" >
+        <el-select v-model="listQuery.shopStatus" placeholder="请选择">
+            <el-option label="已上架" value="1"/>
+            <el-option label="已下架" value="2"/>
+          </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" class="filter-item" @click="handleFilter">清空</el-button>
+        <el-button type="primary" @click="search">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <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>
+    </div>
+    <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="shopList"
+      border
+      tooltip-effect="dark"
+      style="width: 100%; margin-top: 20px;"
+      @selection-change="handleSelectionChange">
+      <el-table-column
+        type="selection"
+        width="55"/>
+      <el-table-column prop="id" label="商铺编号" align="center"/>
+      <el-table-column prop="shopName" label="商铺名称" align="center" >
+        <template slot-scope="scope"><a><span style="color: #63B8FF" @click="clickTitle(scope.row.shopName)">{{ scope.row.shopName }}</span></a></template>
+      </el-table-column>
+      <el-table-column prop="imgUrl" label="首页展示图" align="center">
+        <template scope="scope">
+          <img :src="scope.row.imgUrl" width="100%"/>
+        </template>
+      </el-table-column>
+      <el-table-column prop="sort" label="权重" align="center"/>
+      <el-table-column prop="typeName" label="商铺类型" align="center"/>
+      <el-table-column prop="shopStatus" label="上架状态" align="center">\
+        <template slot-scope="scope">
+          <span v-if="scope.row.shopStatus === '1'">已上架</span>
+          <span v-if="scope.row.shopStatus === '2'">已下架</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="updateDate" label="编辑时间" align="center" ><template slot-scope="scope">{{ formatDate(scope.row.updateDate) }}</template></el-table-column>
+      <el-table-column prop="userName" label="编辑人" align="center"/>
+    </el-table>
+    <div class="block">
+      <el-pagination
+        :current-page.sync="listQuery.pageNum"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size.sync="listQuery.pageSize"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
 </template>
 
 <script>
+import { mapState, mapActions, mapMutations } from 'vuex'
+
+export default {
+  data() {
+    return {
+      listQuery: {
+        id: '',
+        shopName: '',
+        shopTypeId: '',
+        shopStatus: '',
+        pageNum: 1,
+        pageSize: 10
+      },
+      total: 0, // 数据总数
+      shopList: [],
+      shopTypeList: [],
+      deleteIds: [], // 选择的id集合
+      listLoading: true // 加载圈
+    }
+  },
+  mounted() {
+    // 获取数据
+    this.dataQuery()
+    this.getShopTypeList()
+  },
+  methods: {
+    ...mapActions('shopType', [
+      'FetchShopList',
+      'FetchShopTypeSelect'
+    ]),
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.listQuery.pageSize = val
+      this.dataQuery()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+      this.listQuery.pageNum = val
+      this.dataQuery()
+    },
+    padDate(value) {
+      value = value < 10 ? '0' + value : value
+      return value
+    },
+    getStatus(row) { // 获取状态
+      let statusName = ''
+
+      // 判断状态
+      switch (row.status) {
+        case '0':
+          statusName = '已作废'
+          break
+        case '1':
+          statusName = '已发布'
+          break
+        case '2':
+          statusName = '草稿'
+          break
+      }
+
+      // 如果修改时间和创建时间不一致, 就显示已修改
+      if (row.status === '1' && (row.updateDate > row.createDate)) {
+        statusName = '已修改'
+      }
+
+      return statusName
+    },
+    dataQuery() { // 查询数据
+      this.listLoading = true
+      this.$store.dispatch('shopType/FetchShopList', this.listQuery).then((res) => {
+        const resData = res.data
+        this.shopList = resData.list
+        this.total = resData.total
+        this.listLoading = false
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error ListAnnouncement')
+      })
+    },
+    getShopTypeList() {
+      this.$store.dispatch('shopType/FetchShopTypeSelect', this.listQuery).then((res) => {
+        this.shopTypeList = res.data
+      }).catch(() => {
+        console.log('error ListAnnouncement')
+      })
+    },
+    handleSelectionChange(data) {
+      // 设置为 空
+      this.deleteIds = []
+      for (let i = 0; i < data.length; i++) {
+        this.deleteIds.push(data[i].id)
+      }
+    },
+	  search() {
+      this.listQuery.pageNum = 1
+      this.dataQuery()
+    },
+    handleFilter() {
+      this.listQuery.pageNum = 1
+      this.listQuery.pageSize = 10
+      this.listQuery.id =''
+      this.listQuery.shopName=''
+      this.listQuery.shopTypeId=''
+      this.listQuery.shopStatus=''
+      this.dataQuery()
+    },
+    // 添加公告
+    add() {
+      this.$router.push({ name: 'announcement-add' })
+    },
+    edit(){// 编辑公告
+      const ids = this.deleteIds
+      if (ids.length > 1) {
+        this.$message.error('只能选择一行数据进行修改!')
+        return
+      }
+      if (ids < 1) {
+        this.$message.error('请选择一行数据进行修改!')
+        return
+      }
+       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 }})
+      }) 
+      },
+    deleteAnnouncement(){
+       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.status= announcement.status
+        console.log("1",this.listQuery.status)
+        if(this.listQuery.status == 0){
+          this.$message.error('已作废不可以作废')
+          return
+        }
+        this.deleteId()     
+      })    
+    },
+
+    deleteId(){
+       const ids = this.deleteIds
+      this.listLoading = true
+      console.log(ids)
+      this.$store.dispatch('DeleteAnnouncement', ids).then((res) => {
+        this.listLoading = false
+        this.listQuery.announcementTitle = ''
+        this.dataQuery()
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error DeleteAnnouncement')
+      })
+    },
+
+
+    clickTitle(id) {
+      this.$router.push({ name: 'contentParticulars-details', query: { id: id }})
+    },
+    formatDate(val) {
+      if (val === null) {
+        return ''
+      }
+      var value = new Date(val)
+      var year = value.getFullYear()
+      var month = value.getMonth() + 1
+      var day = value.getDate()
+      return year + '-' + month + '-' + day
+    }
+  }
+}
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
+.root{
+  display: flex;
+  flex-flow: column;
+}
+.form-listQuery{
+  margin-top: 20px;
+  margin-left: 30px;
+}
+.operation{
+  display: flex;
+  justify-content: space-between;
+  margin-left: 20px;
+  margin-right: 20px;
+}
+.block{
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 10px;
+}
+.button {
+  margin-left: 20px;
+}
 </style>
+