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

Commit b0026567 authored by zhangguobing's avatar zhangguobing

~api:券商品业务-商品详情页及商品订单详情页新增关联人信息及券类商品判定属性;

parent ea4f634a
...@@ -76,7 +76,7 @@ public class GoblinStoreMgtGoodsCouponAddSkuParam implements Serializable { ...@@ -76,7 +76,7 @@ public class GoblinStoreMgtGoodsCouponAddSkuParam implements Serializable {
* ---------------------------- 券类商品-代金券属性 ---------------------------- * ---------------------------- 券类商品-代金券属性 ----------------------------
*/ */
@ApiModelProperty(position = 28, required = true, value = "是否实名[0-否|1-是]", example = "1") @ApiModelProperty(position = 28, required = true, value = "是否实名[0-否|1-是,表示该商品需要实名关联]", example = "1")
@Pattern(regexp = "\\b(0|1)\\b", message = "参数'是否实名'无效") @Pattern(regexp = "\\b(0|1)\\b", message = "参数'是否实名'无效")
private Integer isTrueName; private Integer isTrueName;
@ApiModelProperty(position = 29, required = true, value = "适用范围[101-音乐节|102-小型演出(livehouse演出)|103-巡演]") @ApiModelProperty(position = 29, required = true, value = "适用范围[101-音乐节|102-小型演出(livehouse演出)|103-巡演]")
......
...@@ -41,7 +41,7 @@ public class GoblinStoreMgtGoodsCouponEditSkuParam implements Serializable { ...@@ -41,7 +41,7 @@ public class GoblinStoreMgtGoodsCouponEditSkuParam implements Serializable {
* ---------------------------- 券类商品-代金券属性 ---------------------------- * ---------------------------- 券类商品-代金券属性 ----------------------------
*/ */
@ApiModelProperty(position = 15, required = true, value = "是否实名[0-否|1-是]", example = "1") @ApiModelProperty(position = 15, required = true, value = "是否实名[0-否|1-是,表示该商品需要实名关联]", example = "1")
@Pattern(regexp = "\\b(0|1)\\b", message = "参数'是否实名'无效") @Pattern(regexp = "\\b(0|1)\\b", message = "参数'是否实名'无效")
private Integer isTrueName; private Integer isTrueName;
@ApiModelProperty(position = 16, required = true, value = "适用范围[101-音乐节|102-小型演出(livehouse演出)|103-巡演]") @ApiModelProperty(position = 16, required = true, value = "适用范围[101-音乐节|102-小型演出(livehouse演出)|103-巡演]")
......
...@@ -14,6 +14,8 @@ import java.util.List; ...@@ -14,6 +14,8 @@ import java.util.List;
@JsonIgnoreProperties(ignoreUnknown = true) @JsonIgnoreProperties(ignoreUnknown = true)
public class GoblinGoodsInfoDetailVo implements Serializable, Cloneable { public class GoblinGoodsInfoDetailVo implements Serializable, Cloneable {
private static final long serialVersionUID = -4712015317981742851L; private static final long serialVersionUID = -4712015317981742851L;
@ApiModelProperty(position = 1, value = "商品类型[0-常规|1-数字藏品|2-券类商品]")
private int spuType;
@ApiModelProperty(position = 22, value = "规格展现方式[1-常规|2-组合]") @ApiModelProperty(position = 22, value = "规格展现方式[1-常规|2-组合]")
private String specMode; private String specMode;
@ApiModelProperty(position = 51, value = "规格信息") @ApiModelProperty(position = 51, value = "规格信息")
......
...@@ -140,7 +140,7 @@ public class GoblinGoodsSkuInfoVo implements Serializable, Cloneable { ...@@ -140,7 +140,7 @@ public class GoblinGoodsSkuInfoVo implements Serializable, Cloneable {
/** /**
* ---------------------------- 券类商品-代金券属性 ---------------------------- * ---------------------------- 券类商品-代金券属性 ----------------------------
*/ */
@ApiModelProperty(position = 33, value = "是否实名[0-否|1-是]") @ApiModelProperty(position = 33, value = "是否实名[0-否|1-是,表示该商品需要实名关联]")
private Integer isTrueName; private Integer isTrueName;
@ApiModelProperty(position = 33, value = "业务类别[0-全场|1-演出|2-商品|3-优先购]") @ApiModelProperty(position = 33, value = "业务类别[0-全场|1-演出|2-商品|3-优先购]")
private Integer busiType; private Integer busiType;
......
...@@ -78,6 +78,8 @@ public class GoblinOrderSkuVo implements Serializable, Cloneable { ...@@ -78,6 +78,8 @@ public class GoblinOrderSkuVo implements Serializable, Cloneable {
@ApiModelProperty(value = "erp-仓库号") @ApiModelProperty(value = "erp-仓库号")
private String erpWarehouseNo; private String erpWarehouseNo;
@ApiModelProperty(value = "是否实名[0-否|1-是,表示该商品需要实名关联],这里默认0")
private int isTrueName;
@ApiModelProperty(value = "关联人证件类型:1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证") @ApiModelProperty(value = "关联人证件类型:1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证")
private Integer idType; private Integer idType;
@ApiModelProperty(value = "关联人姓名") @ApiModelProperty(value = "关联人姓名")
......
...@@ -105,7 +105,7 @@ public class CandyCoupon implements Serializable { ...@@ -105,7 +105,7 @@ public class CandyCoupon implements Serializable {
private Integer validity; private Integer validity;
/** /**
* 是否实名[0-否|1-是,表示该券需要实名使用] * 是否实名[0-否|1-是,表示该商品需要实名关联]
*/ */
private Integer isTrueName; private Integer isTrueName;
......
...@@ -31,7 +31,7 @@ public class GoblinGoodsSkuCoupon implements Serializable { ...@@ -31,7 +31,7 @@ public class GoblinGoodsSkuCoupon implements Serializable {
private String skuId; private String skuId;
/** /**
* 是否实名[0-否|1-是,表示该券需要实名使用] * 是否实名[0-否|1-是,表示该商品需要实名关联]
*/ */
private Integer isTrueName; private Integer isTrueName;
......
...@@ -182,7 +182,7 @@ create table candy_coupon_relate ...@@ -182,7 +182,7 @@ create table candy_coupon_relate
) engine InnoDB comment '券适用关联配置'; ) engine InnoDB comment '券适用关联配置';
create index idx_ccr_coupon_id on candy_coupon_relate (coupon_id); create index idx_ccr_coupon_id on candy_coupon_relate (coupon_id);
# -- >>------------------------------------------------------------------------------------ |20240123 商品券业务 # -- >>------------------------------------------------------------------------------------ |20240123 商品券业务
alter table candy_coupon add is_true_name smallint default 0 comment '是否实名[0-否|1-是,表示该券需要实名使用]' after validity; alter table candy_coupon add is_true_name smallint default 0 comment '是否实名[0-否|1-是,表示该商品需要实名关联]' after validity;
alter table candy_coupon_rule modify use_scope smallint null comment '适用范围[101-音乐节|102-小型演出(livehouse演出)|103-巡演|100-全场|90-演出|91-场次|92-票|80-商品|81-款式]'; alter table candy_coupon_rule modify use_scope smallint null comment '适用范围[101-音乐节|102-小型演出(livehouse演出)|103-巡演|100-全场|90-演出|91-场次|92-票|80-商品|81-款式]';
......
...@@ -1256,7 +1256,7 @@ create table goblin_goods_sku_coupon ...@@ -1256,7 +1256,7 @@ create table goblin_goods_sku_coupon
val_face decimal(8, 2) comment '面值', val_face decimal(8, 2) comment '面值',
is_true_name smallint default 0 comment '是否实名[0-否|1-是,表示该券需要实名使用]', is_true_name smallint default 0 comment '是否实名[0-否|1-是,表示该商品需要实名关联]',
validity int default 0 comment '购买后(单位天)有效期,与生效/过期时间二选一', validity int default 0 comment '购买后(单位天)有效期,与生效/过期时间二选一',
effect_at datetime(3) null comment '生效时间', effect_at datetime(3) null comment '生效时间',
expire_at datetime(3) null comment '过期时间', expire_at datetime(3) null comment '过期时间',
......
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