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

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

修改 会员审核bug

parent 0d3fbb85
...@@ -114,6 +114,6 @@ public class KylinTicketPartnerVo implements Serializable { ...@@ -114,6 +114,6 @@ public class KylinTicketPartnerVo implements Serializable {
this.setIsTransfer(0); this.setIsTransfer(0);
this.setIsExclusive(0); this.setIsExclusive(0);
this.setSurplusExchange(this.getTotalExchange()); this.setSurplusExchange(this.getTotalExchange());
this.setSurplusGeneral(this.getTotalExchange()); this.setSurplusGeneral(this.getTotalGeneral());
} }
} }
\ No newline at end of file
...@@ -129,9 +129,16 @@ ...@@ -129,9 +129,16 @@
function submitHandler() { function submitHandler() {
if ($.validate.form()) { if ($.validate.form()) {
$.operate.save(prefix + "/save", $('#form-member-audit').serialize()); const auditStatus = document.getElementsByName("status")[0].checked ? 3 : 4;
if (4 === auditStatus) {
auditRejectTxt = document.getElementsByName("rejectTxt")[0].value;
}if (4 === auditStatus && auditRejectTxt === "") {
alert("请填写拒绝理由");
} else {
$.operate.save(prefix + "/save", $('#form-member-audit').serialize());
}
} }
} }
</script> </script>
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -156,7 +156,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma ...@@ -156,7 +156,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
mapSql.put("status", 9); mapSql.put("status", 9);
mapSql.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); mapSql.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
performanceVoUtils.updatePerformanceMySql(performancesId, mapSql, performanceVoUtils.getPerformanceMisVo(performancesId), updatedAt, auditStatus); performanceVoUtils.updatePerformanceMySql(performancesId, mapSql, performanceVoUtils.getPerformanceMisVo(performancesId), updatedAt, auditStatus);
if (sqlStatus.getStatus() >= 6 && sqlStatus.getStatus()!=7) {//若 演出上 则 线判断状态 if (sqlStatus.getStatus() >= 6 && sqlStatus.getStatus() != 7) {//若 演出上 则 线判断状态
performanceVoUtils.performanceVoStatus(performancesId); performanceVoUtils.performanceVoStatus(performancesId);
} }
} }
...@@ -202,7 +202,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma ...@@ -202,7 +202,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
public List<PerformanceAdminListDao> getList(PerformanceAdminListParam performanceAdminListParam) { public List<PerformanceAdminListDao> getList(PerformanceAdminListParam performanceAdminListParam) {
List<PerformanceAdminListDao> newList = new ArrayList(); List<PerformanceAdminListDao> newList = new ArrayList();
try { try {
Map<String ,Object> map = BeanUtil.convertBeanToMap(performanceAdminListParam); Map<String, Object> map = BeanUtil.convertBeanToMap(performanceAdminListParam);
List<PerformanceAdminListDao> voList = performancesMapper.misPerformanceList(map); List<PerformanceAdminListDao> voList = performancesMapper.misPerformanceList(map);
for (PerformanceAdminListDao item : voList) { for (PerformanceAdminListDao item : voList) {
item.setStatus(item.getStatus()); item.setStatus(item.getStatus());
...@@ -331,13 +331,9 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma ...@@ -331,13 +331,9 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
performanceMemberAuditDao.setIsExclusive(1); performanceMemberAuditDao.setIsExclusive(1);
} }
} }
PerformanceMemberAuditParam memberAuditVo = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), PerformanceMemberAuditParam.class, PerformanceMemberAuditParam.class.getSimpleName()); boolean isExists = mongoTemplate.exists(Query.query(Criteria.where("status").is(1).and("performancesId").is(performanceId)), PerformanceMemberAuditParam.class, PerformanceMemberAuditParam.class.getSimpleName());
if (memberAuditVo != null) { if (isExists) {
if (memberAuditVo.getStatus() == 1) {
performanceMemberAuditDao.setIsSubmit(1); performanceMemberAuditDao.setIsSubmit(1);
} else {
performanceMemberAuditDao.setIsSubmit(0);
}
} else { } else {
performanceMemberAuditDao.setIsSubmit(0); performanceMemberAuditDao.setIsSubmit(0);
} }
...@@ -347,9 +343,14 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma ...@@ -347,9 +343,14 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
@Override @Override
public boolean performanceMemberChange(PerformanceMemberAuditParam performanceMemberAuditParam) { public boolean performanceMemberChange(PerformanceMemberAuditParam performanceMemberAuditParam) {
try { try {
performanceMemberAuditParam.setStatus(1); boolean isExists = mongoTemplate.exists(Query.query(Criteria.where("status").is(1).and("performancesId").is(performanceMemberAuditParam.getPerformancesId())), PerformanceMemberAuditParam.class, PerformanceMemberAuditParam.class.getSimpleName());
mongoTemplate.insert(performanceMemberAuditParam, PerformanceMemberAuditParam.class.getSimpleName()); if (isExists) {
return true; return false;
} else {
performanceMemberAuditParam.setStatus(1);
mongoTemplate.insert(performanceMemberAuditParam, PerformanceMemberAuditParam.class.getSimpleName());
return true;
}
} catch (Exception e) { } catch (Exception e) {
return false; return false;
} }
...@@ -525,7 +526,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma ...@@ -525,7 +526,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
public boolean changeSysDamai(List<SysDamaiParam> params) { public boolean changeSysDamai(List<SysDamaiParam> params) {
try { try {
LocalDateTime updatedAt = LocalDateTime.now(); LocalDateTime updatedAt = LocalDateTime.now();
String performancesId=""; String performancesId = "";
for (SysDamaiParam item : params) { for (SysDamaiParam item : params) {
if (item.getStatus() != 0 && item.getStatus() != 1) { if (item.getStatus() != 0 && item.getStatus() != 1) {
return false; return false;
...@@ -537,7 +538,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma ...@@ -537,7 +538,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
ticketStatus.setSyncDamai(item.getStatus()); ticketStatus.setSyncDamai(item.getStatus());
ticketStatusMapper.update(ticketStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", item.getId())); ticketStatusMapper.update(ticketStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", item.getId()));
} else if (item.getType().equals("performance")) { } else if (item.getType().equals("performance")) {
performancesId=item.getId(); performancesId = item.getId();
KylinPerformanceStatus performanceStatus = new KylinPerformanceStatus(); KylinPerformanceStatus performanceStatus = new KylinPerformanceStatus();
performanceStatus.setUpdatedAt(updatedAt); performanceStatus.setUpdatedAt(updatedAt);
performanceStatus.setSyncDamai(item.getStatus()); performanceStatus.setSyncDamai(item.getStatus());
......
...@@ -356,7 +356,6 @@ public class PerformanceVoUtils { ...@@ -356,7 +356,6 @@ public class PerformanceVoUtils {
dataUtils.setSurplusExchange(tickets.getTicketsId(), ticketStatus.getSurplusExchange()); dataUtils.setSurplusExchange(tickets.getTicketsId(), ticketStatus.getSurplusExchange());
dataUtils.setSurplusGeneral(tickets.getTicketsId(), ticketStatus.getSurplusGeneral()); dataUtils.setSurplusGeneral(tickets.getTicketsId(), ticketStatus.getSurplusGeneral());
BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(map)); BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne( mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("ticketsId").is(ticketItem.getTicketsId())).getQueryObject(), Query.query(Criteria.where("ticketsId").is(ticketItem.getTicketsId())).getQueryObject(),
......
...@@ -118,8 +118,6 @@ public class ConsumerProcessor { ...@@ -118,8 +118,6 @@ public class ConsumerProcessor {
log.info("=== CONSUMER_ORDER_CREATE ==="); log.info("=== CONSUMER_ORDER_CREATE ===");
this.consumerSqlDaoHandler(msg, channel); this.consumerSqlDaoHandler(msg, channel);
} }
// 订单创建
@RabbitListener(bindings = @QueueBinding( @RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CREADE), key = MQConst.ROUTING_KEY_SQL_ORDER_CREATE, exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CREADE), key = MQConst.ROUTING_KEY_SQL_ORDER_CREATE,
value = @Queue(MQConst.QUEUES_SQL_ORDER_CREATE) value = @Queue(MQConst.QUEUES_SQL_ORDER_CREATE)
...@@ -128,8 +126,6 @@ public class ConsumerProcessor { ...@@ -128,8 +126,6 @@ public class ConsumerProcessor {
log.info("=== CONSUMER_ORDER_CREATE ==="); log.info("=== CONSUMER_ORDER_CREATE ===");
this.consumerSqlDaoHandler(msg, channel); this.consumerSqlDaoHandler(msg, channel);
} }
// 订单创建
@RabbitListener(bindings = @QueueBinding( @RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CREADE), key = MQConst.ROUTING_KEY_SQL_ORDER_CREATE, exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CREADE), key = MQConst.ROUTING_KEY_SQL_ORDER_CREATE,
value = @Queue(MQConst.QUEUES_SQL_ORDER_CREATE) value = @Queue(MQConst.QUEUES_SQL_ORDER_CREATE)
...@@ -138,8 +134,6 @@ public class ConsumerProcessor { ...@@ -138,8 +134,6 @@ public class ConsumerProcessor {
log.info("=== CONSUMER_ORDER_CREATE ==="); log.info("=== CONSUMER_ORDER_CREATE ===");
this.consumerSqlDaoHandler(msg, channel); this.consumerSqlDaoHandler(msg, channel);
} }
// 订单创建
@RabbitListener(bindings = @QueueBinding( @RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CREADE), key = MQConst.ROUTING_KEY_SQL_ORDER_CREATE, exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CREADE), key = MQConst.ROUTING_KEY_SQL_ORDER_CREATE,
value = @Queue(MQConst.QUEUES_SQL_ORDER_CREATE) value = @Queue(MQConst.QUEUES_SQL_ORDER_CREATE)
...@@ -148,8 +142,6 @@ public class ConsumerProcessor { ...@@ -148,8 +142,6 @@ public class ConsumerProcessor {
log.info("=== CONSUMER_ORDER_CREATE ==="); log.info("=== CONSUMER_ORDER_CREATE ===");
this.consumerSqlDaoHandler(msg, channel); this.consumerSqlDaoHandler(msg, channel);
} }
// 订单创建
@RabbitListener(bindings = @QueueBinding( @RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CREADE), key = MQConst.ROUTING_KEY_SQL_ORDER_CREATE, exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CREADE), key = MQConst.ROUTING_KEY_SQL_ORDER_CREATE,
value = @Queue(MQConst.QUEUES_SQL_ORDER_CREATE) value = @Queue(MQConst.QUEUES_SQL_ORDER_CREATE)
...@@ -158,6 +150,46 @@ public class ConsumerProcessor { ...@@ -158,6 +150,46 @@ public class ConsumerProcessor {
log.info("=== CONSUMER_ORDER_CREATE ==="); log.info("=== CONSUMER_ORDER_CREATE ===");
this.consumerSqlDaoHandler(msg, channel); this.consumerSqlDaoHandler(msg, channel);
} }
@RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CREADE), key = MQConst.ROUTING_KEY_SQL_ORDER_CREATE,
value = @Queue(MQConst.QUEUES_SQL_ORDER_CREATE)
))
public void consumerOrderCreate5(Message msg, Channel channel) {
log.info("=== CONSUMER_ORDER_CREATE ===");
this.consumerSqlDaoHandler(msg, channel);
}
@RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CREADE), key = MQConst.ROUTING_KEY_SQL_ORDER_CREATE,
value = @Queue(MQConst.QUEUES_SQL_ORDER_CREATE)
))
public void consumerOrderCreate6(Message msg, Channel channel) {
log.info("=== CONSUMER_ORDER_CREATE ===");
this.consumerSqlDaoHandler(msg, channel);
}
@RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CREADE), key = MQConst.ROUTING_KEY_SQL_ORDER_CREATE,
value = @Queue(MQConst.QUEUES_SQL_ORDER_CREATE)
))
public void consumerOrderCreate7(Message msg, Channel channel) {
log.info("=== CONSUMER_ORDER_CREATE ===");
this.consumerSqlDaoHandler(msg, channel);
}
@RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CREADE), key = MQConst.ROUTING_KEY_SQL_ORDER_CREATE,
value = @Queue(MQConst.QUEUES_SQL_ORDER_CREATE)
))
public void consumerOrderCreate8(Message msg, Channel channel) {
log.info("=== CONSUMER_ORDER_CREATE ===");
this.consumerSqlDaoHandler(msg, channel);
}
@RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CREADE), key = MQConst.ROUTING_KEY_SQL_ORDER_CREATE,
value = @Queue(MQConst.QUEUES_SQL_ORDER_CREATE)
))
public void consumerOrderCreate9(Message msg, Channel channel) {
log.info("=== CONSUMER_ORDER_CREATE ===");
this.consumerSqlDaoHandler(msg, channel);
}
// 订单再次支付 // 订单再次支付
@RabbitListener(bindings = @QueueBinding( @RabbitListener(bindings = @QueueBinding(
...@@ -178,7 +210,6 @@ public class ConsumerProcessor { ...@@ -178,7 +210,6 @@ public class ConsumerProcessor {
log.info("=== CONSUMER_ORDER_CLOSE ==="); log.info("=== CONSUMER_ORDER_CLOSE ===");
this.consumerSqlDaoHandler(msg, channel); this.consumerSqlDaoHandler(msg, channel);
} }
// 订单关闭
@RabbitListener(bindings = @QueueBinding( @RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CLOSE), key = MQConst.ROUTING_KEY_SQL_ORDER_CLOSE, exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CLOSE), key = MQConst.ROUTING_KEY_SQL_ORDER_CLOSE,
value = @Queue(MQConst.QUEUES_SQL_ORDER_CLOSE) value = @Queue(MQConst.QUEUES_SQL_ORDER_CLOSE)
...@@ -187,7 +218,6 @@ public class ConsumerProcessor { ...@@ -187,7 +218,6 @@ public class ConsumerProcessor {
log.info("=== CONSUMER_ORDER_CLOSE ==="); log.info("=== CONSUMER_ORDER_CLOSE ===");
this.consumerSqlDaoHandler(msg, channel); this.consumerSqlDaoHandler(msg, channel);
} }
// 订单关闭
@RabbitListener(bindings = @QueueBinding( @RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CLOSE), key = MQConst.ROUTING_KEY_SQL_ORDER_CLOSE, exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CLOSE), key = MQConst.ROUTING_KEY_SQL_ORDER_CLOSE,
value = @Queue(MQConst.QUEUES_SQL_ORDER_CLOSE) value = @Queue(MQConst.QUEUES_SQL_ORDER_CLOSE)
...@@ -196,7 +226,6 @@ public class ConsumerProcessor { ...@@ -196,7 +226,6 @@ public class ConsumerProcessor {
log.info("=== CONSUMER_ORDER_CLOSE ==="); log.info("=== CONSUMER_ORDER_CLOSE ===");
this.consumerSqlDaoHandler(msg, channel); this.consumerSqlDaoHandler(msg, channel);
} }
// 订单关闭
@RabbitListener(bindings = @QueueBinding( @RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CLOSE), key = MQConst.ROUTING_KEY_SQL_ORDER_CLOSE, exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CLOSE), key = MQConst.ROUTING_KEY_SQL_ORDER_CLOSE,
value = @Queue(MQConst.QUEUES_SQL_ORDER_CLOSE) value = @Queue(MQConst.QUEUES_SQL_ORDER_CLOSE)
...@@ -205,7 +234,6 @@ public class ConsumerProcessor { ...@@ -205,7 +234,6 @@ public class ConsumerProcessor {
log.info("=== CONSUMER_ORDER_CLOSE ==="); log.info("=== CONSUMER_ORDER_CLOSE ===");
this.consumerSqlDaoHandler(msg, channel); this.consumerSqlDaoHandler(msg, channel);
} }
// 订单关闭
@RabbitListener(bindings = @QueueBinding( @RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CLOSE), key = MQConst.ROUTING_KEY_SQL_ORDER_CLOSE, exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CLOSE), key = MQConst.ROUTING_KEY_SQL_ORDER_CLOSE,
value = @Queue(MQConst.QUEUES_SQL_ORDER_CLOSE) value = @Queue(MQConst.QUEUES_SQL_ORDER_CLOSE)
...@@ -213,7 +241,7 @@ public class ConsumerProcessor { ...@@ -213,7 +241,7 @@ public class ConsumerProcessor {
public void consumerOrderClose4(Message msg, Channel channel) { public void consumerOrderClose4(Message msg, Channel channel) {
log.info("=== CONSUMER_ORDER_CLOSE ==="); log.info("=== CONSUMER_ORDER_CLOSE ===");
this.consumerSqlDaoHandler(msg, channel); this.consumerSqlDaoHandler(msg, channel);
}// 订单关闭 }
@RabbitListener(bindings = @QueueBinding( @RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CLOSE), key = MQConst.ROUTING_KEY_SQL_ORDER_CLOSE, exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CLOSE), key = MQConst.ROUTING_KEY_SQL_ORDER_CLOSE,
value = @Queue(MQConst.QUEUES_SQL_ORDER_CLOSE) value = @Queue(MQConst.QUEUES_SQL_ORDER_CLOSE)
...@@ -222,6 +250,38 @@ public class ConsumerProcessor { ...@@ -222,6 +250,38 @@ public class ConsumerProcessor {
log.info("=== CONSUMER_ORDER_CLOSE ==="); log.info("=== CONSUMER_ORDER_CLOSE ===");
this.consumerSqlDaoHandler(msg, channel); this.consumerSqlDaoHandler(msg, channel);
} }
@RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CLOSE), key = MQConst.ROUTING_KEY_SQL_ORDER_CLOSE,
value = @Queue(MQConst.QUEUES_SQL_ORDER_CLOSE)
))
public void consumerOrderClose6(Message msg, Channel channel) {
log.info("=== CONSUMER_ORDER_CLOSE ===");
this.consumerSqlDaoHandler(msg, channel);
}
@RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CLOSE), key = MQConst.ROUTING_KEY_SQL_ORDER_CLOSE,
value = @Queue(MQConst.QUEUES_SQL_ORDER_CLOSE)
))
public void consumerOrderClose7(Message msg, Channel channel) {
log.info("=== CONSUMER_ORDER_CLOSE ===");
this.consumerSqlDaoHandler(msg, channel);
}
@RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CLOSE), key = MQConst.ROUTING_KEY_SQL_ORDER_CLOSE,
value = @Queue(MQConst.QUEUES_SQL_ORDER_CLOSE)
))
public void consumerOrderClose8(Message msg, Channel channel) {
log.info("=== CONSUMER_ORDER_CLOSE ===");
this.consumerSqlDaoHandler(msg, channel);
}
@RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CLOSE), key = MQConst.ROUTING_KEY_SQL_ORDER_CLOSE,
value = @Queue(MQConst.QUEUES_SQL_ORDER_CLOSE)
))
public void consumerOrderClose9(Message msg, Channel channel) {
log.info("=== CONSUMER_ORDER_CLOSE ===");
this.consumerSqlDaoHandler(msg, channel);
}
// 订单支付 // 订单支付
...@@ -233,6 +293,81 @@ public class ConsumerProcessor { ...@@ -233,6 +293,81 @@ public class ConsumerProcessor {
log.info("=== CONSUMER_ORDER_PAY ==="); log.info("=== CONSUMER_ORDER_PAY ===");
this.consumerSqlDaoHandler(msg, channel); this.consumerSqlDaoHandler(msg, channel);
} }
@RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_PAY), key = MQConst.ROUTING_KEY_SQL_ORDER_PAY,
value = @Queue(MQConst.QUEUES_SQL_ORDER_PAY)
))
public void consumerOrderPay1(Message msg, Channel channel) {
log.info("=== CONSUMER_ORDER_PAY ===");
this.consumerSqlDaoHandler(msg, channel);
}
@RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_PAY), key = MQConst.ROUTING_KEY_SQL_ORDER_PAY,
value = @Queue(MQConst.QUEUES_SQL_ORDER_PAY)
))
public void consumerOrderPay2(Message msg, Channel channel) {
log.info("=== CONSUMER_ORDER_PAY ===");
this.consumerSqlDaoHandler(msg, channel);
}
@RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_PAY), key = MQConst.ROUTING_KEY_SQL_ORDER_PAY,
value = @Queue(MQConst.QUEUES_SQL_ORDER_PAY)
))
public void consumerOrderPay3(Message msg, Channel channel) {
log.info("=== CONSUMER_ORDER_PAY ===");
this.consumerSqlDaoHandler(msg, channel);
}
@RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_PAY), key = MQConst.ROUTING_KEY_SQL_ORDER_PAY,
value = @Queue(MQConst.QUEUES_SQL_ORDER_PAY)
))
public void consumerOrderPay4(Message msg, Channel channel) {
log.info("=== CONSUMER_ORDER_PAY ===");
this.consumerSqlDaoHandler(msg, channel);
}
@RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_PAY), key = MQConst.ROUTING_KEY_SQL_ORDER_PAY,
value = @Queue(MQConst.QUEUES_SQL_ORDER_PAY)
))
public void consumerOrderPay5(Message msg, Channel channel) {
log.info("=== CONSUMER_ORDER_PAY ===");
this.consumerSqlDaoHandler(msg, channel);
}
@RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_PAY), key = MQConst.ROUTING_KEY_SQL_ORDER_PAY,
value = @Queue(MQConst.QUEUES_SQL_ORDER_PAY)
))
public void consumerOrderPay6(Message msg, Channel channel) {
log.info("=== CONSUMER_ORDER_PAY ===");
this.consumerSqlDaoHandler(msg, channel);
}
@RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_PAY), key = MQConst.ROUTING_KEY_SQL_ORDER_PAY,
value = @Queue(MQConst.QUEUES_SQL_ORDER_PAY)
))
public void consumerOrderPay7(Message msg, Channel channel) {
log.info("=== CONSUMER_ORDER_PAY ===");
this.consumerSqlDaoHandler(msg, channel);
}
@RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_PAY), key = MQConst.ROUTING_KEY_SQL_ORDER_PAY,
value = @Queue(MQConst.QUEUES_SQL_ORDER_PAY)
))
public void consumerOrderPay8(Message msg, Channel channel) {
log.info("=== CONSUMER_ORDER_PAY ===");
this.consumerSqlDaoHandler(msg, channel);
}@RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_PAY), key = MQConst.ROUTING_KEY_SQL_ORDER_PAY,
value = @Queue(MQConst.QUEUES_SQL_ORDER_PAY)
))
public void consumerOrderPay9(Message msg, Channel channel) {
log.info("=== CONSUMER_ORDER_PAY ===");
this.consumerSqlDaoHandler(msg, channel);
}
@RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_PAY), key = MQConst.ROUTING_KEY_SQL_ORDER_PAY,
value = @Queue(MQConst.QUEUES_SQL_ORDER_PAY)
))
// 缺票登记 // 缺票登记
@RabbitListener(bindings = @QueueBinding( @RabbitListener(bindings = @QueueBinding(
......
...@@ -296,7 +296,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -296,7 +296,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
LocalDateTime createdAt = LocalDateTime.now(); LocalDateTime createdAt = LocalDateTime.now();
PerformancePartnerVo performancePartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName()); PerformancePartnerVo performancePartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
if(performancePartnerVo.getAuditStatus()==1){ if(performancePartnerVo.getAuditStatus()==0){
return ResponseDto.failure(ErrorMapping.get(20107)); return ResponseDto.failure(ErrorMapping.get(20107));
} }
......
...@@ -95,7 +95,7 @@ public class PerformanceVoTask { ...@@ -95,7 +95,7 @@ public class PerformanceVoTask {
List<String> performanceIdList = new ArrayList<>(); List<String> performanceIdList = new ArrayList<>();
if (performanceSingleId == null) { if (performanceSingleId == null) {
List<KylinPerformanceStatus> list = performanceStatusMapper.selectList(new UpdateWrapper<KylinPerformanceStatus>().in("status", 6,8,9)); List<KylinPerformanceStatus> list = performanceStatusMapper.selectList(new UpdateWrapper<KylinPerformanceStatus>().in("status", 6, 8, 9));
for (KylinPerformanceStatus item : list) { for (KylinPerformanceStatus item : list) {
performanceIdList.add(item.getPerformanceId()); performanceIdList.add(item.getPerformanceId());
} }
...@@ -146,7 +146,7 @@ public class PerformanceVoTask { ...@@ -146,7 +146,7 @@ public class PerformanceVoTask {
} }
} }
if(kylinTicketVoItem.getStatus()==7){ if (kylinTicketVoItem.getStatus() == 7) {
status = 7; status = 7;
} }
...@@ -171,18 +171,18 @@ public class PerformanceVoTask { ...@@ -171,18 +171,18 @@ public class PerformanceVoTask {
} }
} }
} }
if(vo.getAppStatus()<=4){ if (vo.getAppStatus() <= 4) {
appStatus=vo.getAppStatus(); appStatus = vo.getAppStatus();
} }
if(vo.getAppStatus()==7){ if (vo.getAppStatus() == 7) {
appStatus=7; appStatus = 7;
} }
//修改演出状态 //修改演出状态
KylinPerformanceStatus changeStatus = new KylinPerformanceStatus(); KylinPerformanceStatus changeStatus = new KylinPerformanceStatus();
changeStatus.setStatus(appStatus); changeStatus.setStatus(appStatus);
performanceStatusMapper.update(changeStatus,new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id",performancesId)); performanceStatusMapper.update(changeStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
vo.setAppStatus(appStatus); vo.setAppStatus(appStatus);
dataUtils.updatePerformanceMongo(performancesId,vo); dataUtils.updatePerformanceMongo(performancesId, vo);
} }
} }
...@@ -361,6 +361,9 @@ public class PerformanceVoTask { ...@@ -361,6 +361,9 @@ public class PerformanceVoTask {
ticketStatusMapper.insert(ticketStatus); ticketStatusMapper.insert(ticketStatus);
ticketRelationsMapper.delete(new UpdateWrapper<KylinTicketRelations>().eq("ticket_id", ticketRelations.getTicketId())); ticketRelationsMapper.delete(new UpdateWrapper<KylinTicketRelations>().eq("ticket_id", ticketRelations.getTicketId()));
ticketRelationsMapper.insert(ticketRelations); ticketRelationsMapper.insert(ticketRelations);
dataUtils.setSurplusExchange(tickets.getTicketsId(), ticketStatus.getSurplusExchange());
dataUtils.setSurplusGeneral(tickets.getTicketsId(), ticketStatus.getSurplusGeneral());
} }
} }
} catch (Exception e) { } catch (Exception e) {
...@@ -369,42 +372,42 @@ public class PerformanceVoTask { ...@@ -369,42 +372,42 @@ public class PerformanceVoTask {
} }
public boolean judgeIsAudit(String performanceId){ public boolean judgeIsAudit(String performanceId) {
KylinPerformanceMisVo misVo = getPerformanceMisVo(performanceId); KylinPerformanceMisVo misVo = getPerformanceMisVo(performanceId);
KylinPerformanceVo mongoVo = mongoVoUtils.combinePerformanceVoData(performanceId); KylinPerformanceVo mongoVo = mongoVoUtils.combinePerformanceVoData(performanceId);
if(!misVo.getTitle().equals(mongoVo.getTitle())){ if (!misVo.getTitle().equals(mongoVo.getTitle())) {
return true; return true;
}else if(!misVo.getType().equals(mongoVo.getType())){ } else if (!misVo.getType().equals(mongoVo.getType())) {
return true; return true;
}else if(!misVo.getTimeStart().equals(mongoVo.getTimeStart())){ } else if (!misVo.getTimeStart().equals(mongoVo.getTimeStart())) {
return true; return true;
}else if(!misVo.getTimeEnd().equals(mongoVo.getTimeEnd())){ } else if (!misVo.getTimeEnd().equals(mongoVo.getTimeEnd())) {
return true; return true;
}else if(!misVo.getFieldId().equals(mongoVo.getFieldId())){ } else if (!misVo.getFieldId().equals(mongoVo.getFieldId())) {
return true; return true;
}else if(!misVo.getNotice().equals(mongoVo.getNotice())){ } else if (!misVo.getNotice().equals(mongoVo.getNotice())) {
return true; return true;
}else if(!misVo.getDetails().equals(mongoVo.getDetails())){ } else if (!misVo.getDetails().equals(mongoVo.getDetails())) {
return true; return true;
}else if(!misVo.getApprovalUrl().equals(mongoVo.getApprovalUrl())){ } else if (!misVo.getApprovalUrl().equals(mongoVo.getApprovalUrl())) {
return true; return true;
}else if(!misVo.getPayCountdownMinute().equals(mongoVo.getPayCountdownMinute())){ } else if (!misVo.getPayCountdownMinute().equals(mongoVo.getPayCountdownMinute())) {
return true; return true;
}else if(!misVo.getLimitCount().equals(mongoVo.getLimitCount())){ } else if (!misVo.getLimitCount().equals(mongoVo.getLimitCount())) {
return true; return true;
} else if(!misVo.getIsTrueName().equals(mongoVo.getIsTrueName())){ } else if (!misVo.getIsTrueName().equals(mongoVo.getIsTrueName())) {
return true; return true;
} }
boolean exists = mongoTemplate.exists(Query.query(Criteria.where("status").is("-1").and("performancesId").is(performanceId)),KylinTicketTimesPartnerVo.class,KylinTicketTimesPartnerVo.class.getSimpleName()); boolean exists = mongoTemplate.exists(Query.query(Criteria.where("status").is("-1").and("performancesId").is(performanceId)), KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
if(exists){ if (exists) {
return true; return true;
} }
for (int i = 0;i<misVo.getTicketTimes().size();i++){ for (int i = 0; i < misVo.getTicketTimes().size(); i++) {
TicketTimesTicketCreatePartnerVo times = misVo.getTicketTimes().get(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()); boolean exists2 = mongoTemplate.exists(Query.query(Criteria.where("status").is("-2").and("timesId").is(times.getTicketTimesId())), KylinTicketPartnerVo.class, KylinTicketPartnerVo.class.getSimpleName());
if(exists2){ if (exists2) {
return true; return true;
} }
} }
......
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