From 3cf73650c9043d910d2b65d77b018fe1ed2ade37 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期三, 22 九月 2021 18:55:31 +0800
Subject: [PATCH] 便民服务小程序
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientMerchantVO.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientMerchantVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientMerchantVO.java
index 85a339b..0a0893d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientMerchantVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientMerchantVO.java
@@ -3,6 +3,7 @@
import java.util.Date;
import java.util.List;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.enums.MerchantBusinessPeriod;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -47,9 +48,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 +64,11 @@
@ApiModelProperty("营业状态")
private Integer businessStatus;
- @ApiModelProperty("咨询量")
+ @ApiModelProperty("总咨询量")
private Integer consultationVolume;
+
+ @ApiModelProperty("月咨询量")
+ private Integer monthConsultationVolume;
@ApiModelProperty("商家绑定账户")
private String account;
@@ -81,4 +87,12 @@
@ApiModelProperty("服务类型id列表")
private List<Long> serviceIds;
+
+ public void setPeriod(String period) {
+ this.period = MerchantBusinessPeriod.valueOf(period);
+ }
+
+ public void setBusinessStatus(Boolean businessStatus) {
+ this.businessStatus = businessStatus ? 1 : 0;
+ }
}
--
Gitblit v1.7.1