合并

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

@@ -15,10 +15,7 @@ import com.google.common.collect.Maps;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * version V1.0
@@ -43,13 +40,9 @@ public class TpRentalHouseServicelImpl implements TpRentalHouseServicel {
         Page<TpRentalHouse> pageTpRentalHouseList = PageHelper.startPage(pageNum, pageSize);
         List<TpRentalHouse> tpRentalHouseList= tpRentalHouseMapper.getRentalHouse(houseName,rentalType,houseType,rentalPrice,priceFluctuate);
             // 把字符串转数组
-        List<String> houseLabel= new ArrayList<>();
         for (TpRentalHouse tpRentalHouse:tpRentalHouseList){
             String [] result = tpRentalHouse.getHouseLabel().split(",");
-            for(int a = 0;a<result.length;a++){
-                houseLabel.add(result[a]);
-                tpRentalHouse.setHouseLabelArr(houseLabel);
-            }
+            tpRentalHouse.setHouseLabelArr(Arrays.asList(result));
             // 根据 tpRentalHouse.getId()和img_type为2查询列表图
             List<TpRentalHouseImg> tpRentalHouseImgList= tpRentalHouseImgMapper.selectRentalHouseImg(tpRentalHouse.getId(),1);
              if (null != tpRentalHouseImgList){

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

@@ -94,10 +94,42 @@ public class TpShopServicelmpl implements TpShopServicel {
             // 查询当前商铺类型
              tpShopType= tpShopTypeMapper.selectCommunityIdShop(userElement.getCommunityId());
         }
+        //购物
+        List<String> tpShopTypeImgShop= new ArrayList<>();
+        //购物车3x
+        tpShopTypeImgShop.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557816503894.png?Expires=1559643891&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
+        //购物车2x
+        tpShopTypeImgShop.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557816639291.png?Expires=1559644026&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
+
+        //美食图片
+        List<String> tpShopTypeImgCate= new ArrayList<>();
+        // 美食图片3x
+        tpShopTypeImgCate.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557816913843.png?Expires=1559644301&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
+       // 美食图片2x
+        tpShopTypeImgCate.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557816963921.png?Expires=1559644351&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
+
+        //休闲
+        List<String> tpShopTypeImgRecreation= new ArrayList<>();
+        // 休闲3x
+        tpShopTypeImgRecreation.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557817084664.png?Expires=1559644472&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
+       // 休闲2x
+        tpShopTypeImgRecreation.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557817102003.png?Expires=1559644489&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
+
+        // 运动图片
+        List<String> tpShopTypeImgExercise= new ArrayList<>();
+        // 运动图片3x
+        tpShopTypeImgExercise.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557817239384.png?Expires=1559644626&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
+        // 运动图片2x
+        tpShopTypeImgExercise.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557817273156.png?Expires=1559644660&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
         Map<String,Object> hashMap= new HashMap<>();
         hashMap.put("tpShopType",tpShopType);
         hashMap.put("tpShopList",tpShopList);
+        hashMap.put("tpShopTypeImgShop",tpShopTypeImgShop);
+        hashMap.put("tpShopTypeImgCate",tpShopTypeImgCate);
+        hashMap.put("tpShopTypeImgRecreation",tpShopTypeImgRecreation);
+        hashMap.put("tpShopTypeImgExercise",tpShopTypeImgExercise);
         response.addSuccess(hashMap);
         return response;
+
     }
 }

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

@@ -51,7 +51,7 @@ public class HotelController extends BaseController {
         return responseBean;
     }
 
-    @ApiOperation(value = "工单列表", notes = "工单列表")
+    @ApiOperation(value = "添加房间", notes = "添加房间")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "roomNo:房间号" +
                     "roomName:房间名称" +

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

@@ -22,6 +22,7 @@
                 AND date_format(create_date, '%Y-%m-%d') <![CDATA[>= ]]> date_format(#{beginTime}, '%Y-%m-%d')
                 AND date_format(create_date, '%Y-%m-%d')<![CDATA[<= ]]> date_format(#{endTime}, '%Y-%m-%d')
             </if>
+            order by sort desc
         </where>
     </select>
 

VUECODE/smart-property-manage/src/views/grogshop/grogshopRoomAdd.vue

@@ -58,7 +58,21 @@ export default {
   },
   methods: {
     submitForm(){
+      if(this.ruleForm.roomNo =='null'){
+        this.$message.error('请输入房间号');
+      }
+      if(this.ruleForm.roomName =='null'){
+        this.$message.error('请输入房间名称');
+      }
+      if(this.ruleForm.roomNo =='null'){
+        this.$message.error('请输入房间号');
+      }
       this.$store.dispatch('HotelRoomAdd', this.ruleForm).then((res) => {
+        this.$router.push({ name: 'grogshop-grogshopRoom' })
+         this.$message({
+          message: '新增房间成功',
+          type: 'success'
+        });
       }).catch(() => {
         console.log('error HotelRoom')
       })