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

bug#20993 

dev: Valvevir
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@104457 d1611594-4594-4d17-8e1d-87c2c4800839
master
fabio 2020-11-23 18:20:56 +00:00
parent 2fc7e9974f
commit 3d6912f8a4
1 changed files with 2 additions and 2 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

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