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

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

修改 提交审核 自动上线的bug

parent 374f2719
......@@ -188,7 +188,7 @@ public class KylinPerformanceVo implements Serializable, Cloneable{
this.stopSellTime = DateUtil.Formatter.yyyyMMddHHmmss.format(stopSellTime);
this.sellMemberTime = DateUtil.Formatter.yyyyMMddHHmmss.format(sellMemberTime);
this.sellTime = DateUtil.Formatter.yyyyMMddHHmmss.format(sellTime);
this.appStatus = 9;
// this.appStatus = 9;
this.isDiscount = isDiscount;
this.isAdvance = isAdvance;
this.message = "";
......
......@@ -103,7 +103,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
@Override
public KylinPerformanceMisVo performanceDetails(String performancesId) {
log.info(" PERFORMANCE mis演出详情");
KylinPerformanceMisVo createMisVo = performanceVoUtils.getPerformanceMisVo(performancesId);
KylinPerformanceMisVo createMisVo = performanceVoUtils.getPerformanceMisVo(performancesId,null);
return createMisVo;
}
......@@ -162,15 +162,15 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
}
}
performanceVoUtils.performanceVoStatus(performancesId);
//同步演出
innerService.reportP(dataUtils.getPerformanceVo(performancesId), null, null);
// 同步演出
// innerService.reportP(dataUtils.getPerformanceVo(performancesId), null, null);
} else { //只修改演出相关 场次 票 (不包括 库存 售卖时间 限购)
log.info(" PERFORMANCE 演出审核 修改");
HashMap<String, Object> mapSql = new HashMap<>();
mapSql.put("status", 9);
mapSql.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
KylinPerformanceMisVo vo = performanceVoUtils.getPerformanceMisVo(performancesId);
KylinPerformanceMisVo vo = performanceVoUtils.getPerformanceMisVo(performancesId,"0");
performanceVoUtils.updatePerformanceMySql(performancesId, mapSql, vo, updatedAt, auditStatus);
// if (sqlStatus.getStatus() >= 6 && sqlStatus.getStatus() != 7) {//若 演出上 则 线判断状态
performanceVoUtils.performanceVoStatus(performancesId);
......
......@@ -189,11 +189,13 @@ public class PerformanceVoUtils {
* @param performancesId
* @return
*/
public KylinPerformanceMisVo getPerformanceMisVo(String performancesId) {
public KylinPerformanceMisVo getPerformanceMisVo(String performancesId, String auditStatus) {
PerformancePartnerVo performanceData = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performancesId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
List<KylinTicketTimesPartnerVo> kylinTicketTimesPartnerVos = getTimesMongoList(performancesId);
List<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = new ArrayList();
if (auditStatus != null && auditStatus.equals("0")) {
performanceData.setAuditStatus(0);
}
//不需要审核
if (performanceData.getAuditStatus().equals(1) && performanceData.getFieldAuditStatus().equals(0)) {
return getPerformanceMisDB(performancesId);
......@@ -265,7 +267,7 @@ public class PerformanceVoUtils {
KylinTickets tickets = ticketsMapper.selectOne(Wrappers.lambdaQuery(KylinTickets.class).eq(KylinTickets::getTicketsId, item.getTicketId()));
KylinTicketStatus ticketStatus = ticketStatusMapper.selectOne(Wrappers.lambdaQuery(KylinTicketStatus.class).eq(KylinTicketStatus::getTicketId, item.getTicketId()));
List<ExpressModuleVo> moduleVoList = new ArrayList();
if(ticketStatus.getIsExpress()==1) {
if (ticketStatus.getIsExpress() == 1) {
moduleVoList = dataUtils.getTEMVo(item.getTicketId()).getProduceCodeList();
}
kylinTicketPartnerVos.add(KylinTicketPartnerVo.getNew().copy(tickets, ticketStatus, item, moduleVoList));
......
......@@ -34,12 +34,8 @@ public final class RedisUtil extends AbstractRedisUtil{
public static void main(String[] args) {
String[] keys = {
"kylin:performances_inventory:ticket:id:575422212015185926395076:surplusGeneral",
"kylin:performances_inventory:ticket:id:575423832945909762737992:surplusGeneral",
"kylin:performances_inventory:ticket:id:575424371127296001891205:surplusGeneral",
"kylin:performances_inventory:ticket:id:575424699866603521727423:surplusGeneral",
"kylin:order:id:585322149365514243983160",
"kylin:order:id:585326057257123847506471"
"stone:user:$uid::surplusGeneral",
"stone:item:logs:list:$uid"
};
for (String key : keys) {
long value = key.hashCode();
......
......@@ -369,6 +369,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
kylinPerformanceVo.setAuditStatus(performancePartnerVo.getAuditStatus());
kylinPerformanceVo.setFieldAuditStatus(performancePartnerVo.getFieldAuditStatus());
mongoSlimeUtils.updateKylinPerformanceVoById(kylinPerformanceVo);
redisSlimeUtils.delPerformanceVo(kylinPerformanceVo.getPerformancesId());
//提交 票
List<KylinTicketTimesPartnerVo> kylinTicketTimesPartnerVoList = ticketTimesPartnerService.getTimesMongoList(performanceId);
for (KylinTicketTimesPartnerVo ticketTimes : kylinTicketTimesPartnerVoList) {
......
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