From 038ee480f8a33742eaf265ef3047e17b6655d3cc Mon Sep 17 00:00:00 2001
From: gleimar <gleimar@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 21 Sep 2017 14:59:11 +0000
Subject: [PATCH] =?UTF-8?q?corre=C3=A7=C3=A3o=20c=C3=A1lculo=20bug#9784?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@74092 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/hibernate/ConferenciaComissaoHibernateDAO.java        | 2 +-
 .../ventaboletos/service/impl/CalculoComissaoServiceImpl.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
index 9caa5db0b..10170daa5 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
@@ -842,7 +842,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 				sQuery.append("AND M.EMPRESA_ID = :empresaId ");
 			}
 			if (parametros.containsKey("puntoventaId")) {
-				sQuery.append("AND C.PUNTOVENTA_ID = :puntoventaId ");
+				sQuery.append("AND (C.PUNTOVENTA_ID = :puntoventaId or (C.ptovtaventa_id =:puntoventaId and C.MOTIVOCANCELACION_ID  IN (32,31,10) AND C.INDSTATUSOPERACION  = 'F' )  )");
 			}
 			if (StringUtils.isNotBlank(conferencia.getNumfoliosistema())) {
 				sQuery.append("AND C.NUMFOLIOSISTEMA = :numfoliosistema ");
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java
index cb3fce605..2712f63c9 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java
@@ -545,11 +545,11 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService {
 				}
 
 				// Boletos impressos no punto venta
-				if (statusBoleto.equals(IndStatusBoleto.E)) {
+				if (statusBoleto.equals(IndStatusBoleto.E) && (rcc.getMotivoCancelacionId() == null)) {
 					contImpressa++;
 					gapImpressa = MoneyHelper.somar(gapImpressa, receitaItem);
 
-					BigDecimal entregaPassagem = calculoEntregaPassagem(isAltaTemporada, ptovtaComissao, receitaItem, BigDecimal.ZERO, contImpressa);
+					BigDecimal entregaPassagem = calculoEntregaPassagem(isAltaTemporada, ptovtaComissao, receitaItem, BigDecimal.ZERO, 1);
 					comissaoEntregaPassagem = MoneyHelper.somar(comissaoEntregaPassagem, entregaPassagem);
 
 				} else {