From ae8847281885437afa67cf461a980617558c9f56 Mon Sep 17 00:00:00 2001 From: "wallace.henrique" Date: Fri, 13 Sep 2024 20:18:25 -0300 Subject: [PATCH 1/3] fixes bug#AL-4315 --- pom.xml | 2 +- .../service/CorridaTramoService.java | 2 +- .../service/impl/CorridaTramoServiceImpl.java | 32 +++++++++++++++++-- .../ventaboletos/utilerias/CustomEnum.java | 4 ++- 4 files changed, 34 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 3ccdefd25..8dc07bba6 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 br.com.rjconsultores ModelWeb - 1.105.4 + 1.106.0 diff --git a/src/com/rjconsultores/ventaboletos/service/CorridaTramoService.java b/src/com/rjconsultores/ventaboletos/service/CorridaTramoService.java index 8d8a032da..4c3b8d69a 100644 --- a/src/com/rjconsultores/ventaboletos/service/CorridaTramoService.java +++ b/src/com/rjconsultores/ventaboletos/service/CorridaTramoService.java @@ -18,6 +18,6 @@ public interface CorridaTramoService extends GenericService criaCorridaTramoList(Autobus autobus, Date dataGeracao, Date fechorSalidaOriginalH , List lsEsquemaTramo, Nodo nodo, ClaseServicio claseServicio, String statusCorrida); - public List recriaCorridaTramo(EsquemaCorrida esquemaCorrida, Date dataCorrida, List esquemaTramoNovoList, Corrida corrida, List lsParadaEsquemaOrignal); + public List recriaCorridaTramo(EsquemaCorrida esquemaCorrida, Date dataCorrida, List esquemaTramoNovoList, Corrida corrida, List lsParadaEsquemaOrignal, Date horaSalidaOriginal); } diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CorridaTramoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/CorridaTramoServiceImpl.java index 27289e82e..dfd26bf34 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CorridaTramoServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/CorridaTramoServiceImpl.java @@ -1,5 +1,6 @@ package com.rjconsultores.ventaboletos.service.impl; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; @@ -33,6 +34,8 @@ import com.rjconsultores.ventaboletos.service.CorridaService; import com.rjconsultores.ventaboletos.service.CorridaTramoService; import com.rjconsultores.ventaboletos.service.TramoServicioService; import com.rjconsultores.ventaboletos.utilerias.ActivoUtil; +import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; +import com.rjconsultores.ventaboletos.utilerias.CustomEnum; import com.rjconsultores.ventaboletos.utilerias.DateUtil; import com.rjconsultores.ventaboletos.utilerias.HoraSistema; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; @@ -100,11 +103,16 @@ public class CorridaTramoServiceImpl implements CorridaTramoService { @Override @Transactional - public List recriaCorridaTramo(EsquemaCorrida esquemaCorrida, Date dataCorrida, List esquemaTramoNovoList, Corrida corrida, List lsEsquemaTramoOrignal) { + public List recriaCorridaTramo(EsquemaCorrida esquemaCorrida, Date dataCorrida, List esquemaTramoNovoList, Corrida corrida, List lsEsquemaTramoOrignal, Date horaSalidaOriginal) { List corridaTramoListAntigas = corridaTramoDAO.buscaCorridaTramoByFecCorridaECorridaId(dataCorrida, esquemaCorrida.getNumCorrida(), false); //Caso encontre nas CorridaTramo existente algum trecho vendido que não está nas configurações do serviço retorna null - if(!validaTramoInexistenteServicoComVenda(esquemaCorrida, dataCorrida, lsEsquemaTramoOrignal, corridaTramoListAntigas)) { - return corridaTramoListAntigas; + + boolean permiteRecriarCorridaTramo= !isPermiteAlterarHorarioCorridaComVendas() ? Boolean.TRUE : (isPermiteAlterarHorarioCorridaComVendas() && validarSeHorarioCorridaFoiAlterado(esquemaCorrida.getHorasalida(), horaSalidaOriginal)? Boolean.FALSE :Boolean.TRUE); + + if(permiteRecriarCorridaTramo) { + if(!validaTramoInexistenteServicoComVenda(esquemaCorrida, dataCorrida, lsEsquemaTramoOrignal, corridaTramoListAntigas)) { + return corridaTramoListAntigas; + }; } inativaCorridasTramos(corridaTramoListAntigas); @@ -529,4 +537,22 @@ public class CorridaTramoServiceImpl implements CorridaTramoService { } return lsCorridaTramo; } + + private boolean validarSeHorarioCorridaFoiAlterado(Date horaSalidaAtual, Date horaSalidaOriginal) { + try { + if(DateUtil.isIgual(DateUtil.getDateFromString(DateUtil.getStringDate(horaSalidaAtual,DateUtil.HHmm), DateUtil.HHmm),DateUtil.getDateFromString(DateUtil.getStringDate(horaSalidaOriginal,DateUtil.HHmm), DateUtil.HHmm))) { + return Boolean.FALSE; + } + } catch (ParseException e) { + log.error("Erro ao fazer parse :"+e); + return Boolean.FALSE; + } + return Boolean.TRUE; + } + private boolean isPermiteAlterarHorarioCorridaComVendas() { + if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.IS_PERMITE_ALTERAR_HORARIO_CORRIDA_COM_VENDAS.getDescricao(), Boolean.FALSE)) { + return Boolean.TRUE; + } + return Boolean.FALSE; + } } diff --git a/src/com/rjconsultores/ventaboletos/utilerias/CustomEnum.java b/src/com/rjconsultores/ventaboletos/utilerias/CustomEnum.java index f5b92e98c..33ef4e9a6 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/CustomEnum.java +++ b/src/com/rjconsultores/ventaboletos/utilerias/CustomEnum.java @@ -164,7 +164,9 @@ public enum CustomEnum { * * @return */ - USA_BLOQUEIO_TRECHO_CONEXAO("usaBloqueioTrechoConexao"); + USA_BLOQUEIO_TRECHO_CONEXAO("usaBloqueioTrechoConexao"), + + IS_PERMITE_ALTERAR_HORARIO_CORRIDA_COM_VENDAS("isPermiteAlterarHorarioCorridaComVendas"); private String descricao; From 2c5daa5a8eb6f9c3df237af53dd3c7e803ab5d67 Mon Sep 17 00:00:00 2001 From: Fabio Date: Mon, 16 Sep 2024 16:42:07 -0300 Subject: [PATCH 2/3] =?UTF-8?q?Impress=C3=A3o=20de=20comprovante=20de=20le?= =?UTF-8?q?galiza=C3=A7ao=20massiva=20feat=20bug#AL-4784?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../vo/configuracioneccomerciales/VoucherVO.java | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8dc07bba6..ab079699e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 br.com.rjconsultores ModelWeb - 1.106.0 + 1.107.0 diff --git a/src/com/rjconsultores/ventaboletos/vo/configuracioneccomerciales/VoucherVO.java b/src/com/rjconsultores/ventaboletos/vo/configuracioneccomerciales/VoucherVO.java index c3793dae2..835bb02a8 100644 --- a/src/com/rjconsultores/ventaboletos/vo/configuracioneccomerciales/VoucherVO.java +++ b/src/com/rjconsultores/ventaboletos/vo/configuracioneccomerciales/VoucherVO.java @@ -88,6 +88,14 @@ public class VoucherVO implements Serializable { return SituacaoVoucher.buscarPeloValor(status); } + public String getNumContrato() { + return this.contrato.getNumContrato(); + } + + public String getSituacao() { + return SituacaoVoucher.buscarPeloValor(status).getDescricao(); + } + public String getTrecho() { return descOrigem +" X "+descDestino; } From e6100886c2fdda21da0af09c600e99642ed29cff Mon Sep 17 00:00:00 2001 From: "valdir.cordeiro" Date: Tue, 17 Sep 2024 09:37:44 -0300 Subject: [PATCH 3/3] =?UTF-8?q?76691=20-=20Solicita=C3=A7=C3=A3o=20de=20fi?= =?UTF-8?q?xa=C3=A7=C3=A3o=20da=20taxa=20de=20embarque=20feat=20bug#AL-467?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../rjconsultores/ventaboletos/entidad/Empresa.java | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index ab079699e..7e21a663d 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 br.com.rjconsultores ModelWeb - 1.107.0 + 1.108.0 diff --git a/src/com/rjconsultores/ventaboletos/entidad/Empresa.java b/src/com/rjconsultores/ventaboletos/entidad/Empresa.java index e49c26d85..6adab1148 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Empresa.java +++ b/src/com/rjconsultores/ventaboletos/entidad/Empresa.java @@ -467,7 +467,8 @@ public class Empresa implements Serializable, Auditavel { @Column(name = "INDQRCODEFORMMARCOREG") private Boolean indQRCodeFormMarcoReg; - + @Column(name = "INDIMPRIMETAXAEMBARQUENOCUPOM") + private Boolean indImprimeTaxaEmbarqueNoCupom; public Empresa() { super(); @@ -1699,7 +1700,13 @@ public class Empresa implements Serializable, Auditavel { public void setIndQRCodeFormMarcoReg(Boolean indQRCodeFormMarcoReg) { this.indQRCodeFormMarcoReg = indQRCodeFormMarcoReg; + } + + public Boolean getIndImprimeTaxaEmbarqueNoCupom() { + return indImprimeTaxaEmbarqueNoCupom == null ? false : indImprimeTaxaEmbarqueNoCupom; + } + + public void setIndImprimeTaxaEmbarqueNoCupom(Boolean indImprimeTaxaEmbarqueNoCupom) { + this.indImprimeTaxaEmbarqueNoCupom = indImprimeTaxaEmbarqueNoCupom; } - - }