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/TpRentalHouseController.java

@@ -48,8 +48,8 @@ public class TpRentalHouseController extends BaseController {
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "房间编号"),
 			@ApiImplicitParam(paramType = "query", dataType = "String", name = "houseName", value = "房间名称"),
-			@ApiImplicitParam(paramType = "query", dataType = "String", name = "startPrice", value = "开始价格"),
-			@ApiImplicitParam(paramType = "query", dataType = "String", name = "endPrice", value = "结束价格"),
+			@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "startPrice", value = "开始价格"),
+			@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "endPrice", value = "结束价格"),
 			@ApiImplicitParam(paramType = "query", dataType = "String", name = "rentalType", value = "租赁方式"),
 			@ApiImplicitParam(paramType = "query", dataType = "String", name = "houseType", value = "户型"),
 			@ApiImplicitParam(paramType = "query", dataType = "String", name = "houseStatus", value = "上架状态"),
@@ -60,8 +60,8 @@ public class TpRentalHouseController extends BaseController {
 	@RequestMapping(value = "/rentals",method = RequestMethod.GET)
 	public ResponseBean getRentalList(@RequestParam(value = "id") Integer id,
 	                                @RequestParam(value = "houseName") String houseName,
-	                                @RequestParam(value = "startPrice") String startPrice,
-	                                @RequestParam(value = "endPrice") String endPrice,
+	                                @RequestParam(value = "startPrice") Integer startPrice,
+	                                @RequestParam(value = "endPrice") Integer endPrice,
 	                                @RequestParam(value = "rentalType") String rentalType,
 	                                @RequestParam(value = "houseType") String houseType,
 	                                @RequestParam(value = "houseStatus") String houseStatus,

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

@@ -210,13 +210,13 @@ public class TpRentalHouse implements Serializable {
      * 开始价格
      */
     @TableField(exist = false)
-    private String startPrice;
+    private Integer startPrice;
     
     /**
      * 结束价格
      */
     @TableField(exist = false)
-    private String endPrice;
+    private Integer endPrice;
     
     /**
      * 更新人

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

@@ -29,7 +29,7 @@ public interface ITpRentalHouseService extends IService<TpRentalHouse> {
 	 * @param pageSize
 	 * @return
 	 */
-	ResponseBean getRentalList(Integer id, String houseName, String startPrice, String endPrice, String rentalType, String houseType, String houseStatus, UserElement userElement, Integer pageNum, Integer pageSize);
+	ResponseBean getRentalList(Integer id, String houseName, Integer startPrice, Integer endPrice, String rentalType, String houseType, String houseStatus, UserElement userElement, Integer pageNum, Integer pageSize);
 	
 	/**
 	 * 保存长租公寓房间信息

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

@@ -10,6 +10,7 @@ import com.community.huiju.dao.TpRentalHouseMapper;
 import com.community.huiju.model.TpRentalHouse;
 import com.community.huiju.model.TpRentalHouseImg;
 import com.community.huiju.service.ITpRentalHouseService;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -52,7 +53,7 @@ public class TpRentalHouseServiceImpl extends ServiceImpl<TpRentalHouseMapper, T
 	 * @return
 	 */
 	@Override
-	public ResponseBean getRentalList(Integer id, String houseName, String startPrice, String endPrice, String rentalType, String houseType, String houseStatus, UserElement userElement, Integer pageNum, Integer pageSize) {
+	public ResponseBean getRentalList(Integer id, String houseName, Integer startPrice, Integer endPrice, String rentalType, String houseType, String houseStatus, UserElement userElement, Integer pageNum, Integer pageSize) {
 		ResponseBean responseBean = new ResponseBean();
 		Page page = new Page(pageNum,pageSize);
 		TpRentalHouse tpRentalHouse = new TpRentalHouse();

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

@@ -88,7 +88,9 @@ public class TpShopServiceImpl extends ServiceImpl<TpShopMapper, TpShop> impleme
 		LocalDateTime localDateTime = LocalDateTime.now();
 		shop.setCommunityId(communityId);
 		shop.setCreateUser(userElement.getId());
+		shop.setCreateDate(localDateTime);
 		shop.setUpdateDate(localDateTime);
+		shop.setUpdateUser(userElement.getId());
 		shopMapper.insert(shop);
 		//添加商铺app首页图片信息
 		TpShopImg appIndexShopImg = new TpShopImg();

VUECODE/smart-property-manage/src/views/rental/rentalIndex.vue

@@ -189,7 +189,7 @@ export default {
       }
     },
 	  search() {
-      if(this.listQuery.startPrice > this.listQuery.endPrice){
+      if(this.listQuery.startPrice != '' && this.listQuery.endPrice != '' && Number(this.listQuery.startPrice) > Number(this.listQuery.endPrice)){
           this.$message.warning("起始金额不能大于结束金额");
           return
       }

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

@@ -31,7 +31,7 @@
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
       </el-form-item>
-      <el-form-item label="app商铺轮播图" prop="appCarouselImg">
+      <el-form-item label="app商铺轮播图(最多六张)" prop="appCarouselImg">
         <el-upload
           name="uploadFiles"
           :limit="6"
@@ -48,13 +48,13 @@
       </el-form-item>
       <el-form-item label="权重" prop="sort">
         <el-input v-model="listData.sort" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
-        <span  style="font-size:9%;color:#C0C0C0">{{ '权重值越大，排序越靠前' }}</span>
+        <span>权重值越大，排序越靠前</span>
       </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>
-         <a @click="shopSetting"><span style="padding-left:4%;font-size:13%;color:#00BFFF">{{ '维护类型' }}</span></a>
+        <a @click="shopSetting"><span style="font-size:20px;padding-left:4%;color:#00BFFF">维护类型</span></a>
       </el-form-item>
       <el-form-item label="上架状态" prop="shopStatus">
         <el-select v-model="listData.shopStatus" placeholder="请选择">
@@ -69,11 +69,12 @@
         <el-input v-model="listData.shopAddress"/>
       </el-form-item>
       <el-form-item label="人均消费" prop="averagePrice">
-        <el-input v-model="listData.averagePrice" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
+        <el-input v-model="listData.averagePrice" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="单位 元/人"/>
       </el-form-item>
-      <el-form-item label="高德坐标">
+      <el-form-item label="高德坐标" prop="shopLatitude">
         <el-input placeholder="经度" v-model="listData.shopLongitude" style="width: 150px;" />
         <el-input placeholder="纬度" v-model="listData.shopLatitude" style="width: 150px;" />
+        <span>在地图上搜索选择酒店位置确定坐标值，供APP端用户导航</span>
       </el-form-item>
       <el-form-item label="">
          <!-- 地图 -->
@@ -162,6 +163,18 @@ export default {
         appCarouselImg: [
           { required: true, message: 'app商铺轮播图', trigger: 'blur' }
         ],
+        shopName: [
+          { required: true, message: '请输入商铺名称', trigger: 'blur' }
+        ],
+        shopStatus: [
+          { required: true, message: '请输入上架状态', trigger: 'blur' }
+        ],
+        shopLatitude: [
+          { required: true, message: '请输入坐标', trigger: 'blur' }
+        ],
+        averagePrice: [
+          { required: true, message: '请输入人均消费', trigger: 'blur' }
+        ]
       }
     }
   },

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

@@ -31,7 +31,7 @@
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
       </el-form-item>
-      <el-form-item label="app商铺轮播图" prop="appCarouselImg">
+      <el-form-item label="app商铺轮播图(最多六张)" prop="appCarouselImg">
         <el-upload
           name="uploadFiles"
           :limit="6"
@@ -54,6 +54,7 @@
         <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>
+        <a @click="shopSetting"><span style="font-size:20px;padding-left:4%;color:#00BFFF">维护类型</span></a>
       </el-form-item>
       <el-form-item label="上架状态" prop="shopStatus">
         <el-select v-model="listData.shopStatus" placeholder="请选择">
@@ -62,13 +63,13 @@
         </el-select>
       </el-form-item>
       <el-form-item label="联系电话" prop="shopTel">
-        <el-input v-model="listData.shopTel"/>
+        <el-input v-model="listData.shopTel" onkeyup="this.value=this.value.replace(/\D/g,'')" />
       </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-input v-model="listData.averagePrice" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="单位 元/人"/>
       </el-form-item>
       <el-form-item label="高德坐标">
         <el-input placeholder="经度" v-model="listData.shopLongitude" style="width: 150px;" />
@@ -163,6 +164,18 @@ export default {
         appCarouselImg: [
           { required: true, message: 'app商铺轮播图', trigger: 'blur' }
         ],
+        shopName: [
+          { required: true, message: '商铺名称', trigger: 'blur' }
+        ],
+        shopStatus: [
+          { required: true, message: '请输入上架状态', trigger: 'blur' }
+        ],
+        shopLatitude: [
+          { required: true, message: '请输入坐标', trigger: 'blur' }
+        ],
+        averagePrice: [
+          { required: true, message: '请输入人均消费', trigger: 'blur' }
+        ]
       }
     }
   },
@@ -258,6 +271,9 @@ export default {
       console.log(this.isRegistered)
       this.$refs[formName].resetFields()
     },
+    shopSetting(){
+       this.$router.push({ name: 'shop-setting'})
+    },
     updateShop() {
       // 加载框
       const loading = this.$loading({

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

@@ -29,6 +29,7 @@
       <el-button type="warning" @click="edit">修改</el-button>
       <el-button type="danger" @click="shelfShop">上架商铺</el-button>
       <el-button type="danger" @click="obtainedShop">下架商铺</el-button>
+      <span>注：权重最大的4个上架且有首页展示图的商铺默认会显示在APP首页（权重相同时按编辑时间从晚到早排序）</span>
     </div>
     <el-table
       v-loading="listLoading"

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

@@ -111,6 +111,7 @@ export default {
     },
     changeSetting() {
       this.ChangeShopSetting(this.shopSettingValue).then((res) => {
+        search()
       }).catch(() => {
         console.log('error shopTypeList')
       })