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

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

 package com.community.huiju.controller;
 
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.common.base.BaseController;
 
 import javax.servlet.http.HttpSession;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
 		responseBean.addSuccess(tpShop);
 		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/update",method = RequestMethod.POST)
+	public ResponseBean updateShop(@RequestBody TpShop shop, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = shopService.updateShop(shop,userElement);
+		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/shelf",method = RequestMethod.POST)
+	public ResponseBean shelfShop(@RequestBody String jsonString, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		JSONObject jsonObject = JSONObject.parseObject(jsonString);
+		JSONArray ids = jsonObject.getJSONArray("idArray");
+		List<TpShop> tpShopList = new ArrayList<>();
+		for (Object id : ids){
+			TpShop tpShop = new TpShop();
+			tpShop.setId((Integer) id);
+			tpShop.setShopStatus("1");
+			tpShop.setUpdateUser(userElement.getId());
+			tpShop.setUpdateDate(LocalDateTime.now());
+			tpShopList.add(tpShop);
+		}
+		
+		boolean state = shopService.updateBatchById(tpShopList);
+		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/obtained",method = RequestMethod.POST)
+	public ResponseBean obtainedShop(@RequestBody String jsonString, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		JSONObject jsonObject = JSONObject.parseObject(jsonString);
+		JSONArray ids = jsonObject.getJSONArray("idArray");
+		List<TpShop> tpShopList = new ArrayList<>();
+		for (Object id : ids){
+			TpShop tpShop = new TpShop();
+			tpShop.setId((Integer) id);
+			tpShop.setShopStatus("2");
+			tpShop.setUpdateUser(userElement.getId());
+			tpShop.setUpdateDate(LocalDateTime.now());
+			tpShopList.add(tpShop);
+		}
+		
+		boolean state = shopService.updateBatchById(tpShopList);
+		if (state){
+			responseBean.addSuccess("下架成功");
+		}else{
+			responseBean.addError("下架失败");
+		}
+		return responseBean;
+	}
 }

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

 	 * @return
 	 */
 	TpShop getShopById(Integer id);
+	
+	/**
+	 * 更新商铺信息
+	 * @param shop
+	 * @param userElement
+	 * @return
+	 */
+	ResponseBean updateShop(TpShop shop, UserElement userElement);
 }

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

 import com.community.huiju.service.ITpShopService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
  * @since 2019-05-10
  */
 @Service
+@Transactional(rollbackFor = Exception.class)
 public class TpShopServiceImpl extends ServiceImpl<TpShopMapper, TpShop> implements ITpShopService {
 
 	@Autowired
 		tpShop.setAppCarouselImg(carouselUrlList);
 		return tpShop;
 	}
+	
+	/**
+	 * 更新商铺信息
+	 *
+	 * @param shop
+	 * @param userElement
+	 * @return
+	 */
+	@Override
+	public ResponseBean updateShop(TpShop shop, UserElement userElement) {
+		ResponseBean responseBean = new ResponseBean();
+		shopMapper.updateById(shop);
+		//添加商铺app首页图片信息
+		TpShopImg appIndexShopImg = new TpShopImg();
+		appIndexShopImg.setImgUrl(shop.getAppIndexImg());
+		QueryWrapper<TpShopImg> tpShopImgQueryWrapper = new QueryWrapper<>();
+		tpShopImgQueryWrapper.eq("community_id",shop.getCommunityId());
+		tpShopImgQueryWrapper.eq("shop_id",shop.getId());
+		tpShopImgQueryWrapper.eq("img_type","1");
+		shopImgMapper.update(appIndexShopImg,tpShopImgQueryWrapper);
+		//添加商铺app列表图片信息
+		TpShopImg appListShopImg = new TpShopImg();
+		appListShopImg.setImgUrl(shop.getAppListImg());
+		QueryWrapper<TpShopImg> tpShopImgListWrapper = new QueryWrapper<>();
+		tpShopImgListWrapper.eq("community_id",shop.getCommunityId());
+		tpShopImgListWrapper.eq("shop_id",shop.getId());
+		tpShopImgListWrapper.eq("img_type","2");
+		shopImgMapper.update(appListShopImg,tpShopImgListWrapper);
+		//先删除在批量添加app轮播图片
+		QueryWrapper<TpShopImg> tpShopImgCarouselWrapper = new QueryWrapper<>();
+		tpShopImgCarouselWrapper.eq("community_id",shop.getCommunityId());
+		tpShopImgCarouselWrapper.eq("shop_id",shop.getId());
+		tpShopImgCarouselWrapper.eq("img_type","3");
+		shopImgMapper.delete(tpShopImgCarouselWrapper);
+		//重新添加
+		List<String> list = shop.getAppCarouselImg();
+		List<TpShopImg> carouselList = new ArrayList<>();
+		list.stream().forEach(e -> {
+			TpShopImg appCarouselImg = new TpShopImg();
+			appCarouselImg.setCommunityId(shop.getCommunityId());
+			appCarouselImg.setCreateDate(LocalDateTime.now());
+			appCarouselImg.setImgType("3");
+			appCarouselImg.setShopId(shop.getId());
+			appCarouselImg.setImgUrl(e);
+			carouselList.add(appCarouselImg);
+		});
+		shopImgMapper.batchSave(carouselList);
+		responseBean.addSuccess("修改成功");
+		return responseBean;
+	}
 }

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

   })
 }
 
+export function updateShop(listQuery) {
+  return request({
+    url: '/shop/update',
+    method: 'post',
+    data: listQuery
+  })
+}
+
 export function deleteShopType(ids) {
   return request({
     url: '/shop/delete/type',
   })
 }
 
+export function obtainedShop(ids) {
+  return request({
+    url: '/shop/obtained',
+    method: 'post',
+    data: {
+      idArray: ids
+    }
+  })
+}
+
+export function shelfShop(ids) {
+  return request({
+    url: '/shop/shelf',
+    method: 'post',
+    data: {
+      idArray: ids
+    }
+  })
+}
+
 export function fetchShopList(query) {
   return request({
     url: '/shops',

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

-import { fetchShopTypeList, changeShopSetting, addShopType, getShopType, updateShopType, deleteShopType, fetchShopList, fetchShopTypeSelect, addShop, getShop } from '@/api/shopType'
+import { fetchShopTypeList, changeShopSetting, addShopType, getShopType, updateShopType, deleteShopType, fetchShopList, fetchShopTypeSelect, addShop, getShop, updateShop, shelfShop, obtainedShop } from '@/api/shopType'
 
 const transaction = {
   namespaced: true,
         })
       })
     },
+    UpdateShop({ commit }, listQuery) {
+      return new Promise((resolve, reject) => {
+        updateShop(listQuery).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     DeleteShopType({ commit }, ids) {
       return new Promise((resolve, reject) => {
         deleteShopType(ids).then(response => {
         })
       })
     },
+    ShelfShop({ commit }, ids) {
+      return new Promise((resolve, reject) => {
+        shelfShop(ids).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    ObtainedShop({ commit }, ids) {
+      return new Promise((resolve, reject) => {
+        obtainedShop(ids).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     FetchShopList({ commit }, listQuery) {
       return new Promise((resolve, reject) => {
         fetchShopList(listQuery).then(response => {

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

     submitForm(formName) { // 提交
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.addShop()
+          this.updateShop()
         } else {
           console.log('error submit!!')
           return false
       console.log(this.isRegistered)
       this.$refs[formName].resetFields()
     },
-    addShop() {
+    updateShop() {
       // 加载框
       const loading = this.$loading({
         lock: true,
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      this.$store.dispatch('shopType/AddShop', this.listData).then((res) => {
+      this.$store.dispatch('shopType/UpdateShop', this.listData).then((res) => {
         if (res.code === '0') {
           this.$message({
             message: res.message,
         loading.close()
       }).catch(() => {
         loading.close()
-        console.log('error AddBuilding')
+        console.log('error UpdateShop')
       })
     }
   }

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="shelfShop">上架商铺</el-button>
+      <el-button type="danger" @click="obtainedShop">下架商铺</el-button>
     </div>
     <el-table
       v-loading="listLoading"
         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>
+        <template slot-scope="scope"><a><span style="color: #63B8FF" @click="clickTitle(scope.row.id)">{{ scope.row.shopName }}</span></a></template>
       </el-table-column>
       <el-table-column prop="imgUrl" label="首页展示图" align="center">
         <template scope="scope">
         this.deleteId()     
       })    
     },
-
+    shelfShop() {
+      this.listLoading = true
+      const ids = this.deleteIds
+      if (ids < 1) {
+        this.$message.error('请至少选择一行数据上架!')
+        return
+      }
+      this.$store.dispatch('shopType/ShelfShop', ids).then((res) => {
+        this.listLoading = false
+        this.dataQuery()
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error DeleteAnnouncement')
+      })
+    },
+    obtainedShop() {
+      this.listLoading = true
+      const ids = this.deleteIds
+      if (ids < 1) {
+        this.$message.error('请至少选择一行数据下架!')
+        return
+      }
+      this.$store.dispatch('shopType/ObtainedShop', ids).then((res) => {
+        this.listLoading = false
+        this.dataQuery()
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error DeleteAnnouncement')
+      })
+    },
     deleteId(){
        const ids = this.deleteIds
       this.listLoading = true
 
 
     clickTitle(id) {
-      this.$router.push({ name: 'contentParticulars-details', query: { id: id }})
+      this.$router.push({ name: 'shop-edit', query: { id: id }})
     },
     formatDate(val) {
       if (val === null) {