From 1a2fa276905b07f8cb12e554e888ada504a1bb53 Mon Sep 17 00:00:00 2001
From: gleimar <gleimar@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Sun, 10 Sep 2017 22:40:57 +0000
Subject: [PATCH] FIXES BUG#9784

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

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
index 37d20ee97..9caa5db0b 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
@@ -835,6 +835,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 					.append("INNER JOIN VIGENCIA_TARIFA VT ON (VT.VIGENCIATARIFA_ID = T.VIGENCIATARIFA_ID) ")
 					.append("WHERE C.ACTIVO = 1 ")
 					.append("AND C.FECCORTE BETWEEN TO_DATE(:dataInicial, 'DD/MM/YYYY') AND TO_DATE(:dataFinal, 'DD/MM/YYYY') ")
+					.append("AND ( (C.INDSTATUSBOLETO = 'E' AND C.INDREIMPRESION = 1) OR (C.INDREIMPRESION = 0 ))  ")
 					.append("AND C.FECHORVENTA BETWEEN VT.FECINICIOVIGENCIA AND VT.FECFINVIGENCIA ");
 			
 			if (parametros.containsKey("empresaId")) {
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java
index 187a72c26..f9bba7962 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java
@@ -204,11 +204,11 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService {
 		BigDecimal recbpr = BigDecimal.ZERO;
 		BigDecimal receitaBPR = MoneyHelper.somar(bpr, gap, 2);
 		if (isAltaTemporada) {
-			recbpr = MoneyHelper.multiplicar(receitaBPR, ptovtaComissao.getPassagemAlta() != null ? MoneyHelper.dividir(ptovtaComissao.getPassagemAlta(), CEM) : BigDecimal.ZERO, 2);
+			recbpr = MoneyHelper.dividir( MoneyHelper.multiplicar(receitaBPR, ptovtaComissao.getPassagemAlta() != null ? ptovtaComissao.getPassagemAlta() : BigDecimal.ZERO, 2),CEM);
 		} else {
-			recbpr = MoneyHelper.multiplicar(receitaBPR, ptovtaComissao.getPassagemBaixa() != null ? MoneyHelper.dividir(ptovtaComissao.getPassagemBaixa(), CEM) : BigDecimal.ZERO, 2);
+			recbpr = MoneyHelper.dividir( MoneyHelper.multiplicar(receitaBPR, ptovtaComissao.getPassagemBaixa() != null ? ptovtaComissao.getPassagemBaixa() : BigDecimal.ZERO, 2),CEM);
 		}
-
+		
 		return recbpr;
 	}
 
@@ -490,7 +490,7 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService {
 				boolean isAltaTemporada = validaAltaTemporada(impostos, mes, rcc.getEstadoId());
 
 				IndStatusBoleto statusBoleto = IndStatusBoleto.valueOf(rcc.getIndstatusboleto());
-				boolean isSaidaCaixa = (rcc.getMotivoCancelacionId() != null) && (rcc.getIndreimpresion() != null && rcc.getIndreimpresion());
+				boolean isSaidaCaixa = (rcc.getMotivoCancelacionId() != null) && (rcc.getIndreimpresion() != null && !rcc.getIndreimpresion());
 
 				BigDecimal receitaItem = BigDecimal.ZERO;
 				BigDecimal receitaDevItem = BigDecimal.ZERO;
diff --git a/src/com/rjconsultores/ventaboletos/utilerias/MoneyHelper.java b/src/com/rjconsultores/ventaboletos/utilerias/MoneyHelper.java
index 6034e36b3..8b69e77e0 100644
--- a/src/com/rjconsultores/ventaboletos/utilerias/MoneyHelper.java
+++ b/src/com/rjconsultores/ventaboletos/utilerias/MoneyHelper.java
@@ -95,7 +95,7 @@ public class MoneyHelper {
 		BigDecimal fAmount = arredondar(aAmount, customScale);
 		BigDecimal fDivisor = arredondar(aDivisor, customScale);
 		
-		return fAmount.divide(fDivisor, DECIMALS, ROUNDING_MODE);
+		return fAmount.divide(fDivisor, customScale, ROUNDING_MODE);
 	}
 
 	public static BigDecimal multiplicar(BigDecimal aAmount, BigDecimal aMultiplicand) {