From 9f76d8f06fa2488e19b60b9dccfeba561a041e2b Mon Sep 17 00:00:00 2001 From: wilian Date: Wed, 8 Aug 2018 21:08:06 +0000 Subject: [PATCH] fixes bug#11765 dev:thiago qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@84062 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../dao/hibernate/ConferenciaComissaoHibernateDAO.java | 4 +++- .../service/impl/CalculoComissaoServiceImpl.java | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java index 77d421c51..b567c879b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java @@ -851,7 +851,8 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO LOG.LOGCONFERENCIA_ID) IS NOT NULL) ") .append(" THEN 1 ELSE 0 END AS \"conferidoEntrega\", ") - .append("C.PTOVTAVENTA_ID AS ptovtaventaId ") + .append("C.PTOVTAVENTA_ID AS ptovtaventaId, ") + .append("C.PUNTOVENTA_ID AS puntoventaId ") .append("FROM CAJA C ") .append("LEFT JOIN PARADA ORI ON ORI.PARADA_ID = C.ORIGEN_ID ") .append("LEFT JOIN CIUDAD CID ON CID.CIUDAD_ID = ORI.CIUDAD_ID ") @@ -965,6 +966,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO 0 ? rSet.getLong("transacaoId") : null); boletoComissao.setPtovtaventaId(rSet.getInt("ptovtaventaId")); + boletoComissao.setPuntoVentaId(rSet.getInt("puntoventaId")); boletoComissao.setConferidoEntrega(rSet.getBoolean("conferidoEntrega")); if(boletoComissao.getStatus() == null && boletoComissao.getConferidoEntrega() != null && boletoComissao.getConferidoEntrega()) { diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java index 77a28fc36..d1c106466 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java @@ -584,6 +584,14 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService { IndStatusBoleto statusBoleto = IndStatusBoleto.valueOf(rcc.getIndstatusboleto()); boolean isSaidaCaixa = rcc.getMotivoCancelacionId() != null; boolean isEntregaPassagem = statusBoleto.equals(IndStatusBoleto.E) && (rcc.getMotivoCancelacionId() == null); + + /* + * Exclui os bilhetes que não foram entregues na agencia da comissão que está sendo calculada + */ + if(isEntregaPassagem && !ptovtaComissao.getPuntoventaId().getPuntoventaId().equals(rcc.getPuntoVentaId())) { + continue; + } + if(rcc.isMotivocancelacionTransferido() || rcc.isMotivocancelacionQuitacaoOcd() || rcc.isDiferencaTrocaGeracaoOcd()) { continue; }