From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientMerchantVO.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 3 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..162b304 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
@@ -1,8 +1,12 @@
package com.panzhihua.common.model.vos.community.convenient;
+import java.math.BigDecimal;
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 +24,7 @@
public class ConvenientMerchantVO {
@ApiModelProperty("商家ID")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("商家名称")
@@ -47,9 +52,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 +68,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;
@@ -71,7 +93,7 @@
private Integer accountStatus;
@ApiModelProperty("所属社区id")
- private Long communityId;
+ private String communityId;
@ApiModelProperty("所属社区名称")
private String communityName;
@@ -80,5 +102,34 @@
private String serviceScope;
@ApiModelProperty("服务类型id列表")
- private List<Long> serviceIds;
+ 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;
+
+ public void setPeriod(String period) {
+ this.period = MerchantBusinessPeriod.valueOf(period);
+ }
+
+ public void setBusinessStatus(Boolean businessStatus) {
+ this.businessStatus = businessStatus ? 1 : 0;
+ }
}
--
Gitblit v1.7.1