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 { 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 { @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 { 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 boletoComissaos, List lsEventosFinanceiros) { + private void carregarTotalDeposito(Conferencia conferencia, ResumoComissao resumoComissao, List boletoComissaos, List lsEventosFinanceiros) { List formaspagosDeposito = new ArrayList(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;