From da8cca4d320908b672f439369e65e9e6a95374e3 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 07 三月 2022 09:46:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/partyBuilding_lyq' into hemenkou_dev

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsMerchantDTO.java |   91 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 91 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsMerchantDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsMerchantDTO.java
new file mode 100644
index 0000000..b4fc5b1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsMerchantDTO.java
@@ -0,0 +1,91 @@
+package com.panzhihua.common.model.dtos.community.microCommercialStreet;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: McsMerchantDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description:
+ * @author: hans
+ * @date: 2021/12/28 14:32
+ */
+@Data
+@ApiModel("新增/编辑微商业街商家")
+public class McsMerchantDTO {
+
+    @ApiModelProperty("微商业街商家ID")
+    @NotNull(groups = {PutGroup.class}, message = "微商业街商家ID不能为空")
+    private Long id;
+
+    @ApiModelProperty("商家名称")
+    @NotBlank(groups = {AddGroup.class}, message = "商家名称不能为空")
+    private String name;
+
+    @ApiModelProperty("手机号")
+    @Pattern(groups = {AddGroup.class}, message = "手机号格式错误", regexp = "^(13[0-9]|14[01456879]|15[0-3,5-9]|16[2567]|17[0-8]|18[0-9]|19[0-3,5-9])\\d{8}$")
+    private String phone;
+
+    @ApiModelProperty("商家级别(1.临时商家 2.合作商家)")
+    @NotNull(groups = {AddGroup.class}, message = "商家级别不能为空")
+    private Integer level;
+
+    @ApiModelProperty("点亮天数")
+    @NotNull(groups = {AddGroup.class}, message = "点亮天数不能为空")
+    private Integer litDays;
+
+    @ApiModelProperty("商家账号")
+    @NotBlank(groups = {AddGroup.class}, message = "商家账号不能为空")
+    private String account;
+
+    @ApiModelProperty("密码")
+//    @Pattern(groups = {AddGroup.class}, message = "请输入8-12位密码,由英文,数字和特殊符号组成",
+//            regexp = "^(?=.*[A-Za-z])(?=(.*[\\d]){1,})(?=(.*[\\W]){1,})(?!.*\\s).{8,12}$")
+    @NotBlank(groups = {AddGroup.class}, message = "密码不能为空")
+    private String password;
+
+    @ApiModelProperty("账号状态(1.启用 2.禁用)")
+    @NotNull(groups = {AddGroup.class}, message = "账号状态不能为空")
+    private Integer accountStatus;
+
+    @ApiModelProperty("商家logo")
+    private String logo;
+
+    @ApiModelProperty("戳戳点亮上限(发布次数上限)")
+    private Integer publishLimit;
+
+    @ApiModelProperty("商家地址")
+    private String address;
+
+    @ApiModelProperty("纬度")
+    private String lat;
+
+    @ApiModelProperty("经度")
+    private String lon;
+
+    @ApiModelProperty("商家介绍")
+    private String introduction;
+
+    @ApiModelProperty(value = "创建人", hidden = true)
+    private Long createdBy;
+
+    @ApiModelProperty(value = "更新人", hidden = true)
+    private Long updatedBy;
+
+    @ApiModelProperty(value = "所属商家", hidden = true)
+    private Long userId;
+
+    @ApiModelProperty(value = "用户头像", hidden = true)
+    private String imageUrl;
+
+    @ApiModelProperty(value = "openId", hidden = true)
+    private String openId;
+}
\ No newline at end of file

--
Gitblit v1.7.1