From 517c925933d20ad2b1f03663fca30065b2decd76 Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 24 Feb 2021 15:10:05 +0000
Subject: [PATCH] fixes bug#21723 dev:wilian qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@105448 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/ConferenciaComissaoDAO.java           |  2 ++
 .../ConferenciaComissaoHibernateDAO.java      | 19 +++++++++++++++++++
 .../ventaboletos/entidad/Empresa.java         | 12 ++++++++++++
 .../impl/ConferenciaComissaoServiceImpl.java  |  9 ++++++---
 4 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/ConferenciaComissaoDAO.java b/src/com/rjconsultores/ventaboletos/dao/ConferenciaComissaoDAO.java
index a2bab975c..e63361d56 100644
--- a/src/com/rjconsultores/ventaboletos/dao/ConferenciaComissaoDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/ConferenciaComissaoDAO.java
@@ -61,5 +61,7 @@ public interface ConferenciaComissaoDAO extends GenericDAO<Conferencia, Long> {
 	public void borrarLogConferenciaTransacaoId(Long transacaoId) throws BusinessException;
 	
 	public boolean isConferenciaCompetenciaEncerrada(Date dataInicial, Date dataFinal, Empresa empresa, PuntoVenta puntoVenta, boolean isDesconsideraPtVendaFechados) throws BusinessException;
+	
+	public boolean isConfMovFPTrocaVlrDeposito(Empresa empresa);
 
 }
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
index 64fdf1f50..74cf99f02 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
@@ -1380,4 +1380,23 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 		}
 	}
 
+	@Override
+	public boolean isConfMovFPTrocaVlrDeposito(Empresa empresa) {
+		if(empresa == null || empresa.getEmpresaId() == null) {
+			return false;
+		}
+		
+		StringBuilder sql = new StringBuilder();
+		sql.append(" SELECT EMPRESA_ID ")
+		   .append(" FROM EMPRESA ")
+		   .append(" WHERE ACTIVO = 1 ")
+		   .append(" AND INDCONFMOVFPTROCAVLRDEPOSITO = 1 ")
+		   .append(" AND EMPRESA_ID = :empresaId ");
+
+		Query qr = getSession().createSQLQuery(sql.toString());
+		qr.setParameter("empresaId", empresa.getEmpresaId());
+
+		return !qr.list().isEmpty();
+	}
+
 }
diff --git a/src/com/rjconsultores/ventaboletos/entidad/Empresa.java b/src/com/rjconsultores/ventaboletos/entidad/Empresa.java
index 7dcca4552..f237f03bd 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/Empresa.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/Empresa.java
@@ -368,6 +368,9 @@ public class Empresa implements Serializable, Auditavel<Empresa> {
 	@Column(name = "INDALERTAVDAPOSHORARIOVIAGEM")
 	private Boolean indAlertaVDAPosHorarioViagem;
 	
+	@Column(name = "INDCONFMOVFPTROCAVLRDEPOSITO")
+	private Boolean indConfMovFPTrocaVlrDeposito;
+	
 	@Transient
 	@NaoAuditar
 	private Empresa empresaClone;
@@ -1369,4 +1372,13 @@ public class Empresa implements Serializable, Auditavel<Empresa> {
 	public void setIndAlertaVDAPosHorarioViagem(Boolean indAlertaVDAPosHorarioViagem) {
 		this.indAlertaVDAPosHorarioViagem = indAlertaVDAPosHorarioViagem;
 	}
+
+	public Boolean getIndConfMovFPTrocaVlrDeposito() {
+		return indConfMovFPTrocaVlrDeposito != null ? indConfMovFPTrocaVlrDeposito : false;
+	}
+
+	public void setIndConfMovFPTrocaVlrDeposito(Boolean indConfMovFPTrocaVlrDeposito) {
+		this.indConfMovFPTrocaVlrDeposito = indConfMovFPTrocaVlrDeposito;
+	}
+	
 }
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
index d51b9da8a..342f6a920 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
@@ -526,7 +526,7 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
 		resumoComissao.setTotalOcd(totalOcd);
 
 		carregarTotalFormapago(resumoComissao, boletoComissaos, lsEventosFinanceiros);
-		carregarTotalDeposito(resumoComissao, boletoComissaos, lsEventosFinanceiros);
+		carregarTotalDeposito(conferencia, resumoComissao, boletoComissaos, lsEventosFinanceiros);
 
 		resumoComissao.setListNumSerieECF(puntoVentaDAO.quantidadeECFPorPuntoVenta(conferencia));
 
@@ -535,14 +535,17 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
 
 	/**
 	 * Calcula o total de deposito
-	 * 
+	 * @param conferencia 
 	 * @param resumoComissao
 	 * @param boletoComissaos
 	 * @param lsEventosFinanceiros
 	 * @return
 	 */
-	private void carregarTotalDeposito(ResumoComissao resumoComissao, List<BoletoComissao> boletoComissaos, List<EventosFinanceirosVO> lsEventosFinanceiros) {
+	private void carregarTotalDeposito(Conferencia conferencia, ResumoComissao resumoComissao, List<BoletoComissao> boletoComissaos, List<EventosFinanceirosVO> lsEventosFinanceiros) {
 		List<Integer> formaspagosDeposito = new ArrayList<Integer>(Arrays.asList(Constantes.FORMA_PAGO_DINHEIRO.intValue()));
+		if(conferencia != null && conferenciaComissaoDAO.isConfMovFPTrocaVlrDeposito(conferencia.getEmpresa())) {
+			formaspagosDeposito.add(Constantes.FORMA_PAGO_TROCA_PASSAGEM.intValue());
+		}
 
 		BigDecimal totalDeposito = BigDecimal.ZERO;