记得上下班打卡 | git大法好,push需谨慎

Commit e5223f67 authored by 张国柄's avatar 张国柄

使用会员码API+实名逻辑;

parent e722a750
...@@ -7,7 +7,7 @@ import lombok.Data; ...@@ -7,7 +7,7 @@ import lombok.Data;
@ApiModel(value = "AdamEntersParam", description = "添加/编辑入场人入参") @ApiModel(value = "AdamEntersParam", description = "添加/编辑入场人入参")
@Data @Data
public class AdamEntersParam implements java.io.Serializable { public class AdamEntersParam implements java.io.Serializable {
private static final long serialVersionUID = 5940725094369061032L; private static final long serialVersionUID = 8628253022063935727L;
@ApiModelProperty(position = 10, required = false, value = "入场人ID,编辑时必传[50]") @ApiModelProperty(position = 10, required = false, value = "入场人ID,编辑时必传[50]")
private String entersId; private String entersId;
@ApiModelProperty(position = 11, required = true, value = "入场人名称[50]", example = "Swagger") @ApiModelProperty(position = 11, required = true, value = "入场人名称[50]", example = "Swagger")
......
...@@ -5,40 +5,18 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -5,40 +5,18 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* 会员价格
*/
@ApiModel(value = "AdamMemberCodeParam", description = "添加编辑会员兑换码") @ApiModel(value = "AdamMemberCodeParam", description = "添加编辑会员兑换码")
@Data @Data
public class AdamMemberCodeParam implements Serializable { public class AdamMemberCodeParam implements Serializable {
private static final long serialVersionUID = -7273522103593077617L;
private static final long serialVersionUID = 5940725094369061032L;
/**
* 会员类型ID
*/
@ApiModelProperty(position = 1, required = false, value = "会员类型ID") @ApiModelProperty(position = 1, required = false, value = "会员类型ID")
private String memberId; private String memberId;
/**
* 会员价格ID
*/
@ApiModelProperty(position = 2, required = false, value = "会员价格ID") @ApiModelProperty(position = 2, required = false, value = "会员价格ID")
private String memberPriceId; private String memberPriceId;
@ApiModelProperty(position = 3, required = true, value = "类型:0-用户购买兑换码,1-后台生成兑换码", example = "0")
/**
* 类型 0-用户购买兑换码 1-后台生成兑换码
*/
@ApiModelProperty(position = 3, required = true, value = "类型 0-用户购买兑换码 1-后台生成兑换码", example = "0")
private Integer type; private Integer type;
@ApiModelProperty(position = 4, required = false, value = "用户ID", example = "1")
/**
* 购买会员码的用户id
*/
@ApiModelProperty(position = 4, required = false, value = "登录用户token,应该从token里拿", example = "0")
private String buyUid; private String buyUid;
} }
...@@ -10,17 +10,18 @@ import java.time.LocalDateTime; ...@@ -10,17 +10,18 @@ import java.time.LocalDateTime;
@ApiModel(value = "AdamMemberOrderCodeParam", description = "使用兑换码") @ApiModel(value = "AdamMemberOrderCodeParam", description = "使用兑换码")
@Data @Data
public class AdamMemberOrderCodeParam implements Serializable { public class AdamMemberOrderCodeParam implements Serializable {
private static final long serialVersionUID = 5940725094369061032L; private static final long serialVersionUID = 1298109732452201034L;
@ApiModelProperty(position = 10, required = true, value = "类型:2-会员码,3-礼包码", example = "2")
@ApiModelProperty(position = 0, required = true, value = "类型2-会员码 3-礼包码", example = "2") private Integer type;
private int type; @ApiModelProperty(position = 11, required = true, value = "兑换码", example = "0")
@ApiModelProperty(position = 1, required = true, example = "0")
private String memberCode; private String memberCode;
@ApiModelProperty(position = 2, required = true, example = "0") @ApiModelProperty(position = 12, required = true, value = "生日", example = "0")
private LocalDateTime birthday; private LocalDateTime birthday;
@ApiModelProperty(position = 13, required = false, value = "姓名")
private String name;
@ApiModelProperty(position = 14, required = false, value = "身份证件号")
private String idCard;
private String ip; private String ip;
private String source; private String source;
private String version; private String version;
} }
...@@ -9,11 +9,7 @@ import java.util.List; ...@@ -9,11 +9,7 @@ import java.util.List;
@ApiModel(value = "AdamMemberParam", description = "添加会员参数") @ApiModel(value = "AdamMemberParam", description = "添加会员参数")
@Data @Data
public class AdamMemberParam implements Serializable { public class AdamMemberParam implements Serializable {
private static final long serialVersionUID = 5940725094369061032L; private static final long serialVersionUID = -7411934614249221021L;
/**
* 会员卡id
*/
@ApiModelProperty(position = 0, required = false, value = "会员ID[50]", example = "62960077673504768") @ApiModelProperty(position = 0, required = false, value = "会员ID[50]", example = "62960077673504768")
private String memberId; private String memberId;
......
...@@ -20,9 +20,7 @@ import java.time.LocalDateTime; ...@@ -20,9 +20,7 @@ import java.time.LocalDateTime;
@ApiModel(value = "AdamMemberPriceParam", description = "添加编辑会员价格") @ApiModel(value = "AdamMemberPriceParam", description = "添加编辑会员价格")
@Data @Data
public class AdamMemberPriceParam implements Serializable { public class AdamMemberPriceParam implements Serializable {
private static final long serialVersionUID = -6432796310264973696L;
private static final long serialVersionUID = 5940725094369061032L;
@ApiModelProperty(position = 0, required = false, value = "价格id") @ApiModelProperty(position = 0, required = false, value = "价格id")
private Integer mid; private Integer mid;
......
...@@ -4,12 +4,12 @@ import io.swagger.annotations.ApiModel; ...@@ -4,12 +4,12 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable;
@ApiModel(value = "AdamUserMemberParam", description = "会员用户信息") @ApiModel(value = "AdamUserMemberParam", description = "会员用户信息")
@Data @Data
public class AdamUserMemberParam { public class AdamUserMemberParam implements Serializable {
private static final long serialVersionUID = 3317939633062845439L;
private static final long serialVersionUID = 5940725094369061032L;
@ApiModelProperty(position = 0, required = true, value = "用户id", example = "0") @ApiModelProperty(position = 0, required = true, value = "用户id", example = "0")
private String uid; private String uid;
@ApiModelProperty(position = 1, required = true, value = "会员类型id", example = "0") @ApiModelProperty(position = 1, required = true, value = "会员类型id", example = "0")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment