java/zhihuishenqu.git

			@@ -1,16 +1,11 @@
			package com.panzhihua.common.model.vos.community.convenient;

			import com.fasterxml.jackson.annotation.JsonFormat;
			import com.fasterxml.jackson.databind.annotation.JsonSerialize;
			import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
			import com.panzhihua.common.enums.MerchantBusinessPeriod;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			import lombok.Data;

			import java.math.BigDecimal;
			import java.util.Date;
			import java.util.List;

			/**
			* @title: ConvenientMerchantVO
			@@ -24,8 +19,7 @@
			public class JinhuiConvenientMerchantVO {

			@ApiModelProperty("商家ID")
			@JsonSerialize(using = ToStringSerializer.class)
			private Long id;
			private String id;

			@ApiModelProperty("商家名称")
			private String name;
			@@ -35,9 +29,6 @@

			@ApiModelProperty("联系人")
			private String contacts;

			@ApiModelProperty("负责人身份证号码")
			private String idCard;

			@ApiModelProperty("咨询电话")
			private String phone;
			@@ -51,80 +42,40 @@
			@ApiModelProperty("经度")
			private String lon;

			@ApiModelProperty("营业开始时间")
			@JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
			private Date beginAt;
			@ApiModelProperty("商家详细地址")
			private String detailedAddress;

			@ApiModelProperty("营业截止时间")
			@JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
			private Date endAt;

			@ApiModelProperty("营业周期")
			private MerchantBusinessPeriod period;

			@ApiModelProperty("商家介绍")
			private String introduction;

			@ApiModelProperty("营业状态")
			private Integer businessStatus;

			@ApiModelProperty("总咨询量")
			private Integer consultationVolume;
			@ApiModelProperty("是否删除")
			private String isDel;

			@ApiModelProperty("月咨询量")
			private Integer monthConsultationVolume;

			@ApiModelProperty("日咨询量")
			private Integer dayConsultationVolume;
			@ApiModelProperty("创建时间")
			@JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
			private Date createdAt;

			@ApiModelProperty("总浏览量")
			private Integer viewNum;

			@ApiModelProperty("月浏览量")
			private Integer monthViewNum;
			@ApiModelProperty("创建人")
			private String createdBy;

			@ApiModelProperty("日总浏览量")
			private Integer dayViewNum;

			@ApiModelProperty("商家绑定账户")
			private String account;
			@ApiModelProperty("更新时间")
			@JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
			private Date updatedAt;

			@ApiModelProperty("商家账户状态（1.启用 2.禁用）")
			private Integer accountStatus;

			@ApiModelProperty("所属社区id")
			private String communityId;
			@ApiModelProperty("商家类型id")
			private String convenientType;

			@ApiModelProperty("所属社区名称")
			private String communityName;
			@ApiModelProperty("商家类型名称")
			private String convenientName;

			@ApiModelProperty("服务范围，多个服务类型','拼接")
			private String serviceScope;

			@ApiModelProperty("服务类型id列表")
			private List<String> serviceIds;

			@ApiModelProperty("该商家存有商品，最多返回两条")
			private List<ConvenientProductVO> productVOList;

			@ApiModelProperty("服务范围")
			private Integer serviceRange;

			@ApiModelProperty("手机号")
			private String mobilePhone;

			@ApiModelProperty("店铺销量")
			private Integer sale;

			@ApiModelProperty("店铺销售额")
			private BigDecimal saleVolume;

			@ApiModelProperty("详细地址")
			private String detailedAddress;

			@ApiModelProperty("商家评分")
			private BigDecimal score;

			@ApiModelProperty("商家图片")
			private String imgUrl;

			@ApiModelProperty("审核状态（1待审核 2已通过 3未通过）")
			private String auditType;
			@@ -132,11 +83,7 @@
			@ApiModelProperty("审核意见")
			private String auditOpinion;

			public void setPeriod(String period) {
			this.period = MerchantBusinessPeriod.valueOf(period);
			}

			public void setBusinessStatus(Boolean businessStatus) {
			this.businessStatus = businessStatus ? 1 : 0;
			}


			}