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

Skip to content

L
liquidnet-bus-v1
Commit 79b0832f authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

Merge branch 'dev' into test

parents 5bd409a5 3854da74
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 14 deletions
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql
View file @ 79b0832f
......@@ -166,6 +166,10 @@ CREATE TABLE `kylin_performance_status`
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_performance_status_uid_index` (`performance_status_id`),
KEY `kylin_performances_status_status_index` (`status`),
KEY `kylin_performances_status_audit_status_index` (`audit_status`),
KEY `kylin_performances_status_is_true_name_index` (`is_true_name`),
KEY `kylin_performances_status_performance_id_index` (`performance_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT '演出状态';
......@@ -185,6 +189,8 @@ CREATE TABLE `kylin_performance_relations`
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `performance_relations_uid_index` (`performance_relations_id`),
KEY `performance_relations_copy_id_index` (`copy_id`),
KEY `performance_relations_performance_id_index` (`performance_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT '演出状态';
......@@ -240,6 +246,8 @@ CREATE TABLE `kylin_ticket_time_relation`
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_ticket_time_relation_uid_index` (`ticket_time_relation_id`),
KEY `kylin_ticket_time_relation_times_id_index` (`times_id`),
KEY `kylin_ticket_time_relation_performance_id_index` (`performance_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT '场次关联';
......@@ -306,6 +314,11 @@ CREATE TABLE `kylin_ticket_status`
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_ticket_status_uid_index` (`ticket_status_id`),
KEY `kylin_ticket_status_status_index` (`status`),
KEY `kylin_ticket_status_is_member_index` (`is_member`),
KEY `kylin_ticket_status_is_agent_index` (`is_agent`),
KEY `kylin_ticket_status_is_exclusive_index` (`is_exclusive`),
KEY `kylin_ticket_status_is_true_name_index` (`is_true_name`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT '票';
......@@ -320,6 +333,8 @@ CREATE TABLE `kylin_ticket_relations`
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `ticket_relations_uid_index` (`ticket_relations_id`),
KEY `ticket_relations_ticket_id_index` (`ticket_id`),
KEY `ticket_relations_times_id_index` (`times_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT '票';
......@@ -337,6 +352,7 @@ CREATE TABLE `kylin_road_shows`
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_road_shows_uid_index` (`road_shows_id`),
KEY `ticket_relations_times_status_index` (`status`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT '巡演';
......@@ -358,6 +374,9 @@ CREATE TABLE `kylin_lack_registers`
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_lack_registers_uid_index` (`lack_registers_id`),
KEY `kylin_lack_registers_performance_id_index` (`performance_id`),
KEY `kylin_lack_registers_ticket_id_index` (`ticket_id`),
KEY `kylin_lack_registers_user_id_index` (`user_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT '缺票登记';
......@@ -446,6 +465,9 @@ CREATE TABLE `kylin_order_tickets`
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_order_tickets_uid_index` (`order_tickets_id`),
KEY `kylin_order_tickets_user_id_index` (`user_id`),
KEY `kylin_order_tickets_order_code_index` (`order_code`),
KEY `kylin_order_tickets_order_type_index` (`order_type`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT '订单';
......@@ -466,6 +488,12 @@ CREATE TABLE `kylin_order_ticket_relations`
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_order_ticket_relations_uid_index` (`order_ticket_relations_id`),
KEY `kylin_order_ticket_relations_order_id_index` (`order_id`),
KEY `kylin_order_ticket_relations_performance_id_index` (`performance_id`),
KEY `kylin_order_ticket_relations_time_id_index` (`time_id`),
KEY `kylin_order_ticket_relations_ticket_id_index` (`ticket_id`),
KEY `kylin_order_ticket_relations_agent_id_index` (`agent_id`),
KEY `kylin_order_ticket_relations_is_member_index` (`is_member`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT '订单关系';
......@@ -484,6 +512,9 @@ CREATE TABLE `kylin_order_ticket_status`
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_order_ticket_status_uid_index` (`order_ticket_status_id`),
KEY `kylin_order_ticket_status_order_id_index` (`order_id`),
KEY `kylin_order_ticket_status_status_index` (`status`),
KEY `kylin_order_ticket_status_pay_status_index` (`pay_status`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT '订单状态';
......@@ -513,6 +544,10 @@ CREATE TABLE `kylin_order_ticket_entities`
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_order_ticket_entities_uid_index` (`order_ticket_entities_id`),
KEY `kylin_order_ticket_entities_order_id_index` (`order_id`),
KEY `kylin_order_ticket_entities_ticket_id_index` (`ticket_id`),
KEY `kylin_order_ticket_entities_user_id_index` (`user_id`),
KEY `kylin_order_ticket_entities_time_id_index` (`time_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT '订单详情';
......@@ -531,6 +566,7 @@ CREATE TABLE `kylin_buy_notice`
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_buy_notice_uid_index` (`buy_notice_id`),
KEY `kylin_buy_notice_status_index` (`status`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT '购票须知表';
......@@ -549,6 +585,8 @@ CREATE TABLE `kylin_check_user`
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_check_user_uid_index` (`check_user_id`),
KEY `kylin_check_user_mobile_index` (`mobile`),
KEY `kylin_check_user_pwd_index` (`pwd`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT '验票用户表';
......@@ -566,6 +604,9 @@ CREATE TABLE `kylin_check_user_performances`
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_check_user_uid_index` (`check_user_id`),
KEY `kylin_check_user_performance_id_index` (`performance_id`),
KEY `kylin_check_user_check_user_id_index` (`check_user_id`),
KEY `kylin_check_user_check_user_id_index` (`status`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT '验票用户可看演出表';
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java
View file @ 79b0832f
......@@ -184,24 +184,26 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
vo = checkAppStatusInfo(vo);
List<KylinTicketTimesVo> ticketTimesList = vo.getTicketTimeList();
for (KylinTicketTimesVo partner : ticketTimesList) {
List<KylinTicketVo> ticketList = partner.getTicketList();
List<KylinTicketVo> ticketListNew = new ArrayList<>();
for (KylinTicketVo ticket : ticketList) {
int status = checkTicketStatus(ticket);
ticket.setStatus(status);
// 会员状态
Integer isMemberStatus = getIsMemberStatus(ticket);
ticket.setIsMemberStatus(isMemberStatus);
if (null != isAgent && isAgent > 0) {
if (ticket.getIsAgent() == isAgent) {
if (null != ticketTimesList) {
for (KylinTicketTimesVo partner : ticketTimesList) {
List<KylinTicketVo> ticketList = partner.getTicketList();
List<KylinTicketVo> ticketListNew = new ArrayList<>();
for (KylinTicketVo ticket : ticketList) {
int status = checkTicketStatus(ticket);
ticket.setStatus(status);
// 会员状态
Integer isMemberStatus = getIsMemberStatus(ticket);
ticket.setIsMemberStatus(isMemberStatus);
if (null != isAgent && isAgent > 0) {
if (ticket.getIsAgent() == isAgent) {
ticketListNew.add(ticket);
}
} else {
ticketListNew.add(ticket);
}
} else {
ticketListNew.add(ticket);
}
partner.setTicketList(ticketListNew);
}
partner.setTicketList(ticketListNew);
}
KylinPerformanceVo performancesInfo = dataUtils.getPerformanceVo(performancesId);
......
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