fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug#21493 

dev:wilian
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@105326 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2021-02-09 12:29:48 +00:00
parent 6b9025d2d4
commit 95ac90573d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java
View File

@ -409,7 +409,7 @@ public class OperadorEmbarcadaServicoHibernateDAO extends GenericHibernateDAO<Op
* Não aplica tarifa minina quando configurado no tipo de passagem ou quando nao tem a constante * Não aplica tarifa minina quando configurado no tipo de passagem ou quando nao tem a constante
* Mantis #10704 & #20931 * Mantis #10704 & #20931
*/ */
if(isTarifaMinimaHabilitado && categoriaDescuento !=null && Boolean.TRUE.equals( categoriaDescuento.getIndnaoaplicatarifaminima()) ) { if(isTarifaMinimaHabilitado && categoriaDescuento !=null && !categoriaDescuento.getIndnaoaplicatarifaminima()) {
sb.append(" ("); sb.append(" (");
sb.append(" select IMPORTETARIFA"); sb.append(" select IMPORTETARIFA");
sb.append(" from ("); sb.append(" from (");
@ -555,7 +555,7 @@ public class OperadorEmbarcadaServicoHibernateDAO extends GenericHibernateDAO<Op
query.setParameter("corridaId", corrida.getCorridaId()); query.setParameter("corridaId", corrida.getCorridaId());
query.setParameter("feccorrida", corrida.getFeccorrida() + " 00:00:00"); query.setParameter("feccorrida", corrida.getFeccorrida() + " 00:00:00");
if(isTarifaMinimaHabilitado && categoriaDescuento !=null && Boolean.TRUE.equals( categoriaDescuento.getIndnaoaplicatarifaminima()) ) { if(isTarifaMinimaHabilitado && categoriaDescuento !=null && !categoriaDescuento.getIndnaoaplicatarifaminima()) {
query.setParameter("plazaId", puntoVenta.getColonia().getCiudad().getPlaza().getPlazaId()); query.setParameter("plazaId", puntoVenta.getColonia().getCiudad().getPlaza().getPlazaId());
query.setParameter("claseservicioId", corrida.getClaseServicioId()); query.setParameter("claseservicioId", corrida.getClaseServicioId());
query.setParameter("categoriaId", Constantes.CATEGORIA_NORMAL); query.setParameter("categoriaId", Constantes.CATEGORIA_NORMAL);

2
src/com/rjconsultores/ventaboletos/entidad/CategoriaDescuento.java
View File

@ -708,7 +708,7 @@ public class CategoriaDescuento implements Serializable {
} }
public Boolean getIndnaoaplicatarifaminima() { public Boolean getIndnaoaplicatarifaminima() {
return indnaoaplicatarifaminima; return indnaoaplicatarifaminima != null ? indnaoaplicatarifaminima : Boolean.FALSE;
} }
public void setIndnaoaplicatarifaminima(Boolean indnaoaplicatarifaminima) { public void setIndnaoaplicatarifaminima(Boolean indnaoaplicatarifaminima) {