fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIXES BUG#9784 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@73643 d1611594-4594-4d17-8e1d-87c2c4800839
master
gleimar 2017-09-10 22:40:57 +00:00
parent a5f6904cdb
commit 1a2fa27690
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
View File

@ -835,6 +835,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
.append("INNER JOIN VIGENCIA_TARIFA VT ON (VT.VIGENCIATARIFA_ID = T.VIGENCIATARIFA_ID) ") .append("INNER JOIN VIGENCIA_TARIFA VT ON (VT.VIGENCIATARIFA_ID = T.VIGENCIATARIFA_ID) ")
.append("WHERE C.ACTIVO = 1 ") .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.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 "); .append("AND C.FECHORVENTA BETWEEN VT.FECINICIOVIGENCIA AND VT.FECFINVIGENCIA ");
if (parametros.containsKey("empresaId")) { if (parametros.containsKey("empresaId")) {

6
src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java
View File

@ -204,9 +204,9 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService {
BigDecimal recbpr = BigDecimal.ZERO; BigDecimal recbpr = BigDecimal.ZERO;
BigDecimal receitaBPR = MoneyHelper.somar(bpr, gap, 2); BigDecimal receitaBPR = MoneyHelper.somar(bpr, gap, 2);
if (isAltaTemporada) { 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 { } 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; return recbpr;
@ -490,7 +490,7 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService {
boolean isAltaTemporada = validaAltaTemporada(impostos, mes, rcc.getEstadoId()); boolean isAltaTemporada = validaAltaTemporada(impostos, mes, rcc.getEstadoId());
IndStatusBoleto statusBoleto = IndStatusBoleto.valueOf(rcc.getIndstatusboleto()); 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 receitaItem = BigDecimal.ZERO;
BigDecimal receitaDevItem = BigDecimal.ZERO; BigDecimal receitaDevItem = BigDecimal.ZERO;

2
src/com/rjconsultores/ventaboletos/utilerias/MoneyHelper.java
View File

@ -95,7 +95,7 @@ public class MoneyHelper {
BigDecimal fAmount = arredondar(aAmount, customScale); BigDecimal fAmount = arredondar(aAmount, customScale);
BigDecimal fDivisor = arredondar(aDivisor, 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) { public static BigDecimal multiplicar(BigDecimal aAmount, BigDecimal aMultiplicand) {