商铺配置

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

@@ -13,12 +13,15 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
+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>
@@ -51,4 +54,70 @@ public class TpShopTypeController extends BaseController {
 		responseBean = shopTypeService.getTypesList(userElement.getCommunityId(),pageNum,pageSize);
 		return responseBean;
 	}
+	
+	@ApiOperation(value = "添加商铺类型", notes = "添加商铺类型")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "TpShopType", name = "shopType", value = "商铺类型"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/shop/add/type",method = RequestMethod.POST)
+	public ResponseBean saveShopType(@RequestBody TpShopType shopType, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		shopType.setCommunityId(userElement.getCommunityId());
+		shopType.setSource("self");
+		shopType.setCreateUser(userElement.getId());
+		shopType.setCreateDate(LocalDateTime.now());
+		boolean state  = shopTypeService.save(shopType);
+		if (state){
+			responseBean.addSuccess("添加成功");
+		}else{
+			responseBean.addError("添加失败");
+		}
+		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/type/{id}",method = RequestMethod.GET)
+	public ResponseBean getShopType(@PathVariable Integer id, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		TpShopType tpShopType = shopTypeService.getById(id);
+		responseBean.addSuccess(tpShopType);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "更新商铺类型", notes = "更新商铺类型")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "TpShopType", name = "shopType", value = "商铺类型"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/shop/update/type",method = RequestMethod.POST)
+	public ResponseBean updateShopType(@RequestBody TpShopType shopType, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		boolean state  = shopTypeService.updateById(shopType);
+		if (state){
+			responseBean.addSuccess("更新成功");
+		}else{
+			responseBean.addError("更新失败");
+		}
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "删除商铺类型", notes = "删除商铺类型")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "jsonString", value = "商铺id集合"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/shop/delete/type",method = RequestMethod.DELETE)
+	public ResponseBean deleteShopType(@RequestBody String jsonString, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		responseBean = shopTypeService.deleteShopType(jsonString);
+		return responseBean;
+	}
 }

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

@@ -1,5 +1,7 @@
 package com.community.huiju.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -21,7 +23,10 @@ import java.time.LocalDateTime;
 public class TpShopSetting implements Serializable {
 
     private static final long serialVersionUID = 1L;
-
+    
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    
     /**
      * 小区ID
      */

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

@@ -1,5 +1,7 @@
 package com.community.huiju.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -21,7 +23,10 @@ import java.time.LocalDateTime;
 public class TpShopType implements Serializable {
 
     private static final long serialVersionUID = 1L;
-
+    
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    
     /**
      * 小区ID
      */

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

@@ -22,4 +22,11 @@ public interface ITpShopTypeService extends IService<TpShopType> {
 	 * @return
 	 */
 	ResponseBean getTypesList(Integer communityId, Integer pageNum, Integer pageSize);
+	
+	/**
+	 * 删除商铺类型
+	 * @param jsonString
+	 * @return
+	 */
+	ResponseBean deleteShopType(String jsonString);
 }

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

@@ -1,5 +1,7 @@
 package com.community.huiju.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -49,6 +51,8 @@ public class TpShopTypeServiceImpl extends ServiceImpl<TpShopTypeMapper, TpShopT
 		//获取列表数据
 		QueryWrapper<TpShopType> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("community_id",communityId);
+		queryWrapper.orderByAsc("sort");
+		queryWrapper.orderByAsc("create_date");
 		IPage<TpShopType> myPage = shopTypeMapper.selectPage(page,queryWrapper);
 		//获取商铺是否app显示
 		QueryWrapper<TpShopSetting> settingQueryWrapper = new QueryWrapper<>();
@@ -56,11 +60,36 @@ public class TpShopTypeServiceImpl extends ServiceImpl<TpShopTypeMapper, TpShopT
 		TpShopSetting shopSetting = shopSettingMapper.selectOne(settingQueryWrapper);
 		Map<String,Object> map = new HashMap<>();
 		map.put("dataList",myPage.getRecords());
-		map.put("pageNum",myPage.getCurrent());
-		map.put("pageSize",myPage.getPages());
 		map.put("total",myPage.getTotal());
 		map.put("shopSettingValue",null == shopSetting ? false : true);
 		responseBean.addSuccess(map);
 		return responseBean;
 	}
+	
+	/**
+	 * 删除商铺类型
+	 *
+	 * @param jsonString
+	 * @return
+	 */
+	@Override
+	public ResponseBean deleteShopType(String jsonString) {
+		ResponseBean responseBean = new ResponseBean();
+		StringBuffer message = new StringBuffer();
+		message.append("删除成功。");
+		JSONObject jsonObject = JSONObject.parseObject(jsonString);
+		JSONArray ids = jsonObject.getJSONArray("idArray");
+		for (Object id : ids){
+			//根据ID查询这个数据是否是系统创建，系统创建的不能删除，非系统创建的能删除
+			TpShopType shopType = shopTypeMapper.selectById(id.toString());
+			if (shopType.getSource().equals("sys")){
+				//系统创建不可删除
+				message.append(shopType.getTypeName() + "为系统创建，不可删除。");
+			}else{
+				shopTypeMapper.deleteById(id.toString());
+			}
+		}
+		responseBean.addSuccess(message.toString());
+		return responseBean;
+	}
 }

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

@@ -17,3 +17,37 @@ export function changeShopSetting(shopSettingValue) {
     }
   })
 }
+
+export function addShopType(listQuery) {
+  return request({
+    url: '/shop/add/type',
+    method: 'post',
+    data: listQuery
+  })
+}
+
+export function getShopType(id) {
+  return request({
+    url: '/shop/get/type/' + id,
+    method: 'get'
+  })
+}
+
+export function updateShopType(listQuery) {
+  return request({
+    url: '/shop/update/type',
+    method: 'post',
+    data: listQuery
+  })
+}
+
+export function deleteShopType(ids) {
+  return request({
+    url: '/shop/delete/type',
+    method: 'delete',
+    data: {
+      idArray: ids
+    }
+  })
+}
+

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

@@ -375,6 +375,20 @@ export const constantRouterMap = [
         name: 'shop-setting',
         meta: { title: '商铺配置', icon: 'table' }
       },
+      {
+        path: '/shop/setting/add',
+        component: () => import('@/views/shop/shopSettingAdd'),
+        name: 'shopSetting-add',
+        hidden: true,
+        meta: { title: '添加商铺类型', icon: 'table' }
+      },
+      {
+        path: '/shop/setting/edit',
+        component: () => import('@/views/shop/shopSettingEdit'),
+        name: 'shopSetting-edit',
+        hidden: true,
+        meta: { title: '修改商铺类型', icon: 'table' }
+      },
       {
         path: '/shop/index',
         component: () => import('@/views/shop/shopIndex'),

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

@@ -1,4 +1,4 @@
-import { fetchShopTypeList, changeShopSetting } from '@/api/shopType'
+import { fetchShopTypeList, changeShopSetting, addShopType, getShopType, updateShopType, deleteShopType } from '@/api/shopType'
 
 const transaction = {
   namespaced: true,
@@ -29,6 +29,42 @@ const transaction = {
           reject(error)
         })
       })
+    },
+    AddShopType({ commit }, listQuery) {
+      return new Promise((resolve, reject) => {
+        addShopType(listQuery).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    GetShopType({ commit }, id) {
+      return new Promise((resolve, reject) => {
+        getShopType(id).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    UpdateShopType({ commit }, listQuery) {
+      return new Promise((resolve, reject) => {
+        updateShopType(listQuery).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    DeleteShopType({ commit }, ids) {
+      return new Promise((resolve, reject) => {
+        deleteShopType(ids).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

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

@@ -15,7 +15,7 @@
     <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="deleteShopType">删除</el-button>
     </div>
     <el-table
       v-loading="listLoading"
@@ -32,9 +32,6 @@
       <el-table-column prop="typeName" label="商铺类型" align="center"/>
       <el-table-column prop="sort" label="权重" align="center"/>
       <el-table-column prop="createDate" label="发布时间" align="center"><template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template></el-table-column>
-      <el-table-column prop="createUserName" label="发布人" align="center"/>
-      <el-table-column prop="updateDate" label="修改时间" align="center" ><template slot-scope="scope">{{ formatDate(scope.row.updateDate) }}</template></el-table-column>
-      <el-table-column prop="updateDateName" label="修改人" align="center"/>
     </el-table>
     <div class="block">
       <el-pagination
@@ -93,8 +90,6 @@ export default {
       this.listLoading = true
       this.FetchShopTypeList(this.listQuery).then((resData) => {
         this.shopTypeList = resData.dataList
-        this.listQuery.pageNum = resData.pageNum
-        this.listQuery.pageSize = resData.pageSize
         this.total = resData.total
         this.shopSettingValue = resData.shopSettingValue
         this.listLoading = false
@@ -130,7 +125,7 @@ export default {
     },
     // 添加公告
     add() {
-      this.$router.push({ name: 'announcement-add' })
+      this.$router.push({ name: 'shopSetting-add' })
     },
     edit(){// 编辑公告
       const ids = this.deleteIds
@@ -144,52 +139,23 @@ export default {
       }
        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()     
-      })    
+       this.$router.push({ name: 'shopSetting-edit', query: { id: ide }})
     },
-
-    deleteId(){
-       const ids = this.deleteIds
+    deleteShopType(){
+      const ids = this.deleteIds
       this.listLoading = true
-      console.log(ids)
-      this.$store.dispatch('DeleteAnnouncement', ids).then((res) => {
+      this.$store.dispatch('shopType/DeleteShopType', ids).then((res) => {
         this.listLoading = false
-        this.listQuery.announcementTitle = ''
+        this.$message({
+          message: res.message,
+          type: 'success'
+        })
         this.dataQuery()
       }).catch(() => {
         this.listLoading = false
-        console.log('error DeleteAnnouncement')
+        console.log('error DeleteShopType')
       })
     },
-
-
     clickTitle(id) {
       this.$router.push({ name: 'contentParticulars-details', query: { id: id }})
     },

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

@@ -0,0 +1,91 @@
+<template>
+  <div class="root">
+    <el-form ref="ruleForm" :model="listQuery" :rules="rules" label-width="100px" class="add-ruleForm">
+      <el-form-item label="商铺类型" prop="typeName">
+        <el-input v-model="listQuery.typeName" style="width: 200px;"/>
+      </el-form-item>
+      <el-form-item label="权重" prop="sort">
+        <el-input v-model="listQuery.sort" style="width: 200px;"/>
+      </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>
+export default {
+  data() {
+    return {
+      listQuery: {
+        typeName: '',
+        sort: ''
+      },
+      rules: {
+        typeName: [
+          { required: true, message: '请输入商铺类型', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    submitForm(formName) { // 提交
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.addBuilding()
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
+    resetForm(formName) { // 重置
+      // 重置为未注册
+      this.isRegistered = true
+      // 重置为非户主
+      this.roleDisabled = false
+
+      console.log(this.isRegistered)
+      this.$refs[formName].resetFields()
+    },
+    addBuilding() {
+      // 加载框
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      this.$store.dispatch('shopType/AddShopType', this.listQuery).then((res) => {
+        if (res.code === '0') {
+          this.$message({
+            message: res.message,
+            type: 'success'
+          })
+          this.$router.push({ name: 'shop-setting' })
+          loading.close()
+          return
+        }
+        this.$message.error(res.message)
+        loading.close()
+      }).catch(() => {
+        loading.close()
+        console.log('error AddBuilding')
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.add-ruleForm{
+  width: 800px;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 50px;
+}
+</style>

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

@@ -0,0 +1,101 @@
+<template>
+  <div class="root">
+    <el-form ref="ruleForm" :model="listQuery" :rules="rules" label-width="100px" class="add-ruleForm">
+      <el-form-item label="商铺类型" prop="typeName">
+        <el-input v-model="listQuery.typeName" style="width: 200px;"/>
+      </el-form-item>
+      <el-form-item label="权重" prop="sort">
+        <el-input v-model="listQuery.sort" style="width: 200px;"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm('ruleForm')">修改</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      listQuery: {
+        id: '',
+        typeName: '',
+        sort: ''
+      },
+      rules: {
+        typeName: [
+          { required: true, message: '请输入商铺类型', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  mounted() {
+    this.listQuery.id = this.$route.query.id
+    this.getById()
+  },
+  methods: {
+    submitForm(formName) { // 提交
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.updateBuilding()
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
+    resetForm(formName) { // 重置
+      // 重置为未注册
+      this.isRegistered = true
+      // 重置为非户主
+      this.roleDisabled = false
+
+      console.log(this.isRegistered)
+      this.$refs[formName].resetFields()
+    },
+    getById() {
+      this.$store.dispatch('shopType/GetShopType', this.listQuery.id).then((res) => {
+        console.log(res)
+        const typeData = res.data
+        this.listQuery.typeName = typeData.typeName
+        this.listQuery.sort = typeData.sort
+      })
+    },
+    updateBuilding() {
+      // 加载框
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      this.$store.dispatch('shopType/UpdateShopType', this.listQuery).then((res) => {
+        if (res.code === '0') {
+          this.$message({
+            message: res.message,
+            type: 'success'
+          })
+          this.$router.push({ name: 'shop-setting' })
+          loading.close()
+          return
+        }
+        this.$message.error(res.message)
+        loading.close()
+      }).catch(() => {
+        loading.close()
+        console.log('error updateBuilding')
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.add-ruleForm{
+  width: 800px;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 50px;
+}
+</style>