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

fixes bug#11299 

dev:gleimar
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@82500 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2018-06-08 18:25:58 +00:00
parent 48c7f69b1f
commit 4f36266044
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -638,7 +638,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
sQuery.append("AND EE.EMPRESA_ID = :empresaId ");
}
if (parametros.containsKey("puntoventaId")) {
sQuery.append("AND EE.PUNTOVENTA_ID = :puntoventaId ");
sQuery.append("AND CD.PUNTOVENTA_ID = :puntoventaId ");
}
sQuery.append("ORDER BY TEE.DESCTIPOEVENTO ");

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

@ -344,7 +344,9 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService {
if(isRefazerCalculo) {
comissaoReceitaService.limparComissaoReceita(empresaId, puntoVentaId, dataInicial, dataFinal);
List<BoletoComissao> receitasBoleto = conferenciaComissaoDAO.carregarBilhetesComissao(conferencia, true, consideraBilhetesDevolvidosEmOutraAgencia);
log.info("Total de bilhetes: " + receitasBoleto.size());
List<EventosFinanceirosVO> eventosFinanceirosVOs = conferenciaComissaoDAO.carregarEventosFinanceiros(conferencia);
log.info("Total de eventos extras: " + eventosFinanceirosVOs.size());
receitas = calculaReceitaComissao(empresaId, ptovtaComissao, receitasBoleto, diaInicial, diaFinal, mes, ano, eventosFinanceirosVOs);
reterComissaoReceitaDiaria(empresaId, puntoVentaId, usuarioId, receitas);
} else {