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

Commit 4511a787 authored by wyf's avatar wyf

Merge remote-tracking branch 'origin/dev_Invoice_reminder_control' into dev_performance_subscribe

parents 95ce5015 611898c9
......@@ -124,6 +124,9 @@ public class PerformancePartnerVo implements Serializable, Cloneable {
@ApiModelProperty(value = "是否保存", example = "")
private Integer isCreateSave;
@ApiModelProperty(value = "开票提醒 0为不提醒", example = "0")
private Integer isInvoiceReminder;
public Integer getIdCount() {
return idCount==null?limitCount:idCount;
}
......
......@@ -27,6 +27,10 @@ public class PerformanceStep2Param implements Serializable,Cloneable {
@NotNull(message = "不能为空")
private Integer idCount;
@ApiModelProperty(value = "开票提醒 0为不提醒", example = "0")
@NotNull(message = "不能为空")
private Integer isInvoiceReminder;
@ApiModelProperty(value = "是否提交 1提交 0不提交(不验证参数)", example = "0")
@NotNull(message = "不能为空")
private Integer isSubmit;
......
......@@ -140,6 +140,10 @@ public class KylinPerformanceVo implements Serializable, Cloneable {
private Integer fieldAuditStatus;
@ApiModelProperty(value = "是否预约演出 0 无 1有")
private Integer isSubscribe;
@ApiModelProperty(value = "开票提醒 0为不提醒", example = "0")
private Integer isInvoiceReminder;
public Integer getIdCount() {
return idCount == null ? limitCount : idCount;
}
......@@ -230,6 +234,7 @@ public class KylinPerformanceVo implements Serializable, Cloneable {
this.statusSell = performanceStatus.getStatusSell();
this.isRecommend = performanceStatus.getIsRecommend();
this.isTrueName = performanceStatus.getIsTrueName();
this.isInvoiceReminder = performanceStatus.getIsInvoiceReminder();
this.limitCount = performanceStatus.getLimitCount();
this.idCount = performanceStatus.getIdCount();
this.limitCountMember = performanceStatus.getLimitCountMember();
......@@ -255,6 +260,7 @@ public class KylinPerformanceVo implements Serializable, Cloneable {
this.statusSell = performanceStatus.getStatusSell();
this.isRecommend = 0;
this.isTrueName = performanceStatus.getIsTrueName();
this.isInvoiceReminder = performanceStatus.getIsInvoiceReminder();
this.limitCount = performanceStatus.getLimitCount();
this.idCount = performanceStatus.getIdCount();
this.limitCountMember = 1;
......
......@@ -134,6 +134,9 @@ public class KylinPerformanceMisVo implements Cloneable{
@ApiModelProperty(value = "场次数据")
private List<TicketTimesTicketCreatePartnerVo> ticketTimes;
@ApiModelProperty(value = "开票提醒 0为不提醒", example = "0")
private Integer isInvoiceReminder;
private static final KylinPerformanceMisVo obj = new KylinPerformanceMisVo();
public static KylinPerformanceMisVo getNew() {
try {
......
......@@ -160,6 +160,11 @@ public class KylinPerformanceStatus implements Serializable ,Cloneable{
*/
private Integer fieldAuditStatus;
/**
* 开票提醒
*/
private Integer isInvoiceReminder;
/**
* 创建时间
*/
......@@ -184,7 +189,7 @@ public class KylinPerformanceStatus implements Serializable ,Cloneable{
vo.getPerformanceStatusId(),vo.getPerformanceId(),
vo.getIsShow(),vo.getStatus(),vo.getStatusSell(),
vo.getIsDistribution(),vo.getSyncAgent(),0,
vo.getAuditStatus(),vo.getIsTrueName(),vo.getLimitCount(),vo.getIdCount(),
vo.getAuditStatus(),vo.getIsTrueName(),vo.getLimitCount(),vo.getIdCount(),vo.getIsInvoiceReminder(),
vo.getLimitCountMember(),vo.getFieldAuditStatus(),vo.getCreatedAt(),vo.getUpdatedAt()
};
}
......
......@@ -278,3 +278,6 @@ ALTER TABLE kylin_performance_status
ADD id_count int DEFAULT NULL COMMENT '实名限购数';
ALTER TABLE kylin_ticket_status
ADD id_count int DEFAULT NULL COMMENT '实名限购数';
ALTER TABLE kylin_performance_status
ADD column `is_invoice_reminder` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否开启开票提醒 0不开启 1开启'
\ No newline at end of file
......@@ -107,6 +107,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
PerformancePartnerVo performancePartnerVo = PerformancePartnerVo.getNew();
BeanUtils.copyProperties(step1Param, performancePartnerVo);
performancePartnerVo.setIsTrueName(0);
performancePartnerVo.setIsInvoiceReminder(0);
performancePartnerVo.setLimitCount(0);
performancePartnerVo.setIdCount(0);
performancePartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
......@@ -158,6 +159,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
performancePartnerVo.setFieldName(redisSlimeUtils.getFieldVo(step1Param.getFieldId()).getName());
if (data != null) { // 有修改记录
performancePartnerVo.setIsTrueName(data.getIsTrueName());
performancePartnerVo.setIsInvoiceReminder(data.getIsInvoiceReminder());
performancePartnerVo.setLimitCount(data.getLimitCount());
performancePartnerVo.setIdCount(data.getIdCount());
performancePartnerVo.setStatusSell(data.getStatusSell());
......@@ -167,6 +169,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
} else { // 无修改记录
KylinPerformanceVo vo = redisSlimeUtils.getPerformanceVo(performanceId);
performancePartnerVo.setIsTrueName(vo.getIsTrueName());
performancePartnerVo.setIsInvoiceReminder(vo.getIsInvoiceReminder());
performancePartnerVo.setLimitCount(vo.getLimitCount());
performancePartnerVo.setIdCount(vo.getIdCount());
performancePartnerVo.setStatusSell(vo.getStatusSell());
......@@ -249,6 +252,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
PerformancePartnerVo performancePartnerVo = PerformancePartnerVo.getNew();
performancePartnerVo.setPerformancesId(performanceId);
performancePartnerVo.setIsTrueName(step2Param.getIsTrueName());
performancePartnerVo.setIsInvoiceReminder(step2Param.getIsInvoiceReminder());
performancePartnerVo.setLimitCount(step2Param.getLimitCount());
performancePartnerVo.setIdCount(step2Param.getIdCount());
performancePartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
......@@ -345,6 +349,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
PerformancePartnerVo performancePartnerVo = PerformancePartnerVo.getNew();
performancePartnerVo.setPerformancesId(performanceId);
performancePartnerVo.setIsTrueName(step2Param.getIsTrueName());
performancePartnerVo.setIsInvoiceReminder(step2Param.getIsInvoiceReminder());
performancePartnerVo.setLimitCount(step2Param.getLimitCount());
performancePartnerVo.setIdCount(step2Param.getIdCount());
performancePartnerVo.setCreatedAt(now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
......@@ -391,7 +396,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
now, kylinPerformanceMisVo.getNoticeImage(), performanceId, now, now
});
sqlsDataB.add(new Object[]{
performancePartnerVo.getFieldAuditStatus(), performancePartnerVo.getAuditStatus(), step2Param.getIsTrueName(), step2Param.getLimitCount(),step2Param.getIdCount(), performanceId, now, now
performancePartnerVo.getFieldAuditStatus(), performancePartnerVo.getAuditStatus(), step2Param.getIsTrueName(), step2Param.getLimitCount(),step2Param.getIdCount(),step2Param.getIsInvoiceReminder(), performanceId, now, now
});
redisSlimeUtils.setPerformanceIsTrueName(performanceId, step2Param.getIsTrueName());
......@@ -477,6 +482,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
vo.setFieldAuditStatus(performancePartnerVo.getFieldAuditStatus());
vo.setAuditStatus(performancePartnerVo.getAuditStatus());
vo.setIsTrueName(step2Param.getIsTrueName());
vo.setIsInvoiceReminder(step2Param.getIsInvoiceReminder());
vo.setLimitCount(step2Param.getLimitCount());
vo.setIdCount(step2Param.getIdCount());
mongoSlimeUtils.updateKylinPerformanceVoById(vo);
......
......@@ -27,22 +27,22 @@ 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_performance_status.updateStep2=UPDATE kylin_performance_status SET field_audit_status = ? ,audit_status = ? , is_true_name = ? , limit_count = ?,id_count =?, is_invoice_reminder =? 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_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 ----
......@@ -54,7 +54,7 @@ kylin_performance_status.del=DELETE FROM kylin_performance_status WHERE performa
kylin_performance_relations.del=DELETE FROM kylin_performance_relations WHERE performance_id = ?
#province_id,province_name,district_id,district_name
kylin_performances.insert=INSERT INTO kylin_performances (performances_id,title,type,img_poster,city_id,city_name,approval_url,notice,sponsor_id,sponsor_type,sponsor,contacts,mobile,describes,details,notice_image,time_start,time_end,sort,comment,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
kylin_performance_status.insert=INSERT INTO kylin_performance_status (performance_status_id,performance_id,is_show,status,status_sell,is_distribution,sync_agent,sync_damai,audit_status,is_true_name,limit_count,id_count,limit_count_member,field_audit_status,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
kylin_performance_status.insert=INSERT INTO kylin_performance_status (performance_status_id,performance_id,is_show,status,status_sell,is_distribution,sync_agent,sync_damai,audit_status,is_true_name,limit_count,id_count,is_invoice_reminder,limit_count_member,field_audit_status,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
kylin_performance_relations.insert=INSERT INTO kylin_performance_relations (performance_relations_id,performance_id,copy_id,merchant_id,field_id,road_show_id,project_id,video_id,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?)
kylin_ticket_times.del=DELETE FROM kylin_ticket_times WHERE ticket_times_id = ?
......
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