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

Commit 3117a1cc authored by 胡佳晨's avatar 胡佳晨

提交配置文件

parent 4c55c0ed
...@@ -28,6 +28,8 @@ public class KylinPerformanceVo { ...@@ -28,6 +28,8 @@ public class KylinPerformanceVo {
private String imgPoster; private String imgPoster;
@ApiModelProperty(value = "支付倒计时") @ApiModelProperty(value = "支付倒计时")
private Integer payCountdownMinute; private Integer payCountdownMinute;
@ApiModelProperty(value = "演出批文地址")
private String approvalUrl;
@ApiModelProperty(value = "101音乐节 102小型演出(livehouse演出) 103巡演") @ApiModelProperty(value = "101音乐节 102小型演出(livehouse演出) 103巡演")
// @ApiModelProperty(value = "演出类型 1音乐节 2演唱会 3小型演出 4展览 6舞台剧 101音乐节 102小型演出(livehouse演出) 103巡演") // @ApiModelProperty(value = "演出类型 1音乐节 2演唱会 3小型演出 4展览 6舞台剧 101音乐节 102小型演出(livehouse演出) 103巡演")
private int type; private int type;
...@@ -93,6 +95,8 @@ public class KylinPerformanceVo { ...@@ -93,6 +95,8 @@ public class KylinPerformanceVo {
private Integer sysDamai; private Integer sysDamai;
@ApiModelProperty(value = "文案") @ApiModelProperty(value = "文案")
private String message; private String message;
@ApiModelProperty(value = "演出公告")
private String notice;
@ApiModelProperty(value = "场次") @ApiModelProperty(value = "场次")
private List<KylinTicketTimesVo> ticketTimeList; private List<KylinTicketTimesVo> ticketTimeList;
...@@ -109,6 +113,7 @@ public class KylinPerformanceVo { ...@@ -109,6 +113,7 @@ public class KylinPerformanceVo {
this.type = performance.getType(); this.type = performance.getType();
this.details =performance.getDetails(); this.details =performance.getDetails();
this.noticeImage = performance.getNoticeImage(); this.noticeImage = performance.getNoticeImage();
this.notice=performance.getNotice();
} }
public void setTimePriceVipAndLack(int isLackRegister, int isMember, int isExclusive, BigDecimal price, LocalDateTime stopSellTime, LocalDateTime sellTime,int isAdvance,int isDiscount,int payCountdownMinute) { public void setTimePriceVipAndLack(int isLackRegister, int isMember, int isExclusive, BigDecimal price, LocalDateTime stopSellTime, LocalDateTime sellTime,int isAdvance,int isDiscount,int payCountdownMinute) {
......
...@@ -109,6 +109,24 @@ global-auth: ...@@ -109,6 +109,24 @@ global-auth:
- /v2/api-docs* - /v2/api-docs*
- /station/login - /station/login
- /station/login/sms - /station/login/sms
# -
- /partner/buyNotice/**
- /partner/checkUser/**
- /partner/checkUser/performance/**
- /partner/ticket/**
- /partner/times/**
- /partner/performance/**
- /banners/**
- /order/**
- /performance/localList
- /performance/noticeList
- /performance/recommendList
- /performance/exclusiveList
- /performance/search
- /performance/calendar
- /performance/calendarPerformances
- /performance/*
# ----------------------------------------------------------- # -----------------------------------------------------------
# ----------------------------------------------------------- # -----------------------------------------------------------
......
...@@ -365,7 +365,11 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -365,7 +365,11 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
performances.setAuditTime(LocalDateTime.now()); performances.setAuditTime(LocalDateTime.now());
performancesMapper.update(performances, new UpdateWrapper<KylinPerformances>().eq("performances_id", performanceId)); performancesMapper.update(performances, new UpdateWrapper<KylinPerformances>().eq("performances_id", performanceId));
KylinPerformanceStatus performanceStatus = new KylinPerformanceStatus(); KylinPerformanceStatus performanceStatus = new KylinPerformanceStatus();
performanceStatus.setAuditStatus(0); if(performanceVoTask.judgeIsAudit(performanceId)) {
performanceStatus.setAuditStatus(0);
}else{
performanceStatus.setAuditStatus(1);
}
performanceStatusMapper.update(performanceStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performanceId)); performanceStatusMapper.update(performanceStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performanceId));
//提示:票种价格、售票时间、购票限制 直接生效 //提示:票种价格、售票时间、购票限制 直接生效
......
...@@ -349,4 +349,47 @@ public class PerformanceVoTask { ...@@ -349,4 +349,47 @@ public class PerformanceVoTask {
e.printStackTrace(); e.printStackTrace();
} }
} }
public boolean judgeIsAudit(String performanceId){
KylinPerformanceMisVo misVo = getPerformanceMisVo(performanceId);
KylinPerformanceVo mongoVo = mongoVoUtils.combinePerformanceVoData(performanceId);
if(!misVo.getTitle().equals(mongoVo.getTitle())){
return true;
}else if(!misVo.getType().equals(mongoVo.getType())){
return true;
}else if(!misVo.getTimeStart().equals(mongoVo.getTimeStart())){
return true;
}else if(!misVo.getTimeEnd().equals(mongoVo.getTimeEnd())){
return true;
}else if(!misVo.getFieldId().equals(mongoVo.getFieldId())){
return true;
}else if(!misVo.getNotice().equals(mongoVo.getNotice())){
return true;
}else if(!misVo.getDetails().equals(mongoVo.getDetails())){
return true;
}else if(!misVo.getApprovalUrl().equals(mongoVo.getApprovalUrl())){
return true;
}else if(!misVo.getPayCountdownMinute().equals(mongoVo.getPayCountdownMinute())){
return true;
}else if(!misVo.getLimitCount().equals(mongoVo.getLimitCount())){
return true;
} else if(!misVo.getIsTrueName().equals(mongoVo.getIsTrueName())){
return true;
}
boolean exists = mongoTemplate.exists(Query.query(Criteria.where("status").is("-1").and("performancesId").is(performanceId)),KylinTicketTimesPartnerVo.class,KylinTicketTimesPartnerVo.class.getSimpleName());
if(exists){
return true;
}
for (int i = 0;i<misVo.getTicketTimes().size();i++){
TicketTimesTicketCreatePartnerVo times = misVo.getTicketTimes().get(i);
boolean exists2 = mongoTemplate.exists(Query.query(Criteria.where("status").is("-2").and("timesId").is(times.getTicketTimesId())),KylinTicketPartnerVo.class,KylinTicketPartnerVo.class.getSimpleName());
if(exists2){
return true;
}
}
return false;
}
} }
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