java/zhihuishenqu.git

			@@ -3,6 +3,9 @@
			import java.util.Date;
			import java.util.List;

			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;
			@@ -20,6 +23,7 @@
			public class ConvenientMerchantVO {

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

			@ApiModelProperty("商家名称")
			@@ -47,9 +51,11 @@
			private String lon;

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

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

			@ApiModelProperty("营业周期")
			@@ -61,8 +67,23 @@
			@ApiModelProperty("营业状态")
			private Integer businessStatus;

			@ApiModelProperty("咨询量")
			@ApiModelProperty("总咨询量")
			private Integer consultationVolume;

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

			@ApiModelProperty("日咨询量")
			private Integer dayConsultationVolume;

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

			@ApiModelProperty("月浏览量")
			private Integer monthViewNum;

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

			@ApiModelProperty("商家绑定账户")
			private String account;
			@@ -81,4 +102,15 @@

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

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

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

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