1

uni_merchants_enter/pageA/enter/homestay.vue

@@ -50,7 +50,7 @@
 						</u-input>
 					</u-form-item>
 				</u-form-item>
-				<!-- <u-form-item>
+				<u-form-item>
 					<view class="flex service align-center">
 						<view @click='' :class='consentStatus?"icon_merchants_entergouxuan":"icon_merchants_enterweigouxuan"' class="iconfont_no"></view>
 						我已阅读并同意
@@ -58,7 +58,7 @@
 							url="/pageA/webview?can_share=false&url=https://liangxin.zthymaoyi.com/userAgreement.html"
 							class="path" hover-class="navigator-hover">《民宿入驻协议》</navigator>的相关规定
 					</view>
-				</u-form-item> -->
+				</u-form-item>
 			</u--form>
 			<view class="footer">
 				<button @click='submit' class="submit">提交</button>
@@ -77,6 +77,7 @@
 			return {
 				form:{
 					commonId:uni.getStorageSync("userInfo").id,
+					type:"1",
 				},
 				consentStatus:false,
 				tips:'发送验证码',

uni_merchants_enter/pageA/enter/hotel.vue

@@ -1,22 +1,270 @@
 <template>
-	<view>
-		
+	<view class='content'>
+		<view class='wrap'>
+			<u--form  ref="uForm">
+				<u-form-item labelWidth='80' labelPosition='top' label="营业执照">
+					<u-upload height='208' width='320' :fileList="fileList2" @afterRead="afterRead($event,1)" @delete="deletePic" name="2" multiple
+						:maxCount="1">
+						<image style='width:680rpx;height:417rpx;' src="../../static/image/enter/yingyezhizhao.png" mode=""></image>
+					</u-upload>
+				</u-form-item>
+				<uni-calendar
+				   :insert="false"
+				   :lunar="true" 
+					ref="calendar"
+				   :start-date="startDate"
+				   @confirm="confirm"
+				    />
+					<u-form-item  labelWidth='150' labelPosition='left' label="酒店名称">
+						<u-input inputAlign='right' border='none' placeholder='输入酒店名称' v-model="form.hotelName" />
+					</u-form-item>
+					<u-form-item labelWidth='80' labelPosition='left' @click='placeSelect(),hideKeyboard()' label="店铺位置">
+						<view style='text-align:right;' v-if="form.province">{{ form.province }}{{ form.city }}{{ form.area }}</view>
+						<view style='text-align:right;' v-else>
+							<text style='text-align:right;'>选择位置 </text>
+							<image src="@/static/image/yjt.png" mode=""
+								style="margin-left:10rpx;width:12rpx;height: 21rpx;"></image>
+						</view>
+					</u-form-item>
+					<u-form-item labelWidth='80' labelPosition='left' label="详细地址">
+						<u-input inputAlign='right' maxlength="15" border='none' placeholder='输入详细地址，不超过15个字' v-model="form.detailedAddress" />
+					</u-form-item>
+					<u-form-item  labelWidth='150' labelPosition='left' label="法人姓名">
+						<u-input inputAlign='right' border='none' placeholder='输入法人姓名' v-model="form.legalName" />
+					</u-form-item>
+					<u-form-item  labelWidth='150' labelPosition='left' label="联系人">
+						<u-input inputAlign='right' border='none' placeholder='输入联系人姓名' v-model="form.realname" />
+					</u-form-item>
+					<u-form-item  labelWidth='150' labelPosition='left' label="手机号">
+						<u-input inputAlign='right' border='none' placeholder='输入手机号' v-model="form.phone" />
+					</u-form-item>
+					<u-form-item  labelWidth='150' labelPosition='left' label="验证码">
+						<u-input inputAlign='right' border='none' placeholder='输入验证码' v-model="form.verifyCode" >
+							<template slot="suffix">
+								<u-code ref="uCode"
+									@change="codeChange"
+									seconds="60"
+									changeText="X秒重新获取"
+								></u-code>
+
+								<view class='get_code' @click='getCode'>{{tips}}</view>
+							</template>
+						</u-input>
+					</u-form-item>
+				</u-form-item>
+				<u-form-item  labelWidth='150' labelPosition='left' label="酒店座机(选填)">
+					<u-input inputAlign='right' border='none' placeholder='输入座机号' v-model="form.landlinePhone" />
+				</u-form-item>
+				<u-form-item>
+					<view class="flex service align-center">
+						<view @click='' :class='consentStatus?"icon_merchants_entergouxuan":"icon_merchants_enterweigouxuan"' class="iconfont_no"></view>
+						我已阅读并同意
+						<navigator
+							url="/pageA/webview?can_share=false&url=https://liangxin.zthymaoyi.com/userAgreement.html"
+							class="path" hover-class="navigator-hover">《酒店入驻协议》</navigator>的相关规定
+					</view>
+				</u-form-item>
+			</u--form>
+			<view class="footer">
+				<button @click='submit' class="submit">提交</button>
+			</view>
+			<u-modal :show="isSubmit" :content='content' @confirm="$u.debounce(confirmSubmit, 500)" showCancelButton
+				@cancel="isSubmit=false" @close="isSubmit=false" closeOnClickOverlay></u-modal>
+		</view>
 	</view>
 </template>
 
 <script>
+	var that
+	import uploadImage from '@/components/ossutil/uploadFile.js';
 	export default {
 		data() {
 			return {
-				
+				form:{
+					commonId:uni.getStorageSync("userInfo").id,
+					type:"2",
+				},
+				consentStatus:false,
+				tips:'发送验证码',
+				startDate:'',
+				isSubmit:false,
+				fileList2:[],
+				content:'确定提交入驻信息',
 			}
 		},
+		onLoad() {
+			that = this
+		},
+		onShow(){
+			var date = new Date().toISOString().slice(0, 10)
+			this.startDate=date
+		},
 		methods: {
-			
+			codeChange(text) {
+			    this.tips = text;
+			},
+			getCode() {
+				if(!this.form.phone){
+					uni.showToast({
+						icon: "none",
+						title: '请输入手机号再获取验证码！',
+						duration: 2000
+					});
+					return
+				}
+			    if (this.$refs.uCode.canGetCode) {
+			         // 模拟向后端请求验证码
+			        uni.showLoading({
+			        title: '正在获取验证码'
+			        })
+					this.$request.baseRequest('user', 'sendVerifyCode', {
+						phone: this.form.phone
+					}, failres => {
+						uni.showToast({
+							icon: "none",
+							title: failres.errmsg,
+							duration: 3000
+						});
+						uni.hideLoading()
+					}).then(res => {
+						
+								
+					})
+			        setTimeout(() => {
+			            uni.hideLoading();
+			            // 这里此提示会被this.start()方法中的提示覆盖
+			         
+			            // 通知验证码组件内部开始倒计时
+			            this.$refs.uCode.start();
+			        }, 2000);
+			    } else {
+			        uni.showToast({
+			        	icon: "success",
+			        	title: '提交成功！',
+			        	duration: 2000
+			        });
+			    }
+			},
+			submit(){
+				this.isSubmit = true
+			},
+			placeSelect() {
+				uni.chooseLocation({
+					success: function(res) {
+						console.log(res);
+						that.form.location = res.latitude + ',' + res.longitude
+						let _address = that.$helper.formatLocation(res.address)
+						console.log(_address)
+						that.form.province = _address.Province
+						that.form.city = _address.City
+						that.form.area = _address.Country
+						that.form.detailedAddress = _address.Village
+						that.$forceUpdate()
+					}
+				});
+			},
+			hideKeyboard() {
+				uni.hideKeyboard()
+			},
+			confirmSubmit(){
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				})
+				this.$request.baseRequest('admin.tourism.homestayInfo', 'add', {
+					homestayInfo: JSON.stringify(this.form)
+				}, failres => {
+					uni.showToast({
+						icon: "none",
+						title: failres.errmsg,
+						duration: 3000
+					});
+							
+					uni.hideLoading()
+				}).then(res => {
+					this.isSubmit = false
+					uni.showToast({
+						icon: "success",
+						title: '提交成功，请等待平台审核',
+						duration: 2000
+					});
+					uni.navigateBack()
+							
+				})
+			},
+			// 删除图片
+			deletePic(event,status) {
+				this[`fileList${event.name}`].splice(event.index, 1)
+			},
+			// 新增图片
+			async afterRead(event,status) {
+				// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
+				let lists = [].concat(event.file)
+				let fileListLen = this[`fileList${event.name}`].length
+				lists.map((item) => {
+					this[`fileList${event.name}`].push({
+						...item,
+						status: 'uploading',
+						message: '上传中'
+					})
+				})
+				for (let i = 0; i < lists.length; i++) {
+					const result = await this.uploadFilePromise(lists[i].url,status)
+					
+					let item = this[`fileList${event.name}`][fileListLen]
+					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
+						status: 'success',
+						message: '',
+						url: result
+					}))
+					fileListLen++
+					console.log(that.form, this[`fileList${event.name}`])
+					
+				}
+			},
+			uploadFilePromise(res,status) {
+				return new Promise((resolve, reject) => {
+					uploadImage(res, 'cardImages/',
+						result => {
+							if(status==1){
+								that.form.businessLicense = result
+							}
+							resolve(res)
+						}
+					)
+				})
+			},
 		}
 	}
 </script>
 
-<style>
+<style lang='scss' scoped>
+ .wrap{
+	 padding:20rpx;
+ }
+ .icon_merchants_enterjian1{
+	 margin-left:10rpx;
+	 font-size:50rpx;
+ }
+ .add_label,.get_code{
 
+	background: #5F7DE9;
+	color: #fff;
+	padding: 10rpx 20rpx;
+	border-radius: 10rpx;
+	font-size: 26rpx;
+ }
+ .circle{
+ 	margin:110rpx 0 20rpx 0;
+ }
+ .path {
+ 	color: #2772FB;
+ 
+ }
+ .icon_merchants_enterweigouxuan{
+	 color:#999;
+ }
+ .icon_merchants_entergouxuan{
+	 color:#5F7DE9;
+ }
 </style>

uni_merchants_enter/pages/notice/index.vue

@@ -37,7 +37,7 @@
 						title: '数据加载中'
 					})
 				this.$request.baseRequest('admin.tourism.noticeMessageInfo', 'list',{
-					// receiveId:uni.getStorageSync("userInfo").id,
+					receiveId:uni.getStorageSync("userInfo").id,
 				}, failres => {
 					uni.showToast({
 						icon:"none",

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/tourism/IHomestayInfoService.java

@@ -31,6 +31,7 @@ public interface IHomestayInfoService{
 							@HttpParam(name = "personNo", type = HttpParamType.COMMON, description = "身份证号") String personNo,
 							@HttpParam(name = "personImageFront", type = HttpParamType.COMMON, description = "身份证正面") String personImageFront,
 							@HttpParam(name = "personImageBack", type = HttpParamType.COMMON, description = "身份证背面") String personImageBack,
+							@HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
 							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
 							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
 							@HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "删除标识") Long deleteFlag,
@@ -46,7 +47,10 @@ public interface IHomestayInfoService{
 
 	@HttpMethod(description = "查询", permissionName = "民宿入驻信息管理")
 	public HomestayInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;
-	
+
+	@HttpMethod(description = "民宿酒店入驻审核",  permissionName = "民宿入驻信息管理")
+	public Boolean handle(@NotNull @HttpParam(name = "homestayInfo", type = HttpParamType.COMMON, description = "民宿入驻管理") HomestayInfo homestayInfo)throws ServiceException;
+
 	@HttpMethod(description = "导出excl表",  permissionName = "民宿入驻信息管理")
 	public String export(
 								@HttpParam(name = "commonId", type = HttpParamType.COMMON, description = "个人id") Long commonId,

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/tourism/impl/FoodInfoServiceImpl.java

@@ -3,19 +3,18 @@ package com.iotechn.unimall.admin.api.tourism.impl;
 import java.util.List;
 
 import com.iotechn.unimall.app.api.user.UserService;
-import com.iotechn.unimall.data.domain.NoticeMessageInfo;
-import com.iotechn.unimall.data.mapper.NoticeMessageInfoMapper;
+import com.iotechn.unimall.data.domain.*;
+import com.iotechn.unimall.data.mapper.*;
 import org.apache.ibatis.session.RowBounds;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.iotechn.unimall.core.exception.ServiceException;
 import com.iotechn.unimall.data.util.ExcelUtil;
-import com.iotechn.unimall.data.mapper.FoodInfoMapper;
-import com.iotechn.unimall.data.domain.FoodInfo;
 import com.iotechn.unimall.admin.api.tourism.IFoodInfoService;
 import com.iotechn.unimall.data.model.Page;
 import java.util.Date;
@@ -34,6 +33,12 @@ public class FoodInfoServiceImpl implements IFoodInfoService{
 	@Autowired
 	private NoticeMessageInfoMapper noticeMessageInfoMapper;
 	@Autowired
+	private DishClassifyInfoMapper dishClassifyInfoMapper;
+	@Autowired
+	private FoodDishesInfoMapper foodDishesInfoMapper;
+	@Autowired
+	private FoodGroupInfoMapper foodGroupInfoMapper;
+	@Autowired
 	private UserService userService;
 	
 	@Override
@@ -126,6 +131,18 @@ public class FoodInfoServiceImpl implements IFoodInfoService{
 				}
 							wrapper.eq("delete_flag", 0);
 		List<FoodInfo> list = foodInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+		if (!CollectionUtils.isEmpty(list)){
+			for (FoodInfo foodInfo:list) {
+				List<FoodDishesInfo> foodDishesInfoList = foodDishesInfoMapper.selectList(new EntityWrapper<FoodDishesInfo>()
+						.eq("food_id",foodInfo.getId()));
+				foodInfo.setFoodDishesInfoList(foodDishesInfoList);
+				foodInfo.setDishesNum(foodDishesInfoList.size());
+				List<FoodGroupInfo> foodGroupInfoList = foodGroupInfoMapper.selectList(new EntityWrapper<FoodGroupInfo>()
+						.eq("food_id",foodInfo.getId()));
+				foodInfo.setFoodGroupInfoList(foodGroupInfoList);
+				foodInfo.setGroupNum(foodGroupInfoList.size());
+			}
+		}
 		Integer count = foodInfoMapper.selectCount(wrapper);
 		return new Page<FoodInfo>(list, page, limit, count);
 	}
@@ -174,6 +191,22 @@ public class FoodInfoServiceImpl implements IFoodInfoService{
 			noticeMessageInfo.setGmtCreate(now);
 			noticeMessageInfo.setGmtUpdate(now);
 			noticeMessageInfoMapper.insert(noticeMessageInfo);
+			DishClassifyInfo dishClassifyInfo=new DishClassifyInfo();
+			dishClassifyInfo.setFoodId(foodInfo1.getId());
+			dishClassifyInfo.setClassifyName("荤菜");
+			dishClassifyInfo.setGmtCreate(now);
+			dishClassifyInfo.setGmtUpdate(now);
+			dishClassifyInfoMapper.insert(dishClassifyInfo);
+			dishClassifyInfo.setClassifyName("素菜");
+			dishClassifyInfoMapper.insert(dishClassifyInfo);
+			dishClassifyInfo.setClassifyName("主食");
+			dishClassifyInfoMapper.insert(dishClassifyInfo);
+			dishClassifyInfo.setClassifyName("汤品");
+			dishClassifyInfoMapper.insert(dishClassifyInfo);
+			dishClassifyInfo.setClassifyName("凉菜");
+			dishClassifyInfoMapper.insert(dishClassifyInfo);
+			dishClassifyInfo.setClassifyName("串类");
+			dishClassifyInfoMapper.insert(dishClassifyInfo);
 		}
 		return foodInfoMapper.updateById(foodInfo) > 0;
 	}

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/tourism/impl/HomestayInfoServiceImpl.java

@@ -2,6 +2,10 @@ package com.iotechn.unimall.admin.api.tourism.impl;
 
 import java.util.List;
 
+import com.iotechn.unimall.data.domain.DishClassifyInfo;
+import com.iotechn.unimall.data.domain.FoodInfo;
+import com.iotechn.unimall.data.domain.NoticeMessageInfo;
+import com.iotechn.unimall.data.mapper.NoticeMessageInfoMapper;
 import org.apache.ibatis.session.RowBounds;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,17 +32,20 @@ import org.springframework.transaction.annotation.Transactional;
 public class HomestayInfoServiceImpl implements IHomestayInfoService{
 	@Autowired
 	private HomestayInfoMapper homestayInfoMapper;
+	@Autowired
+	private NoticeMessageInfoMapper noticeMessageInfoMapper;
 	
 	@Override
 	public Boolean add(HomestayInfo homestayInfo) throws ServiceException {
 		Date now = new Date();
 		homestayInfo.setGmtCreate(now);
 		homestayInfo.setGmtUpdate(now);
+		homestayInfo.setStatus("审核中");
 		return homestayInfoMapper.insert(homestayInfo)>0;
 	}
 
 	@Override
-	public Page<HomestayInfo> list(Long commonId,String phone,String realname,String personNo,String personImageFront,String personImageBack,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
+	public Page<HomestayInfo> list(Long commonId,String phone,String realname,String personNo,String personImageFront,String personImageBack,String status,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
 		Wrapper<HomestayInfo> wrapper = new EntityWrapper<HomestayInfo>();
 														if (!StringUtils.isEmpty(commonId)) {
 					wrapper.eq("common_id", commonId);
@@ -57,6 +64,9 @@ public class HomestayInfoServiceImpl implements IHomestayInfoService{
 				}
 												if (!StringUtils.isEmpty(personImageBack)) {
 					wrapper.eq("person_image_back", personImageBack);
+				}
+												if (!StringUtils.isEmpty(status)) {
+					wrapper.eq("status", status);
 				}
 												if (!StringUtils.isEmpty(gmtCreate)) {
 					wrapper.eq("gmt_create", gmtCreate);
@@ -98,7 +108,34 @@ public class HomestayInfoServiceImpl implements IHomestayInfoService{
 	public HomestayInfo get(Long id) throws ServiceException {
 		return homestayInfoMapper.selectById(id);
 	}
-	
+
+	@Override
+	public Boolean handle(HomestayInfo homestayInfo) throws ServiceException {
+		HomestayInfo homestayInfo1=homestayInfoMapper.selectById(homestayInfo.getId());
+		Date now = new Date();
+		//驳回
+		if ("已驳回".equals(homestayInfo.getStatus())){
+			NoticeMessageInfo noticeMessageInfo=new NoticeMessageInfo();
+			noticeMessageInfo.setNewsTitle("系统消息");
+			noticeMessageInfo.setNewsContent("您的入驻申请(餐饮),未通过审核。");
+			noticeMessageInfo.setReceiveId(homestayInfo1.getCommonId());
+			noticeMessageInfo.setGmtCreate(now);
+			noticeMessageInfo.setGmtUpdate(now);
+			noticeMessageInfoMapper.insert(noticeMessageInfo);
+		}
+		//通过
+		else{
+			NoticeMessageInfo noticeMessageInfo=new NoticeMessageInfo();
+			noticeMessageInfo.setNewsTitle("系统消息");
+			noticeMessageInfo.setNewsContent("您的入驻申请(餐饮),已通过审核。");
+			noticeMessageInfo.setReceiveId(homestayInfo1.getCommonId());
+			noticeMessageInfo.setGmtCreate(now);
+			noticeMessageInfo.setGmtUpdate(now);
+			noticeMessageInfoMapper.insert(noticeMessageInfo);
+		}
+		return homestayInfoMapper.updateById(homestayInfo) > 0;
+	}
+
 	@Override
 	public String export(Long commonId,String phone,String realname,String personNo,String personImageFront,String personImageBack,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
 		Wrapper<HomestayInfo> wrapper = new EntityWrapper<HomestayInfo>();

unimall-data/src/main/java/com/iotechn/unimall/data/domain/FoodGroupInfo.java

@@ -136,7 +136,10 @@ public class FoodGroupInfo extends SuperDO{
     @Excel(name = "删除标识")
     @TableField("delete_flag")
     private Long deleteFlag;
-
+    /** 状态(未开始/活动中/已停止/已过期) */
+    @Excel(name = "状态")
+    @TableField("status")
+    private String status;
 
     @Override
     public String toString() {

unimall-data/src/main/java/com/iotechn/unimall/data/domain/FoodInfo.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.enums.FieldFill;
 import com.iotechn.unimall.core.util.StringUtils;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 餐饮入驻信息对象 food_info
@@ -161,6 +162,16 @@ public class FoodInfo extends SuperDO{
      */
     @TableField(exist = false)
     private String verifyCode;
+    @TableField(exist = false)
+    private List<FoodDishesInfo> foodDishesInfoList;
+    @TableField(exist = false)
+    private List<FoodGroupInfo> foodGroupInfoList;
+    /** 团购数 */
+    @TableField(exist = false)
+    private Integer groupNum;
+    /** 商品展示数 */
+    @TableField(exist = false)
+    private Integer dishesNum;
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

unimall-data/src/main/java/com/iotechn/unimall/data/domain/HomestayInfo.java

@@ -57,6 +57,56 @@ public class HomestayInfo extends SuperDO{
     @TableField("person_image_back")
     private String personImageBack;
 
+    /** 省 */
+    @Excel(name = "省")
+    @TableField("province")
+    private String province;
+
+    /** 市 */
+    @Excel(name = "市")
+    @TableField("city")
+    private String city;
+
+    /** 区 */
+    @Excel(name = "区")
+    @TableField("area")
+    private String area;
+
+    /** 定位 */
+    @Excel(name = "定位")
+    @TableField("location")
+    private String location;
+
+    /** 详细地址 */
+    @Excel(name = "详细地址")
+    @TableField("detailed_address")
+    private String detailedAddress;
+
+    /** 营业执照 */
+    @Excel(name = "营业执照")
+    @TableField("business_license")
+    private String businessLicense;
+
+    /** 类型(1民宿2酒店) */
+    @Excel(name = "类型(1民宿2酒店)")
+    @TableField("type")
+    private String type;
+
+    /** 酒店名称 */
+    @Excel(name = "酒店名称")
+    @TableField("hotel_name")
+    private String hotelName;
+
+    /** 法人姓名 */
+    @Excel(name = "法人姓名")
+    @TableField("legal_name")
+    private String legalName;
+
+    /** 酒店座机 */
+    @Excel(name = "酒店座机")
+    @TableField("landline_phone")
+    private String landlinePhone;
+
     /**  */
     @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
     @TableField("gmt_create")
@@ -71,7 +121,10 @@ public class HomestayInfo extends SuperDO{
     @Excel(name = "删除标识")
     @TableField("delete_flag")
     private Long deleteFlag;
-
+    /** 状态 */
+    @Excel(name = "状态")
+    @TableField("status")
+    private String status;
 
     @Override
     public String toString() {