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

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

slime 添加实名限购字段 idCount

parent fe95331f
......@@ -76,6 +76,9 @@ public class PerformancePartnerVo implements Serializable, Cloneable {
@ApiModelProperty(value = "限购数量 0为不限购", example = "0")
private Integer limitCount;
@ApiModelProperty(value = "实名数量 0为不限购", example = "0")
private Integer idCount;
@ApiModelProperty(value = "是否提交 1提交 0不提交(不验证参数)", example = "0")
private Integer isSubmit;
......@@ -121,6 +124,10 @@ public class PerformancePartnerVo implements Serializable, Cloneable {
@ApiModelProperty(value = "是否保存", example = "")
private Integer isCreateSave;
public Integer getIdCount() {
return idCount==null?limitCount:idCount;
}
private static final PerformancePartnerVo obj = new PerformancePartnerVo();
public static PerformancePartnerVo getNew() {
......@@ -151,6 +158,7 @@ public class PerformancePartnerVo implements Serializable, Cloneable {
this.setNoticeImage(performances.getNoticeImage());
this.setIsTrueName(performanceStatus.getIsTrueName());
this.setLimitCount(performanceStatus.getLimitCount());
this.setIdCount(performanceStatus.getIdCount());
this.setStatus(performanceStatus.getStatus());
this.setMerchantId(kylinPerformanceRelations.getMerchantId());
this.setDescribes(performances.getDescribes());
......
......@@ -23,6 +23,10 @@ public class PerformanceStep2Param implements Serializable,Cloneable {
@NotNull(message = "不能为空")
private Integer limitCount;
@ApiModelProperty(value = "实名限购 0为不限购", example = "0")
@NotNull(message = "不能为空")
private Integer idCount;
@ApiModelProperty(value = "是否提交 1提交 0不提交(不验证参数)", example = "0")
@NotNull(message = "不能为空")
private Integer isSubmit;
......
......@@ -75,6 +75,10 @@ public class TicketCreateParam implements Serializable {
@NotNull(message = "限购数量不能为空")
private Integer limitCount;
@ApiModelProperty(value = "实名数量", example = "0")
@NotNull(message = "限购数量不能为空")
private Integer idCount;
@ApiModelProperty(value = "票种开售时间", example = "2020-12-01T12:00:00")
@NotNull(message = "票种开售时间不能为空")
private LocalDateTime timeStart;
......
......@@ -79,6 +79,8 @@ public class KylinTicketVo implements Serializable,Cloneable{
private Integer isTrueName;
@ApiModelProperty(value = "限购张数")
private Integer limitCount;
@ApiModelProperty(value = "实名限购张数")
private Integer idCount;
@ApiModelProperty(value = "会员限购张数")
private Integer limitCountMember;
@ApiModelProperty(value = "是否会员专属 0 1")
......@@ -100,6 +102,10 @@ public class KylinTicketVo implements Serializable,Cloneable{
@ApiModelProperty(value = "总兑换库存")
private Integer totalExchange;
public Integer getIdCount() {
return idCount==null?limitCount:idCount;
}
public void setTicket(KylinTickets ticket) {
this.mid = ticket.getMid();
this.ticketsId = ticket.getTicketsId();
......@@ -140,6 +146,7 @@ public class KylinTicketVo implements Serializable,Cloneable{
this.isStudent = ticketStatus.getIsStudent();
this.limitCountMember = ticketStatus.getMemberLimitCount();
this.limitCount = ticketStatus.getLimitCount();
this.idCount = ticketStatus.getIdCount();
this.counts = ticketStatus.getCounts();
this.sysDamai = ticketStatus.getSyncDamai();
this.isShowCode = ticketStatus.getIsShowCode();
......
......@@ -85,6 +85,8 @@ public class KylinPerformanceVo implements Serializable, Cloneable{
private Integer isTrueName;
@ApiModelProperty(value = "限购张数")
private Integer limitCount;
@ApiModelProperty(value = "实名数量 0为不限购")
private Integer idCount;
@ApiModelProperty(value = "会员限购张数")
private Integer limitCountMember;
@ApiModelProperty(value = "是否专属")
......@@ -130,6 +132,10 @@ public class KylinPerformanceVo implements Serializable, Cloneable{
@ApiModelProperty(value = "场地审核状态 [0-审核完成|1-待审核|2-已拒绝]", hidden = true)
private Integer fieldAuditStatus;
public Integer getIdCount() {
return idCount==null?limitCount:idCount;
}
private static final KylinPerformanceVo obj = new KylinPerformanceVo();
public static KylinPerformanceVo getNew() {
......@@ -209,6 +215,7 @@ public class KylinPerformanceVo implements Serializable, Cloneable{
this.isRecommend = performanceStatus.getIsRecommend();
this.isTrueName = performanceStatus.getIsTrueName();
this.limitCount = performanceStatus.getLimitCount();
this.idCount = performanceStatus.getIdCount();
this.limitCountMember = performanceStatus.getLimitCountMember();
this.sysDamai = performanceStatus.getSyncDamai();
this.isShow = performanceStatus.getIsShow();
......@@ -233,6 +240,7 @@ public class KylinPerformanceVo implements Serializable, Cloneable{
this.isRecommend = 0;
this.isTrueName = performanceStatus.getIsTrueName();
this.limitCount = performanceStatus.getLimitCount();
this.idCount = performanceStatus.getIdCount();
this.limitCountMember = 1;
this.sysDamai = 0;
this.isShow = performanceStatus.getIsShow();
......
......@@ -48,6 +48,9 @@ public class KylinTicketPartnerVo implements Serializable,Cloneable {
@ApiModelProperty(value = "限购数量", example = "0")
private Integer limitCount;
@ApiModelProperty(value = "限购数量", example = "0")
private Integer idCount;
@ApiModelProperty(value = "次数", example = "0")
private Integer counts;
......@@ -122,6 +125,10 @@ public class KylinTicketPartnerVo implements Serializable,Cloneable {
this.setSurplusGeneral(this.getTotalGeneral());
}
public Integer getIdCount() {
return idCount==null?limitCount:idCount;
}
private static final KylinTicketPartnerVo obj = new KylinTicketPartnerVo();
public static KylinTicketPartnerVo getNew() {
try {
......@@ -143,6 +150,7 @@ public class KylinTicketPartnerVo implements Serializable,Cloneable {
this.totalGeneral = ts.getTotalGeneral();
this.totalExchange = ts.getTotalExchange();
this.limitCount = ts.getLimitCount();
this.idCount = ts.getIdCount();
this.counts = ts.getCounts();
this.timeStart = DateUtil.Formatter.yyyyMMddHHmmss.format(t.getTimeStart());
this.timeEnd = DateUtil.Formatter.yyyyMMddHHmmss.format(t.getTimeEnd());
......
......@@ -481,6 +481,7 @@ public class PerformanceVoUtils {
} else {
//不改动数据 价格 限购 购票时间
ticketStatus.setLimitCount(null);
ticketStatus.setIdCount(null);
ticketStatus.setTotalGeneral(null);
ticketStatus.setTotalExchange(null);
tickets.setTimeStart(null);
......
......@@ -79,6 +79,11 @@ public class KylinPerformanceStatus implements Serializable ,Cloneable{
*/
private Integer limitCount;
/**
* 实名限购张数 0无限 (开启实名 则实名限购 未开始为账号限购)
*/
private Integer idCount;
/**
* 会员限购张数 0无限 (开启实名 则实名限购 未开始为账号限购)
*/
......
......@@ -119,6 +119,11 @@ public class KylinTicketStatus implements Serializable ,Cloneable {
*/
private Integer limitCount;
/**
* 实名限购张数 0无限 (开启实名 则实名限购 未开始为账号限购)
*/
private Integer idCount;
/**
* 会员限购张数 0无限 (开启实名 则实名限购 未开始为账号限购)
*/
......
......@@ -136,6 +136,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
BeanUtils.copyProperties(step1Param, performancePartnerVo);
performancePartnerVo.setIsTrueName(0);
performancePartnerVo.setLimitCount(0);
performancePartnerVo.setIdCount(0);
performancePartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
performancePartnerVo.setIsSubmit(0);
performancePartnerVo.setStatus(0);
......@@ -183,6 +184,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
if (data != null) { // 有修改记录
performancePartnerVo.setIsTrueName(data.getIsTrueName());
performancePartnerVo.setLimitCount(data.getLimitCount());
performancePartnerVo.setIdCount(data.getIdCount());
performancePartnerVo.setStatusSell(data.getStatusSell());
performancePartnerVo.setRoadShowId(data.getRoadShowId());
performancePartnerVo.setProjectId(data.getProjectId());
......@@ -196,6 +198,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
KylinPerformanceRelations relationsData = performanceRelationsMapper.selectOne(Wrappers.lambdaQuery(KylinPerformanceRelations.class).eq(KylinPerformanceRelations::getPerformanceId, performanceId));
performancePartnerVo.setIsTrueName(statusData.getIsTrueName());
performancePartnerVo.setLimitCount(statusData.getLimitCount());
performancePartnerVo.setIdCount(statusData.getStatus());
performancePartnerVo.setStatusSell(statusData.getStatusSell());
performancePartnerVo.setRoadShowId(relationsData.getRoadShowId());
performancePartnerVo.setProjectId(relationsData.getProjectId());
......@@ -387,6 +390,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
performanceStatus.setAuditStatus((int) map.get("auditStatus"));
performanceStatus.setIsTrueName(step2Param.getIsTrueName());
performanceStatus.setLimitCount(step2Param.getLimitCount());
performanceStatus.setIdCount(step2Param.getIdCount());
performanceStatusMapper.update(performanceStatus, Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, performanceId));
dataUtils.setPerformanceIsTrueName(performanceId, step2Param.getIsTrueName());
......@@ -412,6 +416,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
inventory.setTotalGeneral(ticketItem.getTotalGeneral());
inventory.setIsTrueName(kylinPerformanceMisVo.getIsTrueName());
inventory.setLimitCount(ticketItem.getLimitCount());
inventory.setLimitCount(ticketItem.getIdCount());
inventory.setIsLackRegister(ticketItem.getIsLackRegister());
inventory.setIsExpress(ticketItem.getIsExpress());
inventory.setIsElectronic(ticketItem.getIsElectronic());
......
......@@ -107,6 +107,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
BeanUtils.copyProperties(step1Param, performancePartnerVo);
performancePartnerVo.setIsTrueName(0);
performancePartnerVo.setLimitCount(0);
performancePartnerVo.setIdCount(0);
performancePartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
performancePartnerVo.setIsSubmit(0);
performancePartnerVo.setStatus(0);
......@@ -157,6 +158,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
if (data != null) { // 有修改记录
performancePartnerVo.setIsTrueName(data.getIsTrueName());
performancePartnerVo.setLimitCount(data.getLimitCount());
performancePartnerVo.setIdCount(data.getIdCount());
performancePartnerVo.setStatusSell(data.getStatusSell());
performancePartnerVo.setRoadShowId(data.getRoadShowId());
performancePartnerVo.setProjectId(data.getProjectId());
......@@ -165,6 +167,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
KylinPerformanceVo vo = redisSlimeUtils.getPerformanceVo(performanceId);
performancePartnerVo.setIsTrueName(vo.getIsTrueName());
performancePartnerVo.setLimitCount(vo.getLimitCount());
performancePartnerVo.setIdCount(vo.getIdCount());
performancePartnerVo.setStatusSell(vo.getStatusSell());
performancePartnerVo.setRoadShowId(vo.getRoadShowId());
performancePartnerVo.setProjectId(vo.getProjectId());
......@@ -246,6 +249,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
performancePartnerVo.setPerformancesId(performanceId);
performancePartnerVo.setIsTrueName(step2Param.getIsTrueName());
performancePartnerVo.setLimitCount(step2Param.getLimitCount());
performancePartnerVo.setIdCount(step2Param.getIdCount());
performancePartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
performancePartnerVo.setIsSubmit(step2Param.getIsSubmit());
// performancePartnerVo.setStatusSell(1);
......@@ -341,6 +345,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
performancePartnerVo.setPerformancesId(performanceId);
performancePartnerVo.setIsTrueName(step2Param.getIsTrueName());
performancePartnerVo.setLimitCount(step2Param.getLimitCount());
performancePartnerVo.setIdCount(step2Param.getIdCount());
performancePartnerVo.setCreatedAt(now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
performancePartnerVo.setUpdatedAt(now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
performancePartnerVo.setIsSubmit(step2Param.getIsSubmit());
......@@ -425,6 +430,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
ticketData.setTotalGeneral(ticketItem.getTotalGeneral());
ticketData.setIsTrueName(kylinPerformanceMisVo.getIsTrueName());
ticketData.setLimitCount(ticketItem.getLimitCount());
ticketData.setIdCount(ticketItem.getIdCount());
ticketData.setIsLackRegister(ticketItem.getIsLackRegister());
ticketData.setIsExpress(ticketItem.getIsExpress());
ticketData.setIsElectronic(ticketItem.getIsElectronic());
......@@ -471,6 +477,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
vo.setAuditStatus(performancePartnerVo.getAuditStatus());
vo.setIsTrueName(step2Param.getIsTrueName());
vo.setLimitCount(step2Param.getLimitCount());
vo.setIdCount(step2Param.getIdCount());
mongoSlimeUtils.updateKylinPerformanceVoById(vo);
redisSlimeUtils.delPerformanceVo(performanceId);
......
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