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

Skip to content

L
liquidnet-bus-v1
Commit 1d691306 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

添加 会员限购参数

parent 3251ea68
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 26 deletions
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/PerformanceVo.java
View file @ 1d691306
...@@ -62,6 +62,12 @@ public class PerformanceVo { ...@@ -62,6 +62,12 @@ public class PerformanceVo {
private int isMember; private int isMember;
@ApiModelProperty(value = "是否开启缺票登记") @ApiModelProperty(value = "是否开启缺票登记")
private int isLackRegister; private int isLackRegister;
@ApiModelProperty(value = "是否实名")
private int isTrueName;
@ApiModelProperty(value = "限购张数")
private int limitCount;
@ApiModelProperty(value = "会员限购张数")
private Integer limitCountMember;
@ApiModelProperty(value = "是否专属") @ApiModelProperty(value = "是否专属")
private int isExclusive; private int isExclusive;
@ApiModelProperty(value = "文案") @ApiModelProperty(value = "文案")
...@@ -92,6 +98,9 @@ public class PerformanceVo { ...@@ -92,6 +98,9 @@ public class PerformanceVo {
public void setPerformanceStatus(KylinPerformanceStatus performanceStatus) { public void setPerformanceStatus(KylinPerformanceStatus performanceStatus) {
this.statusSell = performanceStatus.getStatusSell(); this.statusSell = performanceStatus.getStatusSell();
this.isRecommend = performanceStatus.getIsRecommend(); this.isRecommend = performanceStatus.getIsRecommend();
this.isTrueName = performanceStatus.getIsTrueName();
this.limitCount = performanceStatus.getLimitCount();
this.limitCountMember = performanceStatus.getLimitCountMember();
} }
//TODO 巡演 搭售 场地 //TODO 巡演 搭售 场地
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/TicketVo.java
View file @ 1d691306
...@@ -68,6 +68,8 @@ public class TicketVo { ...@@ -68,6 +68,8 @@ public class TicketVo {
private int isTrueName; private int isTrueName;
@ApiModelProperty(value = "限购张数") @ApiModelProperty(value = "限购张数")
private int limitCount; private int limitCount;
@ApiModelProperty(value = "会员限购张数")
private Integer limitCountMember;
@ApiModelProperty(value = "是否会员专属") @ApiModelProperty(value = "是否会员专属")
private int isExclusive; private int isExclusive;
@ApiModelProperty(value = "是否会员") @ApiModelProperty(value = "是否会员")
...@@ -104,6 +106,8 @@ public class TicketVo { ...@@ -104,6 +106,8 @@ public class TicketVo {
this.isElectronic = ticketStatus.getIsElectronic(); this.isElectronic = ticketStatus.getIsElectronic();
this.isExpress = ticketStatus.getIsExpress(); this.isExpress = ticketStatus.getIsExpress();
this.isStudent = ticketStatus.getIsStudent(); this.isStudent = ticketStatus.getIsStudent();
this.limitCountMember = ticketStatus.getLimitCountMember();
this.limitCount = ticketStatus.getLimitCount();
} }
} }
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinPerformancesAdminService.java
View file @ 1d691306
...@@ -63,14 +63,14 @@ public interface IKylinPerformancesAdminService extends IService<KylinPerformanc ...@@ -63,14 +63,14 @@ public interface IKylinPerformancesAdminService extends IService<KylinPerformanc
* 修改演出的巡演关联 * 修改演出的巡演关联
* @param performancesId 演出id * @param performancesId 演出id
* @param roadShowId 巡演id * @param roadShowId 巡演id
* @return * @return boolean
*/ */
boolean changeRoadShowId(String performancesId,String roadShowId); boolean changeRoadShowId(String performancesId,String roadShowId);
/** /**
* 设置 演出推荐 关联 * 设置 演出推荐 关联
* @param performancesId 相关参数 * @param performancesId 相关参数
* @return * @return boolean
*/ */
boolean setRecommend(List<PerformanceRecommendAdminParam> performancesId); boolean setRecommend(List<PerformanceRecommendAdminParam> performancesId);
...@@ -79,4 +79,16 @@ public interface IKylinPerformancesAdminService extends IService<KylinPerformanc ...@@ -79,4 +79,16 @@ public interface IKylinPerformancesAdminService extends IService<KylinPerformanc
* @return 分页 sql 数据 * @return 分页 sql 数据
*/ */
PageInfo<PerformanceRecommendAdminDao> listRecommend(); PageInfo<PerformanceRecommendAdminDao> listRecommend();
//获取 演出会员信息(包含场次票)
//修改 演出会员信息(包含场次票)
//列表 待审核 演出会员信息
//详情 待审核 演出会员信息
//审核 会员信息
//列表 演出会员审核记录
} }
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinPerformanceStatus.java
View file @ 1d691306
...@@ -74,6 +74,16 @@ public class KylinPerformanceStatus implements Serializable { ...@@ -74,6 +74,16 @@ public class KylinPerformanceStatus implements Serializable {
*/ */
private Integer limitCount; private Integer limitCount;
/**
* 限购张数 0无限 (开启实名 则实名限购 未开始为账号限购)
*/
private Integer isMember;
/**
* 会员限购张数 0无限 (开启实名 则实名限购 未开始为账号限购)
*/
private Integer limitCountMember;
/** /**
* 推荐顺序 0不推荐 * 推荐顺序 0不推荐
*/ */
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinTicketStatus.java
View file @ 1d691306
...@@ -119,6 +119,11 @@ public class KylinTicketStatus implements Serializable { ...@@ -119,6 +119,11 @@ public class KylinTicketStatus implements Serializable {
*/ */
private Integer limitCount; private Integer limitCount;
/**
* 会员限购张数 0无限 (开启实名 则实名限购 未开始为账号限购)
*/
private Integer limitCountMember;
/** /**
* 是否会员专属 0不是 1是 * 是否会员专属 0不是 1是
*/ */
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql
View file @ 1d691306
...@@ -158,6 +158,7 @@ CREATE TABLE `kylin_performance_status` ...@@ -158,6 +158,7 @@ CREATE TABLE `kylin_performance_status`
`audit_status` tinyint NOT NULL DEFAULT -1 COMMENT '-1未提交审核，0提交审核，1审核通过，2审核拒绝', `audit_status` tinyint NOT NULL DEFAULT -1 COMMENT '-1未提交审核，0提交审核，1审核通过，2审核拒绝',
`is_true_name` tinyint NOT NULL DEFAULT 0 COMMENT '是否实名 0不需要 1需要', `is_true_name` tinyint NOT NULL DEFAULT 0 COMMENT '是否实名 0不需要 1需要',
`limit_count` int(11) NOT NULL DEFAULT 0 COMMENT '限购张数 0无限 (开启实名 则实名限购 未开始为账号限购)', `limit_count` int(11) NOT NULL DEFAULT 0 COMMENT '限购张数 0无限 (开启实名 则实名限购 未开始为账号限购)',
`limit_count_member` int(11) NOT NULL DEFAULT 0 COMMENT '会员限购张数 0无限 (开启实名 则实名限购 未开始为账号限购)',
`is_recommend` tinyint(255) NOT NULL DEFAULT 0 COMMENT '是否推荐 0否 1是', `is_recommend` tinyint(255) NOT NULL DEFAULT 0 COMMENT '是否推荐 0否 1是',
`created_at` datetime NULL DEFAULT NULL COMMENT '创建时间', `created_at` datetime NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime NULL DEFAULT NULL COMMENT '修改时间', `updated_at` datetime NULL DEFAULT NULL COMMENT '修改时间',
...@@ -274,30 +275,31 @@ CREATE TABLE `kylin_tickets` ...@@ -274,30 +275,31 @@ CREATE TABLE `kylin_tickets`
drop TABLE if exists `kylin_ticket_status`; drop TABLE if exists `kylin_ticket_status`;
CREATE TABLE `kylin_ticket_status` CREATE TABLE `kylin_ticket_status`
( (
`mid` int(11) NOT NULL AUTO_INCREMENT, `mid` int(11) NOT NULL AUTO_INCREMENT,
`ticket_status_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'ticket_status_id', `ticket_status_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'ticket_status_id',
`ticket_id` varchar(255) NOT NULL DEFAULT '' COMMENT '票关联id', `ticket_id` varchar(255) NOT NULL DEFAULT '' COMMENT '票关联id',
`is_student` tinyint NOT NULL DEFAULT 0 COMMENT '是否学生票 0否 1是', `is_student` tinyint NOT NULL DEFAULT 0 COMMENT '是否学生票 0否 1是',
`is_electronic` tinyint NOT NULL DEFAULT 0 COMMENT '是否电子票 0否 1是', `is_electronic` tinyint NOT NULL DEFAULT 0 COMMENT '是否电子票 0否 1是',
`is_express` tinyint NOT NULL DEFAULT 0 COMMENT '是否快递票 0否 1是', `is_express` tinyint NOT NULL DEFAULT 0 COMMENT '是否快递票 0否 1是',
`status` tinyint NOT NULL DEFAULT 0 COMMENT '票状态 -2新建 -1删除;0未提交;1审核中;2审核中（自动在售）;3审核通过;4审核未通过;6在售;7停售;8售罄;9未开始;10已结束', `status` tinyint NOT NULL DEFAULT 0 COMMENT '票状态 -2新建 -1删除;0未提交;1审核中;2审核中（自动在售）;3审核通过;4审核未通过;6在售;7停售;8售罄;9未开始;10已结束',
`counts` int(11) NOT NULL DEFAULT 1 COMMENT '可验证次数', `counts` int(11) NOT NULL DEFAULT 1 COMMENT '可验证次数',
`status_exchange` tinyint NOT NULL DEFAULT 0 COMMENT '兑换状态 6可兑换 7不可兑换', `status_exchange` tinyint NOT NULL DEFAULT 0 COMMENT '兑换状态 6可兑换 7不可兑换',
`is_show_code` tinyint NOT NULL DEFAULT 0 COMMENT '是否显示二维码 0否 1是', `is_show_code` tinyint NOT NULL DEFAULT 0 COMMENT '是否显示二维码 0否 1是',
`qr_code_show_time` datetime NOT NULL DEFAULT '2030-01-01 12:00:00' COMMENT '二维码显示时间', `qr_code_show_time` datetime NOT NULL DEFAULT '2030-01-01 12:00:00' COMMENT '二维码显示时间',
`is_lack_register` tinyint NOT NULL DEFAULT 0 COMMENT '是否开启缺票登记 0否 1是', `is_lack_register` tinyint NOT NULL DEFAULT 0 COMMENT '是否开启缺票登记 0否 1是',
`total_general` int(11) NOT NULL DEFAULT 0 COMMENT '总库存', `total_general` int(11) NOT NULL DEFAULT 0 COMMENT '总库存',
`total_exchange` int(11) NOT NULL DEFAULT 0 COMMENT '总兑换库存', `total_exchange` int(11) NOT NULL DEFAULT 0 COMMENT '总兑换库存',
`surplus_general` int(11) NOT NULL DEFAULT 0 COMMENT '剩余库存', `surplus_general` int(11) NOT NULL DEFAULT 0 COMMENT '剩余库存',
`surplus_exchange` int(11) NOT NULL DEFAULT 0 COMMENT '剩余兑换库存', `surplus_exchange` int(11) NOT NULL DEFAULT 0 COMMENT '剩余兑换库存',
`express_type` tinyint NOT NULL DEFAULT 1 COMMENT '1寄付 2到付', `express_type` tinyint NOT NULL DEFAULT 1 COMMENT '1寄付 2到付',
`is_true_name` tinyint NOT NULL DEFAULT 0 COMMENT '是否实名 0不需要 1需要', `is_true_name` tinyint NOT NULL DEFAULT 0 COMMENT '是否实名 0不需要 1需要',
`limit_count` int(11) NOT NULL DEFAULT 0 COMMENT '限购张数 0无限 (开启实名 则实名限购 未开始为账号限购)', `limit_count` int(11) NOT NULL DEFAULT 0 COMMENT '限购张数 0无限 (开启实名 则实名限购 未开始为账号限购)',
`is_transfer` tinyint NOT NULL DEFAULT 0 COMMENT '是否开启转赠 0关闭 1开启', `member_limit_count` int(11) NOT NULL DEFAULT 0 COMMENT '会员限购张数 0无限 (开启实名 则实名限购 未开始为账号限购)',
`is_exclusive` tinyint NOT NULL DEFAULT 0 COMMENT '是否会员专属 0不是 1是', `is_transfer` tinyint NOT NULL DEFAULT 0 COMMENT '是否开启转赠 0关闭 1开启',
`is_member` tinyint NOT NULL DEFAULT 0 COMMENT '是否关联会员 0不是 1是', `is_exclusive` tinyint NOT NULL DEFAULT 0 COMMENT '是否会员专属 0不是 1是',
`created_at` datetime NULL DEFAULT NULL COMMENT '创建时间', `is_member` tinyint NOT NULL DEFAULT 0 COMMENT '是否关联会员 0不是 1是',
`updated_at` datetime NULL DEFAULT NULL COMMENT '修改时间', `created_at` datetime NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_ticket_status_uid_index` (`ticket_status_id`), KEY `kylin_ticket_status_uid_index` (`ticket_status_id`),
PRIMARY KEY (`mid`) PRIMARY KEY (`mid`)
) ENGINE = InnoDB ) ENGINE = InnoDB
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/timerTask/PerformanceVoTask.java
View file @ 1d691306
...@@ -321,6 +321,9 @@ public class PerformanceVoTask { ...@@ -321,6 +321,9 @@ public class PerformanceVoTask {
performanceStatus.setAuditStatus(0); performanceStatus.setAuditStatus(0);
performanceStatus.setUpdatedAt(updatedAt); performanceStatus.setUpdatedAt(updatedAt);
performanceStatus.setIsMember(1);
performanceStatus.setLimitCountMember(1);
performanceRelations.setPerformanceId(performances.getPerformancesId()); performanceRelations.setPerformanceId(performances.getPerformancesId());
performanceRelations.setPerformanceRelationsId(IDGenerator.nextSnowId().toString()); performanceRelations.setPerformanceRelationsId(IDGenerator.nextSnowId().toString());
performanceRelations.setCreatedAt(performances.getCreatedAt()); performanceRelations.setCreatedAt(performances.getCreatedAt());
...@@ -388,6 +391,8 @@ public class PerformanceVoTask { ...@@ -388,6 +391,8 @@ public class PerformanceVoTask {
ticketStatus.setTicketId(tickets.getTicketsId()); ticketStatus.setTicketId(tickets.getTicketsId());
ticketStatus.setCounts(1); ticketStatus.setCounts(1);
ticketStatus.setIsMember(1); ticketStatus.setIsMember(1);
ticketStatus.setIsTrueName(performanceStatus.getIsTrueName());
ticketStatus.setLimitCountMember(1);
ticketStatus.setStatusExchange(7); ticketStatus.setStatusExchange(7);
ticketStatus.setQrCodeShowTime(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getQrCodeShowTime()))); ticketStatus.setQrCodeShowTime(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getQrCodeShowTime())));
......
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