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

Commit decb0ea7 authored by 胡佳晨's avatar 胡佳晨

暂时提交一部分

parent cee358ed
...@@ -33,7 +33,7 @@ public class KylinPerformanceVo implements Serializable, Cloneable{ ...@@ -33,7 +33,7 @@ public class KylinPerformanceVo implements Serializable, Cloneable{
private String approvalUrl; 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 Integer type;
@ApiModelProperty(value = "演出开始时间") @ApiModelProperty(value = "演出开始时间")
private String timeStart; private String timeStart;
@ApiModelProperty(value = "演出结束时间") @ApiModelProperty(value = "演出结束时间")
......
...@@ -406,7 +406,6 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa ...@@ -406,7 +406,6 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
ticketData = ticketStatus; ticketData = ticketStatus;
break; break;
} }
break;
} }
} }
...@@ -420,11 +419,11 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa ...@@ -420,11 +419,11 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
ticketData.setTimeStart(ticketItem.getTimeStart()); ticketData.setTimeStart(ticketItem.getTimeStart());
ticketData.setTimeEndExpress(ticketItem.getTimeEndExpress()); ticketData.setTimeEndExpress(ticketItem.getTimeEndExpress());
ticketData.setPrice(ticketItem.getPrice()); ticketData.setPrice(ticketItem.getPrice());
ticketData.setMemberTimeStart(DateUtil.Formatter.yyyyMMddHHmmss.format(DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketItem.getTimeStart()).minusMinutes( kylinPerformanceMisVo.getPayCountdownMinute()))); ticketData.setMemberTimeStart(DateUtil.Formatter.yyyyMMddHHmmss.format(DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketItem.getTimeStart()).minusMinutes(kylinPerformanceMisVo.getPayCountdownMinute())));
ticketData.setTotalExchange(ticketItem.getTotalExchange()); ticketData.setTotalExchange(ticketItem.getTotalExchange());
ticketData.setTotalGeneral(ticketItem.getTotalGeneral()); ticketData.setTotalGeneral(ticketItem.getTotalGeneral());
ticketData.setIsTrueName(kylinPerformanceMisVo.getIsTrueName()); ticketData.setIsTrueName(kylinPerformanceMisVo.getIsTrueName());
ticketData.setLimitCount( ticketItem.getLimitCount()); ticketData.setLimitCount(ticketItem.getLimitCount());
ticketData.setIsLackRegister(ticketItem.getIsLackRegister()); ticketData.setIsLackRegister(ticketItem.getIsLackRegister());
ticketData.setIsExpress(ticketItem.getIsExpress()); ticketData.setIsExpress(ticketItem.getIsExpress());
ticketData.setIsElectronic(ticketItem.getIsElectronic()); ticketData.setIsElectronic(ticketItem.getIsElectronic());
...@@ -849,6 +848,8 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa ...@@ -849,6 +848,8 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
2, performancesId, now, now 2, performancesId, now, now
)); ));
} }
performanceVo.setType(null);
performancePartnerVo.setType(null);
mongoSlimeUtils.updatePerformancePartnerVoById(performancePartnerVo); mongoSlimeUtils.updatePerformancePartnerVoById(performancePartnerVo);
mongoSlimeUtils.updateKylinPerformanceVoById(performanceVo); mongoSlimeUtils.updateKylinPerformanceVoById(performanceVo);
redisSlimeUtils.delPerformanceVo(performanceVo.getPerformancesId()); redisSlimeUtils.delPerformanceVo(performanceVo.getPerformancesId());
......
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