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

Commit 0ba1bad9 authored by wangyifan's avatar wangyifan

1. partner增加多人票类型

parent 7735c1e8
......@@ -107,6 +107,13 @@ public class TicketCreateParam implements Serializable {
@ApiModelProperty(value = "", hidden = true)
private String createdAt;
@ApiModelProperty(value = "票种类别 1:单人票 2:双人票 3:多人票")
//@NotNull(message = "票种类别不能为空")
private Integer ticketCategory;
@ApiModelProperty(value = "票观演人数量")
private Integer viewersNumber;
@JsonIgnore
public KylinTickets kylinTickets(String ticketsId, LocalDateTime createdAt, LocalDateTime updatedAt) {
KylinTickets kylinTickets = new KylinTickets();
......
......@@ -117,6 +117,12 @@ public class KylinTicketPartnerVo implements Serializable,Cloneable {
@ApiModelProperty(value = "")
private String updatedAt;
@ApiModelProperty(value = "票种类别 1:单人票 2:双人票 3:多人票")
private Integer ticketCategory;
@ApiModelProperty(value = "票观演人数量")
private Integer viewersNumber;
public void setDefault(){
this.setIsMember(0);
this.setIsTransfer(0);
......
......@@ -29,4 +29,7 @@ public class PayDetailVo implements Serializable {
@ApiModelProperty(value = "快递可选择列表")
private List<ExpressModuleVo> ExpressModuleList;
@ApiModelProperty(value = "观演人数量")
private Integer viewersNumber;
}
......@@ -115,6 +115,20 @@ public class KylinTickets implements Serializable ,Cloneable{
*/
private Integer saleRemindMinute;
/**
* 票的类别
* 1: 单人票
* 2:双人票
* 3:多人票
*/
private Integer ticketCategory;
/**
* 票观演人数量
*/
private Integer viewersNumber;
/**
* comment
*/
......@@ -147,7 +161,8 @@ public class KylinTickets implements Serializable ,Cloneable{
vo.getDescribeElectronic(),vo.getAdvanceMinuteMember(),
vo.getTimeStart(),vo.getTimeEnd(),vo.getTimeEndExpress(),
vo.getUseStart(),vo.getUseEnd(),vo.getPayCountdownMinute(),
vo.getSaleRemindMinute(),vo.getComment(),vo.getCreatedAt(),
vo.getSaleRemindMinute(),vo.getTicketCategory(),vo.getViewersNumber()
,vo.getComment(),vo.getCreatedAt(),
vo.getUpdatedAt()
};
}
......
......@@ -505,10 +505,26 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
payDetailVo.setPerformanceInfo(performancesInfo);
payDetailVo.setTicketInfo(ticketVo);
// 设置票观演人数量
payDetailVo.setViewersNumber(getViewersNumberByTicketsId(ticketsId));
log.info(UserPathDto.setData("预支付演出票种详情", "performancesId=" + performancesId + " ticketsId=" + ticketsId, payDetailVo));
return payDetailVo;
}
/**
* 设置观演人数量
* @param ticketsId
*/
private Integer getViewersNumberByTicketsId(String ticketsId) {
List<KylinTicketPartnerVo> voTickets = mongoTemplate.find(Query.query(Criteria.where("ticketsId").is(ticketsId)),
KylinTicketPartnerVo.class, KylinTicketPartnerVo.class.getSimpleName());
if (voTickets.isEmpty()) {
return 0;
}
return voTickets.get(0).getViewersNumber();
}
public List<KylinPerformanceVo> checkAppStatus(List<KylinPerformanceVo> list) {
List<KylinPerformanceVo> newList = ObjectUtil.getKylinPerformanceVoArrayList();
if (!CollectionUtils.isEmpty(list)) {
......
......@@ -277,4 +277,9 @@ create table kylin_ticket_express_module
ALTER TABLE kylin_performance_status
ADD id_count int DEFAULT NULL COMMENT '实名限购数';
ALTER TABLE kylin_ticket_status
ADD id_count int DEFAULT NULL COMMENT '实名限购数';
\ No newline at end of file
ADD id_count int DEFAULT NULL COMMENT '实名限购数';
ALTER TABLE kylin_tickets
ADD ticket_category tinyint(4) comment '票类型 1:单人票 2:双人票 3:多人票';
ALTER TABLE kylin_tickets
ADD viewers_number int(11) comment '观演人数量';
\ No newline at end of file
......@@ -443,7 +443,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
sqlsDataC.add(new Object[]{
DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketItem.getTimeEnd()), DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketItem.getTimeStart()),
DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketItem.getTimeEndExpress()), kylinPerformanceMisVo.getPayCountdownMinute(),
ticketItem.getPrice(), ticketItem.getTicketsId(), now, now
ticketItem.getPrice(), ticketItem.getTicketCategory(), ticketItem.getViewersNumber(), ticketItem.getTicketsId(), now, now
});
//修改 mysql 购票限购、库存
sqlsDataD.add(new Object[]{
......
......@@ -124,6 +124,9 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
kylinTicketPartnerVo.setQrCodeShowTime(ticketCreateParam.getQrCodeShowTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
}
// 根据票种类别设置观演人数量
putViewersNumber(ticketCreateParam, kylinTicketPartnerVo);
mongoSlimeUtils.insertTicketPartnerVo(kylinTicketPartnerVo);
return ResponseDto.success(kylinTicketPartnerVo);
} catch (Exception e) {
......@@ -185,6 +188,8 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
kylinTicketPartnerVo.setQrCodeShowTime(ticketCreateParam.getQrCodeShowTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
}
putViewersNumber(ticketCreateParam, kylinTicketPartnerVo);
mongoSlimeUtils.insertTicketPartnerVo(kylinTicketPartnerVo);
return ResponseDto.success(kylinTicketPartnerVo);
} catch (Exception e) {
......@@ -193,6 +198,20 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
}
}
private void putViewersNumber(TicketCreateParam ticketCreateParam, KylinTicketPartnerVo kylinTicketPartnerVo) {
// 根据票种类别设置观演人数量
if (ticketCreateParam.getTicketCategory() == 1) {
// 单人票
kylinTicketPartnerVo.setViewersNumber(1);
} else if (ticketCreateParam.getTicketCategory() == 2) {
// 双人票
kylinTicketPartnerVo.setViewersNumber(2);
}else {
// 多人票
kylinTicketPartnerVo.setViewersNumber(ticketCreateParam.getViewersNumber());
}
}
@Override
public ResponseDto<KylinTicketPartnerVo> updateTicket(TicketCreateParam ticketCreateParam) {
try {
......@@ -240,6 +259,9 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
kylinTicketPartnerVo.setQrCodeShowTime("2030-01-01 12:00:00");
}
// 根据票种类别设置观演人数量
putViewersNumber(ticketCreateParam, kylinTicketPartnerVo);
mongoSlimeUtils.updateTicketPartnerVo(kylinTicketPartnerVo);
// KylinTicketPartnerVo kylinTicketPartnerVoData = JsonUtils.fromJson(doc.toJson(), KylinTicketPartnerVo.class);
log.info(UserPathDto.setPartnerData("0", "updateTicket", ticketCreateParam, "SUCCESS"));
......
......@@ -27,23 +27,23 @@ kylin_order_ticket_entities.update_status_bystation=UPDATE kylin_order_ticket_en
# ---- 演出修改 ----
# ---- \u6F14\u51FA\u4FEE\u6539 ----
kylin_performances.auditTime=UPDATE kylin_performances SET audit_time = ? WHERE performances_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
kylin_performances_status.withdraw=UPDATE kylin_performance_status SET audit_status = ? WHERE performance_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
kylin_performances_status.withdraw2=UPDATE kylin_performance_status SET audit_status = ? , field_audit_status = ?, status = ? WHERE performance_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
kylin_performances_status.outLine=UPDATE kylin_performance_status SET status = ? AND updated_at = ? WHERE performance_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
kylin_performances_status.onLine=UPDATE kylin_performance_status SET status = ? AND updated_at = ? WHERE performance_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
# ---- 票种状态修改 ----
# ---- \u7968\u79CD\u72B6\u6001\u4FEE\u6539 ----
kylin_ticket_status.update_status=UPDATE kylin_ticket_status SET status = ?, updated_at = ? WHERE ticket_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
kylin_ticket_status.onLine=UPDATE kylin_ticket_status SET status = ?, updated_at = ? WHERE ticket_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
# ---- 场地审核演出 ----
# ---- \u573A\u5730\u5BA1\u6838\u6F14\u51FA ----
kylin_performance_status.fieldsStatus = UPDATE kylin_performance_status SET field_audit_status = ? , audit_status = ? ,status = ? WHERE performance_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
kylin_performances_reject_txt.fieldsStatus = UPDATE kylin_performances SET reject_txt = ? WHERE performances_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
# ---- 演出第二步骤操作 ----
# ---- \u6F14\u51FA\u7B2C\u4E8C\u6B65\u9AA4\u64CD\u4F5C ----
kylin_performance.updateStep2=UPDATE kylin_performances SET audit_time = ? , notice_image = ? WHERE performances_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
kylin_performance_status.updateStep2=UPDATE kylin_performance_status SET field_audit_status = ? ,audit_status = ? , is_true_name = ? , limit_count = ?,id_count =? WHERE performance_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
kylin_ticket.updateStep2=UPDATE kylin_tickets SET time_end = ? , time_start = ? ,time_end_express = ? ,pay_countdown_minute = ? ,price = ? WHERE tickets_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
kylin_ticket.updateStep2=UPDATE kylin_tickets SET time_end = ? , time_start = ? ,time_end_express = ? ,pay_countdown_minute = ? ,price = ?, ticket_category = ?, viewers_number = ? WHERE tickets_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
kylin_ticket_status.updateStep2=UPDATE kylin_ticket_status SET total_exchange = ? , total_general = ? , is_true_name = ? , limit_count = ? ,id_count =? , is_lack_register = ? , is_express = ? , is_electronic = ? ,counts = ? , is_show_code = ? ,qr_code_show_time = ? WHERE ticket_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
# ---- VoStatus ----
kylin_ticket_status.VoStatus=UPDATE kylin_ticket_status SET status = ?, surplus_general = ? WHERE ticket_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
......@@ -67,7 +67,7 @@ kylin_tickets.del=DELETE FROM kylin_tickets WHERE tickets_id = ?
kylin_ticket_status.del=DELETE FROM kylin_ticket_status WHERE ticket_id = ?
kylin_ticket_relations.del=DELETE FROM kylin_ticket_relations WHERE ticket_id = ?
kylin_tickets.insert=INSERT INTO kylin_tickets (tickets_id,title,type,price,price_express,price_discount_member,price_discount,describes,describe_express,describe_electronic,advance_minute_member,time_start,time_end,time_end_express,use_start,use_end,pay_countdown_minute,sale_remind_minute,comment,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
kylin_tickets.insert=INSERT INTO kylin_tickets (tickets_id,title,type,price,price_express,price_discount_member,price_discount,describes,describe_express,describe_electronic,advance_minute_member,time_start,time_end,time_end_express,use_start,use_end,pay_countdown_minute,sale_remind_minute,ticket_category,viewers_number,comment,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
kylin_ticket_status.insert=INSERT INTO kylin_ticket_status (ticket_status_id,ticket_id,is_student,is_electronic,is_express,status,counts,status_exchange,is_show_code,qr_code_show_time,is_lack_register,total_general,total_exchange,surplus_general,surplus_exchange,express_type,is_transfer,is_true_name,limit_count,id_count,member_limit_count,is_exclusive,is_member,is_agent,sync_damai,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
kylin_ticket_relations.insert=INSERT INTO kylin_ticket_relations (ticket_relations_id,ticket_id,times_id,created_at,updated_at) VALUES (?,?,?,?,?)
......
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