diff --git a/pom.xml b/pom.xml index aa7d9e5d4..27328c6cf 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 br.com.rjconsultores ModelWeb - 1.26.4 + 1.26.5 diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java index bf8887329..798a2fbd3 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java @@ -1017,10 +1017,7 @@ public class CorridaServiceImpl implements CorridaService { Boolean isFeriado = this.isFeriado(data, esquemaCorrida); corrida = generarCorrida(esquemaCorrida, dataGeracao, false, isFeriado); - - if(corrida != null) { - generarCorridaInfo(corrida, esquemaCorrida); - } + corridaPisoExtra = null; corridaPisoExtra2 = null; @@ -1108,7 +1105,9 @@ public class CorridaServiceImpl implements CorridaService { isFeriado); } - + if(corrida != null) { + generarCorridaInfo(corrida, esquemaCorrida); + } if (cantCorridaGenerada >= cantCorridaCommit) { cantCorridaGenerada = 0; @@ -1834,18 +1833,27 @@ public class CorridaServiceImpl implements CorridaService { private void generarCorridaInfo(Corrida corrida, EsquemaCorrida esquemaCorrida) { - List lsEsquemaCorridaInfo = esquemaCorridaInfoService.obtenerPorEsquemaCorrida(esquemaCorrida); - - for (EsquemaCorridaInfo esquemaCorridaInfo : lsEsquemaCorridaInfo) { + if(corrida != null && corrida.getId() != null && corrida.getId().getFeccorrida() != null && corrida.getId().getCorridaId() != null) { - CorridaInfo corridaInfo = new CorridaInfo(); - corridaInfo.setOrigem(esquemaCorridaInfo.getOrigem()); - corridaInfo.setDestino(esquemaCorridaInfo.getDestino()); - corridaInfo.setCorrida(corrida); - corridaInfo.setInfoCorrida(esquemaCorridaInfo.getInfoCorrida()); - corridaInfoService.suscribir(corridaInfo); - } + if(esquemaCorrida != null) { + + List lsEsquemaCorridaInfo = esquemaCorridaInfoService.obtenerPorEsquemaCorrida(esquemaCorrida); + + if(lsEsquemaCorridaInfo != null) { + + for (EsquemaCorridaInfo esquemaCorridaInfo : lsEsquemaCorridaInfo) { + + CorridaInfo corridaInfo = new CorridaInfo(); + corridaInfo.setOrigem(esquemaCorridaInfo.getOrigem()); + corridaInfo.setDestino(esquemaCorridaInfo.getDestino()); + corridaInfo.setCorrida(corrida); + corridaInfo.setInfoCorrida(esquemaCorridaInfo.getInfoCorrida()); + corridaInfoService.suscribir(corridaInfo); + } + } + } + } }