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

Commit 20be9525 authored by 胡佳晨's avatar 胡佳晨

修改 提示文案

parent ea790cb0
...@@ -18,7 +18,7 @@ import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS; ...@@ -18,7 +18,7 @@ import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
@Data @Data
@ApiModel @ApiModel
public class KylinTicketVo implements Serializable,Cloneable{ public class KylinTicketVo implements Serializable, Cloneable {
private Integer mid; private Integer mid;
@ApiModelProperty(value = "主键") @ApiModelProperty(value = "主键")
...@@ -103,7 +103,7 @@ public class KylinTicketVo implements Serializable,Cloneable{ ...@@ -103,7 +103,7 @@ public class KylinTicketVo implements Serializable,Cloneable{
private Integer totalExchange; private Integer totalExchange;
public Integer getIdCount() { public Integer getIdCount() {
return idCount==null?limitCount:idCount; return idCount == null ? limitCount : idCount;
} }
public void setTicket(KylinTickets ticket) { public void setTicket(KylinTickets ticket) {
...@@ -169,7 +169,7 @@ public class KylinTicketVo implements Serializable,Cloneable{ ...@@ -169,7 +169,7 @@ public class KylinTicketVo implements Serializable,Cloneable{
this.timeStart = ticket.getTimeStart(); this.timeStart = ticket.getTimeStart();
this.timeEnd = ticket.getTimeEnd(); this.timeEnd = ticket.getTimeEnd();
this.advanceMinuteMember = 5; this.advanceMinuteMember = 5;
this.memberTimeStart = DateUtil.Formatter.yyyyMMddHHmmss.format(LocalDateTime.parse(ticket.getTimeStart(),DTF_YMD_HMS).plusMinutes(-5)); this.memberTimeStart = DateUtil.Formatter.yyyyMMddHHmmss.format(LocalDateTime.parse(ticket.getTimeStart(), DTF_YMD_HMS).plusMinutes(-5));
if (ticket.getTimeEndExpress() != null) { if (ticket.getTimeEndExpress() != null) {
this.timeEndExpress = ticket.getTimeEndExpress(); this.timeEndExpress = ticket.getTimeEndExpress();
} else { } else {
...@@ -194,6 +194,7 @@ public class KylinTicketVo implements Serializable,Cloneable{ ...@@ -194,6 +194,7 @@ public class KylinTicketVo implements Serializable,Cloneable{
this.isStudent = ticketStatus.getIsStudent(); this.isStudent = ticketStatus.getIsStudent();
this.limitCountMember = 1; this.limitCountMember = 1;
this.limitCount = ticketStatus.getLimitCount(); this.limitCount = ticketStatus.getLimitCount();
this.idCount = ticketStatus.getIdCount();
this.counts = ticketStatus.getCounts(); this.counts = ticketStatus.getCounts();
this.sysDamai = 0; this.sysDamai = 0;
this.isShowCode = ticketStatus.getIsShowCode(); this.isShowCode = ticketStatus.getIsShowCode();
...@@ -203,6 +204,7 @@ public class KylinTicketVo implements Serializable,Cloneable{ ...@@ -203,6 +204,7 @@ public class KylinTicketVo implements Serializable,Cloneable{
} }
private static final KylinTicketVo obj = new KylinTicketVo(); private static final KylinTicketVo obj = new KylinTicketVo();
public static KylinTicketVo getNew() { public static KylinTicketVo getNew() {
try { try {
return (KylinTicketVo) obj.clone(); return (KylinTicketVo) obj.clone();
......
...@@ -208,12 +208,12 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -208,12 +208,12 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
int memberType; //会员状态 不需要判断会员 1判断会员逻辑 2会员专属 int memberType; //会员状态 不需要判断会员 1判断会员逻辑 2会员专属
if (DateUtil.compareStrDay(DateUtil.getNowTime(), memberTimeStart) == 1 && DateUtil.compareStrDay(DateUtil.getNowTime(), timeStart) == -1) {//优先时间 if (DateUtil.compareStrDay(DateUtil.getNowTime(), memberTimeStart) == 1 && DateUtil.compareStrDay(DateUtil.getNowTime(), timeStart) == -1) {//优先时间
if (payOrderParam.getNumber() > ticketData.getCounts()) { if (payOrderParam.getNumber() > ticketData.getCounts()) {
return ResponseDto.failure("非法下单"); return ResponseDto.failure("优先购时段内,本场演出限购"+ticketData.getCounts()+"张");
} }
int advanceCount = dataUtils.incrUseMemberCount(uid, performanceData.getPerformancesId()); int advanceCount = dataUtils.incrUseMemberCount(uid, performanceData.getPerformancesId());
if (advanceCount > 1) {//todo if (advanceCount > 1) {//todo
dataUtils.decrUseMemberCount(uid, performanceData.getPerformancesId()); dataUtils.decrUseMemberCount(uid, performanceData.getPerformancesId());
return ResponseDto.failure("非法下单"); return ResponseDto.failure("本场演出限用1张优先券,已超出");
} }
} }
if (ticketData.getIsExclusive() == 1) { if (ticketData.getIsExclusive() == 1) {
...@@ -279,7 +279,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -279,7 +279,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
if (couponCount > 1) {//todo if (couponCount > 1) {//todo
useAdvance = false; useAdvance = false;
dataUtils.decrUseCouponCount(uid, performanceData.getPerformancesId()); dataUtils.decrUseCouponCount(uid, performanceData.getPerformancesId());
return ResponseDto.failure("非法下单"); return ResponseDto.failure("本场演出限用1张优先券,已超出");
} }
} }
} }
......
...@@ -98,12 +98,12 @@ public class OrderUtils { ...@@ -98,12 +98,12 @@ public class OrderUtils {
public String judgeMemberType(int performanceLimitCount, int performanceMemberLimitCount, int performanceLimitIdCard, public String judgeMemberType(int performanceLimitCount, int performanceMemberLimitCount, int performanceLimitIdCard,
int ticketLimitCount, int ticketMemberLimitCount, int ticketLimitIdCard, int memberType, int ticketLimitCount, int ticketMemberLimitCount, int ticketLimitIdCard, int memberType,
int performanceBuyCountUid, int ticketBuyCountUid, int performanceBuyCountIdCard, int ticketBuyCountIdCard, int isTrueName) { int performanceBuyCountUid, int ticketBuyCountUid, int performanceBuyCountIdCard, int ticketBuyCountIdCard, int isTrueName) {
// log.debug("会员限购演出=" + performanceMemberLimitCount); log.info("会员限购演出=" + performanceMemberLimitCount);
// log.debug("限购演出=" + performanceLimitCount); log.info("限购演出=" + performanceLimitCount);
// log.debug("实名限购演出=" + performanceLimitIdCard); log.info("实名限购演出=" + performanceLimitIdCard);
// log.debug("会员限购票种=" + ticketMemberLimitCount); log.info("会员限购票种=" + ticketMemberLimitCount);
// log.debug("限购票种=" + ticketLimitCount); log.info("限购票种=" + ticketLimitCount);
// log.debug("实名限购票种=" + ticketLimitIdCard); log.info("实名限购票种=" + ticketLimitIdCard);
log.info("演出数量=" + performanceBuyCountUid); log.info("演出数量=" + performanceBuyCountUid);
log.info("演出实名数量=" + performanceBuyCountIdCard); log.info("演出实名数量=" + performanceBuyCountIdCard);
......
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