Merge remote-tracking branch 'origin/dev_merchant' into dev_merchant

liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/param/MerchantFieldApplyParam.java

@@ -22,64 +22,49 @@ public class MerchantFieldApplyParam implements java.io.Serializable {
     @Size(max = 30, message = "场地长度限制1-30位")
     @NotBlank(message = "名称不能为空")
     private String name;
-
     @ApiModelProperty(position = 12, required = true, value = "logo图", example = "https://img.zhengzai.tv/partner/2019/05/14/5cda2d0520177.png")
     @NotNull(message = "logo图不能为空")
     private String logo;
-
     @ApiModelProperty(position = 13, required = true, value = "背景图", example = "https://img.zhengzai.tv/partner/2019/05/14/5cda2d0520177.png")
     @NotNull(message = "背景图不能为空")
     private String background;
-
     @ApiModelProperty(position = 14, required = true, value = "介绍[1000]", example = "这是一段介绍文字")
     private String description;
-
     @ApiModelProperty(position = 15, required = true, value = "建立日期[YYYY-MM-DD]", example = "2021-05-17")
-    @Pattern(regexp = LnsRegex.Valid.DATETIME_YMD, message = "日期格式有误")
+    @Pattern(regexp = LnsRegex.Valid.DATETIME_YMD, message = "建立日期格式有误")
     private String builtDate;
 
     @ApiModelProperty(position = 16, required = true, value = "省id")
     private String provinceId;
-
     @ApiModelProperty(position = 17, required = true, value = "省名称")
     private String provinceName;
-
     @ApiModelProperty(position = 18, required = true, value = "城市id")
     private String cityId;
-
     @ApiModelProperty(position = 19, required = true, value = "城市名称")
     private String cityName;
-
     @ApiModelProperty(position = 20, required = true, value = "县id")
     private String districtId;
-
     @ApiModelProperty(position = 21, required = true, value = "县名称")
     private String districtName;
-
     @ApiModelProperty(position = 22, required = true, value = "详细地址[100]", example = "广渠路1号创1958园区")
     @Size(max = 100, message = "已超出详细地址长度限制")
     private String address;
-
     @ApiModelProperty(position = 23, required = true, value = "经度")
     private String longitude;
-
     @ApiModelProperty(position = 24, required = true, value = "纬度")
     private String latitude;
 
     @ApiModelProperty(position = 25, required = true, value = "联系人姓名", example = "张三")
     private String contactName;
-
     @ApiModelProperty(position = 26, required = true, value = "联系人邮箱", example = "zhangsan@zhengzai.tv")
     private String contactEmail;
 
     @ApiModelProperty(position = 27, required = true, value = "企业名称")
     @NotBlank(message = "企业名称不能为空")
     private String companyName;
-
     @ApiModelProperty(position = 28, required = true, value = "营业执照编号")
     @NotBlank(message = "营业执照编号不能为空")
     private String licenseCode;
-
     @ApiModelProperty(position = 29, required = true, value = "营业执照图片")
     @NotBlank(message = "营业执照图片不能为空")
     private String licenseImg;
@@ -87,17 +72,14 @@ public class MerchantFieldApplyParam implements java.io.Serializable {
     @ApiModelProperty(position = 30, required = true, value = "法人姓名", example = "李四")
     @NotBlank(message = "法人姓名不能为空")
     private String legalName;
-
     @ApiModelProperty(position = 31, required = true, value = "法人身份证号码")
     @Pattern(regexp = LnsRegex.Valid.LETTER_NUMBER, message = "证件号格式有误")
     @Size(min = 1, max = 30, message = "证件号长度限制1-30位")
     @NotBlank(message = "证件号不能为空")
     private String legalIdentity;
-
     @ApiModelProperty(position = 32, required = true, value = "法人身份证正面照")
     @NotNull(message = "法人身份证正面照不能为空")
     private String legalIdentityObverse;
-
     @ApiModelProperty(position = 33, required = true, value = "法人身份证反面照")
     @NotNull(message = "法人身份证反面照不能为空")
     private String legalIdentityReverse;

liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/param/MerchantSponsorApplyParam.java

+package com.liquidnet.service.merchant.dto.param;
+
+
+import com.liquidnet.commons.lang.constant.LnsRegex;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+@ApiModel(value = "MerchantSponsorApplyParam", description = "创建主办入参")
+@Data
+public class MerchantSponsorApplyParam implements java.io.Serializable  {
+    private static final long serialVersionUID = 5869673418720222889L;
+
+    @ApiModelProperty(position = 11, required = true, value = "主办名称[30]", example = "测试")
+    @Size(max = 30, message = "主办名称长度限制1-30位")
+    @NotBlank(message = "名称不能为空")
+    private String name;
+    @ApiModelProperty(position = 12, required = true, value = "logo图", example = "https://img.zhengzai.tv/partner/2019/05/14/5cda2d0520177.png")
+    @NotNull(message = "logo图不能为空")
+    private String logo;
+    @ApiModelProperty(position = 13, required = true, value = "背景图", example = "https://img.zhengzai.tv/partner/2019/05/14/5cda2d0520177.png")
+    @NotNull(message = "背景图不能为空")
+    private String background;
+    @ApiModelProperty(position = 14, required = true, value = "介绍[1000]", example = "这是一段介绍文字")
+    private String description;
+
+    @ApiModelProperty(position = 15, required = true, value = "联系人姓名", example = "张三")
+    private String contactName;
+    @ApiModelProperty(position = 16, required = true, value = "联系人身份证号码", example = "102030199012120101")
+    private String contactIdentity;
+    @ApiModelProperty(position = 17, required = true, value = "联系人身份证正面照")
+    private String contactIdentityObverse;
+    @ApiModelProperty(position = 18, required = true, value = "联系人身份证反面照")
+    private String contactIdentityReverse;
+    @ApiModelProperty(position = 19, required = true, value = "联系人邮箱", example = "zhangsan@zhengzai.tv")
+    private String contactEmail;
+
+    @ApiModelProperty(position = 20, required = false, value = "企业名称")
+    private String companyName;
+    @ApiModelProperty(position = 21, required = false, value = "营业执照编号")
+    private String licenseCode;
+    @ApiModelProperty(position = 22, required = false, value = "营业执照图片")
+    private String licenseImg;
+
+    @ApiModelProperty(position = 23, required = false, value = "法人姓名", example = "李四")
+    private String legalName;
+    @ApiModelProperty(position = 24, required = false, value = "法人身份证号码")
+    @Pattern(regexp = LnsRegex.Valid.LETTER_NUMBER, message = "证件号格式有误")
+    @Size(min = 1, max = 30, message = "证件号长度限制1-30位")
+    private String legalIdentity;
+    @ApiModelProperty(position = 25, required = false, value = "法人身份证正面照")
+    private String legalIdentityObverse;
+    @ApiModelProperty(position = 26, required = false, value = "法人身份证反面照")
+    private String legalIdentityReverse;
+}

liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/vo/MerchantFieldAppliesVo.java

@@ -7,8 +7,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 
 @ApiModel(value = "MerchantFieldAppliesVo", description = "申请的场地")
 @Data
@@ -38,7 +38,7 @@ public class MerchantFieldAppliesVo implements java.io.Serializable, Cloneable {
     @ApiModelProperty(position = 19, value = "介绍[1000]")
     private String description;
     @ApiModelProperty(position = 20, value = "建立日期[YYYY-MM-DD]")
-    private LocalDate builtDate;
+    private String builtDate;
 
     @ApiModelProperty(position = 21, value = "省id")
     private String provinceId;
@@ -114,7 +114,7 @@ public class MerchantFieldAppliesVo implements java.io.Serializable, Cloneable {
         this.setLogo(source.getLogo());
         this.setBackground(source.getBackground());
         this.setDescription(source.getDescription());
-        this.setBuiltDate(source.getBuiltDate());
+        this.setBuiltDate(source.getBuiltDate().format(DateTimeFormatter.ofPattern(DateUtil.DATE_SMALL_STR)));
 
         this.setProvinceId(source.getProvinceId());
         this.setProvinceName(source.getProvinceName());

liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/vo/MerchantFieldCheckersVo.java

@@ -9,7 +9,7 @@ import lombok.Data;
 
 import java.time.LocalDateTime;
 
-@ApiModel(value = "MerchantFieldAppliesVo", description = "申请的场地")
+@ApiModel(value = "MerchantFieldAppliesVo", description = "场地默认验票员")
 @Data
 public class MerchantFieldCheckersVo implements java.io.Serializable, Cloneable  {
     private static final long serialVersionUID = 5965779904967405763L;

liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/vo/MerchantFieldsVo.java

@@ -2,14 +2,13 @@ package com.liquidnet.service.merchant.dto.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.liquidnet.commons.lang.util.DateUtil;
-import com.liquidnet.service.merchant.entity.MerchantFieldApplies;
 import com.liquidnet.service.merchant.entity.MerchantFields;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 
 @ApiModel(value = "MerchantFieldsVo", description = "场地")
 @Data
@@ -19,7 +18,7 @@ public class MerchantFieldsVo implements java.io.Serializable, Cloneable {
     @ApiModelProperty(position = 11, value = "场地ID")
     private String fieldId;
 
-    @ApiModelProperty(position = 12, value = "上线状态 0下线 1下线")
+    @ApiModelProperty(position = 12, value = "上线状态 0下线 1上线")
     private Integer isOnline;
     @ApiModelProperty(position = 13, value = "认领状态 0未认领 1已认领 2认领中")
     private Integer claimStatus;
@@ -37,7 +36,7 @@ public class MerchantFieldsVo implements java.io.Serializable, Cloneable {
     @ApiModelProperty(position = 19, value = "介绍[1000]")
     private String description;
     @ApiModelProperty(position = 20, value = "建立日期[YYYY-MM-DD]")
-    private LocalDate builtDate;
+    private String builtDate;
 
     @ApiModelProperty(position = 21, value = "省id")
     private String provinceId;
@@ -96,7 +95,7 @@ public class MerchantFieldsVo implements java.io.Serializable, Cloneable {
         this.setLogo(source.getLogo());
         this.setBackground(source.getBackground());
         this.setDescription(source.getDescription());
-        this.setBuiltDate(source.getBuiltDate());
+        this.setBuiltDate(source.getBuiltDate().format(DateTimeFormatter.ofPattern(DateUtil.DATE_SMALL_STR)));
 
         this.setProvinceId(source.getProvinceId());
         this.setProvinceName(source.getProvinceName());

liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/vo/MerchantSponsorAppliesVo.java

 package com.liquidnet.service.merchant.dto.vo;
 
-public class MerchantSponsorAppliesVo {
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.merchant.entity.MerchantSponsorApplies;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@ApiModel(value = "MerchantSponsorAppliesVo", description = "申请的主办")
+@Data
+public class MerchantSponsorAppliesVo implements java.io.Serializable, Cloneable {
+    private static final long serialVersionUID = -4495918133684950796L;
+
+    @ApiModelProperty(position = 10, value = "主办申请ID")
+    private String sponsorApplyId;
+    @ApiModelProperty(position = 11, value = "主办申请状态 0-待审核 1-通过 2-驳回")
+    private Integer applyStatus;
+    @ApiModelProperty(position = 12, value = "主办申请类型 create-创建")
+    private String applyType;
+    @ApiModelProperty(position = 13, value = "驳回原因")
+    private String reject;
+    @ApiModelProperty(position = 14, value = "用户ID")
+    private String uid;
+
+    @ApiModelProperty(position = 15, value = "主办ID")
+    private String name;
+    @ApiModelProperty(position = 16, value = "logo图片地址")
+    private String logo;
+    @ApiModelProperty(position = 17, value = "背景图片地址")
+    private String background;
+    @ApiModelProperty(position = 18, value = "介绍")
+    private String description;
+
+    @ApiModelProperty(position = 19, value = "联系人姓名")
+    private String contactName;
+    @ApiModelProperty(position = 20, value = "联系人身份证号码")
+    private String contactIdentity;
+    @ApiModelProperty(position = 21, value = "联系人身份证正面照")
+    private String contactIdentityObverse;
+    @ApiModelProperty(position = 22, value = "联系人身份证反面照")
+    private String contactIdentityReverse;
+    @ApiModelProperty(position = 23, value = "联系人邮箱")
+    private String contactEmail;
+
+    @ApiModelProperty(position = 24, value = "企业名称")
+    private String companyName;
+    @ApiModelProperty(position = 25, value = "营业执照编号")
+    private String licenseCode;
+    @ApiModelProperty(position = 26, value = "营业执照图片地址")
+    private String licenseImg;
+
+    @ApiModelProperty(position = 27, value = "法人姓名")
+    private String legalName;
+    @ApiModelProperty(position = 28, value = "法人身份证号码")
+    private String legalIdentity;
+    @ApiModelProperty(position = 29, value = "法人身份证正面照")
+    private String legalIdentityObverse;
+    @ApiModelProperty(position = 30, value = "法人身份证反面照")
+    private String legalIdentityReverse;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime deletedAt;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime createdAt;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime updatedAt;
+
+
+    private static final MerchantSponsorAppliesVo obj = new MerchantSponsorAppliesVo();
+
+    public static MerchantSponsorAppliesVo getNew() {
+        try {
+            return (MerchantSponsorAppliesVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new MerchantSponsorAppliesVo();
+    }
+
+    public MerchantSponsorAppliesVo copy(MerchantSponsorApplies source) {
+        if (null == source) return this;
+
+        this.setSponsorApplyId(source.getSponsorApplyId());
+        this.setApplyStatus(source.getApplyStatus());
+        this.setApplyType(source.getApplyType());
+        this.setReject(source.getReject());
+        this.setUid(source.getUid());
+
+        this.setName(source.getName());
+        this.setLogo(source.getLogo());
+        this.setBackground(source.getBackground());
+        this.setDescription(source.getDescription());
+
+        this.setContactName(source.getContactName());
+        this.setContactIdentity(source.getContactIdentity());
+        this.setContactIdentityObverse(source.getContactIdentityObverse());
+        this.setContactIdentityReverse(source.getContactIdentityReverse());
+        this.setContactEmail(source.getContactEmail());
+
+        this.setCompanyName(source.getCompanyName());
+        this.setLicenseCode(source.getLicenseCode());
+        this.setLicenseImg(source.getLicenseImg());
+
+        this.setLegalName(source.getLegalName());
+        this.setLegalIdentity(source.getLegalIdentity());
+        this.setLegalIdentityObverse(source.getLegalIdentityObverse());
+        this.setLegalIdentityReverse(source.getLegalIdentityReverse());
+
+        this.setCreatedAt(source.getCreatedAt());
+        this.setUpdatedAt(source.getUpdatedAt());
+        this.setDeletedAt(source.getDeletedAt());
+
+        return this;
+    }
 }

liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/vo/MerchantSponsorsVo.java

 package com.liquidnet.service.merchant.dto.vo;
 
-public class MerchantSponsorsVo {
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@ApiModel(value = "MerchantSponsorsVo", description = "主办")
+@Data
+public class MerchantSponsorsVo implements java.io.Serializable{
+    private static final long serialVersionUID = -5422950992644764083L;
+
 }

liquidnet-bus-do/liquidnet-service-merchant-do/src/main/java/com/liquidnet/service/merchant/entity/MerchantFieldApplies.java

@@ -46,7 +46,7 @@ public class MerchantFieldApplies implements Serializable {
     private String reject;
 
     /**
-     * 场地申请者账号
+     * 申请者账号
      */
     private String uid;
 

liquidnet-bus-do/liquidnet-service-merchant-do/src/main/java/com/liquidnet/service/merchant/entity/MerchantFields.java

@@ -31,7 +31,7 @@ public class MerchantFields implements Serializable {
     private String fieldId;
 
     /**
-     * 上线状态 0下线 1下线
+     * 上线状态 0下线 1上线
      */
     private Integer isOnline;
 

liquidnet-bus-do/liquidnet-service-merchant-do/src/main/java/com/liquidnet/service/merchant/entity/MerchantSponsorApplies.java

@@ -45,7 +45,7 @@ public class MerchantSponsorApplies implements Serializable {
     private String reject;
 
     /**
-     * 场地申请者账号
+     * 申请者账号
      */
     private String uid;
 

liquidnet-bus-do/liquidnet-service-merchant-do/src/main/java/com/liquidnet/service/merchant/entity/MerchantSponsors.java

@@ -30,7 +30,7 @@ public class MerchantSponsors implements Serializable {
     private String sponsorId;
 
     /**
-     * 上线状态 0下线 1下线
+     * 上线状态 0下线 1上线
      */
     private Integer isOnline;
 

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/docu/db_merchant.sql

@@ -8,7 +8,7 @@ create table merchant_fields
 (
     mid           bigint unsigned auto_increment primary key,
     field_id      varchar(64)             not null comment 'field_id',
-    is_online     tinyint      default 0  not null comment '上线状态 0下线 1下线',
+    is_online     tinyint      default 0  not null comment '上线状态 0下线 1上线',
     claim_status  tinyint      default 0  not null comment '认领状态 0未认领 1已认领 2认领中',
     uid           varchar(64)  default '' not null comment '场地所有者账号',
     is_check      tinyint      default 0  not null comment '审核演出开关 0不审 1审核',
@@ -69,7 +69,7 @@ create table merchant_field_applies
     apply_status           tinyint      default 0  not null comment '申请状态 0待审核 1通过 2驳回',
     apply_type             varchar(255) default '' not null comment '类型 claim认领、create创建',
     reject                 varchar(255) default '' not null comment '驳回原因',
-    uid                    varchar(64)  default '' not null comment '场地申请者账号',
+    uid                    varchar(64)  default '' not null comment '申请者账号',
     field_id               varchar(64)  default '' not null comment '要认领的或创建的场地ID',
     name                   varchar(255) default '' not null comment '名称',
     logo                   varchar(255) default '' not null comment 'logo图片地址',
@@ -110,7 +110,7 @@ create table merchant_sponsors
 (
     mid                      bigint unsigned auto_increment primary key,
     sponsor_id               varchar(64)             not null comment 'sponsor_id',
-    is_online                tinyint      default 0  not null comment '上线状态 0下线 1下线',
+    is_online                tinyint      default 0  not null comment '上线状态 0下线 1上线',
     uid                      varchar(64)  default '' not null comment '主办所有者账号',
     name                     varchar(255) default '' not null comment '名称',
     logo                     varchar(255) default '' not null comment 'logo图片地址',
@@ -140,7 +140,7 @@ create table merchant_sponsor_applies
     apply_status             tinyint      default 0  not null comment '申请状态 0待审核 1通过 2驳回',
     apply_type               varchar(255) default '' not null comment '类型 create创建',
     reject                   varchar(255) default '' not null comment '驳回原因',
-    uid                      varchar(64)  default '' not null comment '场地申请者账号',
+    uid                      varchar(64)  default '' not null comment '申请者账号',
     name                     varchar(255) default '' not null comment '名称',
     logo                     varchar(255) default '' not null comment 'logo图片地址',
     background               varchar(255) default '' not null comment '背景图片地址',