From 83911e80e8f4981382c1de31d7bdee809aae4f20 Mon Sep 17 00:00:00 2001 From: wilian Date: Wed, 8 Aug 2018 17:50:10 +0000 Subject: [PATCH] bug#11765 dev:thiago qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@84035 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../ConferenciaComissaoHibernateDAO.java | 26 +++++++++++-------- .../impl/CalculoComissaoServiceImpl.java | 10 +++++-- .../vo/comissao/BoletoComissao.java | 12 ++++++++- 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java index 246a06d6e..77d421c51 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java @@ -850,7 +850,8 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO LOG.LOGCONFERENCIA_ID) IS NOT NULL) ") - .append(" THEN 1 ELSE 0 END AS \"conferidoEntrega\" ") + .append(" THEN 1 ELSE 0 END AS \"conferidoEntrega\", ") + .append("C.PTOVTAVENTA_ID AS ptovtaventaId ") .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 ") @@ -890,16 +891,18 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO 0 ? rSet.getLong("transacaoId") : null); + boletoComissao.setPtovtaventaId(rSet.getInt("ptovtaventaId")); 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 37383265f..77a28fc36 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java @@ -579,7 +579,6 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService { /* Calculando comissão para os boletos */ for (BoletoComissao rcc : list) { - boolean isAltaTemporada = validaAltaTemporada(impostos, mes, rcc.getEstadoId()); IndStatusBoleto statusBoleto = IndStatusBoleto.valueOf(rcc.getIndstatusboleto()); @@ -588,6 +587,7 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService { if(rcc.isMotivocancelacionTransferido() || rcc.isMotivocancelacionQuitacaoOcd() || rcc.isDiferencaTrocaGeracaoOcd()) { continue; } + BigDecimal receitaItem = BigDecimal.ZERO; BigDecimal receitaDevItem = BigDecimal.ZERO; @@ -609,6 +609,7 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService { if (BooleanUtils.toBoolean(ptovtaComissao.getPedagioReceita())) { receitaItem = MoneyHelper.somar(receitaItem, rcc.getPedagio()); } + } if (isSaidaCaixa){ @@ -628,6 +629,7 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService { if (BooleanUtils.toBoolean(ptovtaComissao.getPedagioDev())) { receitaDevItem = MoneyHelper.somar(receitaDevItem, rcc.getPedagio()); } + } // Calculo de ICMS sobre o valor do bilhete @@ -648,7 +650,7 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService { BigDecimal entregaPassagem = calculoEntregaPassagem(isAltaTemporada, ptovtaComissao, receitaItem, BigDecimal.ZERO, 1); comissaoEntregaPassagem = MoneyHelper.somar(comissaoEntregaPassagem, entregaPassagem, 4); - + } else { // Receita GAP @@ -657,10 +659,12 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService { bpr = calculoComisssaoBPR(isAltaTemporada, ptovtaComissao, BigDecimal.ZERO, receitaItem); comissaoBPR = MoneyHelper.somar(comissaoBPR, bpr, 4); + } // Internet else if (rcc.getTipoVenta().equals(Constantes.TPV_POR_INTERNET.intValue())) { internet = MoneyHelper.somar(internet, receitaItem); + } // Receita BPR @@ -669,6 +673,7 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService { bpr = calculoComisssaoBPR(isAltaTemporada, ptovtaComissao, receitaItem, BigDecimal.ZERO); comissaoBPR = MoneyHelper.somar(comissaoBPR, bpr, 4); + } } @@ -760,6 +765,7 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService { } /*log.info("---------"); + log.info("CajaId=" + rcc.getCajaId() + ", numFolioSistema=" + rcc.getNumFolioSistema() + ", nombpasajero=" + rcc.getNombpasajero() + ", indstatusboleto=" + rcc.getIndstatusboleto() + ", motivocancelacionId=" + rcc.getMotivoCancelacionId() + ", PuntoventaId=" + rcc.getPuntoVentaId() + ", PtovtaventaId=" + rcc.getPtovtaventaId()); log.info("Total Bilhete: " + rcc.getTotal()); log.info("PtoVtaOrigem: " + rcc.getPtoVtaOrigem()); log.info("Status: " + rcc.getIndstatusboleto()); diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java b/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java index 0d4dbee6e..fb35f6c96 100644 --- a/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java +++ b/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java @@ -93,6 +93,8 @@ public class BoletoComissao { private Long transacaoId; private Boolean conferidoEntrega; + + private Integer ptovtaventaId; public Integer getEmpresaId() { return empresaId; @@ -979,7 +981,7 @@ public class BoletoComissao { @Override public String toString() { - return "BoletoComissao [boletoId=" + boletoId + ", tipoVenta=" + tipoVenta + ", indstatusboleto=" + indstatusboleto + ", motivoCancelacionId=" + motivoCancelacionId + ", descmotivocancelacion=" + descmotivocancelacion + ", tipoVentaOriginal1=" + tipoVentaOriginal1 + ", tipoVentaOriginal2=" + tipoVentaOriginal2 + ", indCancelacion=" + indCancelacion + ", indreimpresion=" + indreimpresion + ", total=" + getTotal() + "]"; + return "BoletoComissao [boletoId=" + boletoId + ", tipoVenta=" + tipoVenta + ", indstatusboleto=" + indstatusboleto + ", motivoCancelacionId=" + motivoCancelacionId + ", descmotivocancelacion=" + descmotivocancelacion + ", tipoVentaOriginal1=" + tipoVentaOriginal1 + ", tipoVentaOriginal2=" + tipoVentaOriginal2 + ", indCancelacion=" + indCancelacion + ", indreimpresion=" + indreimpresion + ", nombpasajero=" + nombpasajero + ", total=" + getTotal() + "]"; } public boolean isNotSomarBilhete() { @@ -1075,4 +1077,12 @@ public class BoletoComissao { getFormapagoId() != null && getFormapagoId() == Constantes.FORMA_PAGO_GERACAO_OCD.intValue(); } + public Integer getPtovtaventaId() { + return ptovtaventaId; + } + + public void setPtovtaventaId(Integer ptovtaventaId) { + this.ptovtaventaId = ptovtaventaId; + } + }