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

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
master
wilian 2018-08-08 17:50:10 +00:00
parent eaad0088d6
commit 83911e80e8
3 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -850,7 +850,8 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
.append(" WHERE LC.ACTIVO = 1 ")
.append(" AND LC.TRANSACAOORIGINAL_ID = C.TRANSACAOORIGINAL_ID ")
.append(" AND LC.LOGCONFERENCIA_ID <> 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<Confere
).toString().replaceAll("[\\[\\]]", "");
sQuery.append("AND ( ")
.append(" (C.PUNTOVENTA_ID = :puntoventaId AND (C.MOTIVOCANCELACION_ID IS NULL OR C.MOTIVOCANCELACION_ID NOT IN (")
.append(sMotivosCancelacion)
.append(")) ")
.append(" AND (C.PTOVTAVENTA_ID IS NULL OR C.PTOVTAVENTA_ID = :puntoventaId)) ")
.append(" OR ")
.append(" (C.PTOVTAVENTA_ID = :puntoventaId AND C.MOTIVOCANCELACION_ID IN (")
.append(sMotivosCancelacion)
.append(")) ")
.append(" OR ")
.append(" (C.PUNTOVENTA_ID = :puntoventaId AND (C.PTOVTAVENTA_ID IS NULL OR C.PTOVTAVENTA_ID = :puntoventaId)) ")
/* Filtra pela agencias, com a operação feita na agencia ou que tenha origem na agencia de filtro */
.append(" ( ")
.append(" ((C.PUNTOVENTA_ID = :puntoventaId AND C.PTOVTAVENTA_ID IS NULL) OR C.PTOVTAVENTA_ID = :puntoventaId) ")
.append(" AND ")
/* Filtro os não cancelados e os cancelados conforme lista de motivos de cancelamentos aceitos */
.append(" ( ")
.append(" C.MOTIVOCANCELACION_ID IS NULL ")
.append(" OR ")
.append(" C.MOTIVOCANCELACION_ID IN (").append(sMotivosCancelacion).append(") ")
.append(" ) ")
.append(" ) ")
/* Carrega os bilhetes entregues na agencia */
.append(" OR ")
.append(" (C.PUNTOVENTA_ID = :puntoventaId AND C.INDSTATUSBOLETO = 'E' AND C.MOTIVOCANCELACION_ID IS NULL) ")
.append(" ) ");
@ -961,6 +964,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
boletoComissao.setValorbase(rSet.getBigDecimal("valorbase"));
boletoComissao.setEmpresaId(rSet.getInt("empresaId"));
boletoComissao.setTransacaoId(rSet.getLong("transacaoId") > 0 ? rSet.getLong("transacaoId") : null);
boletoComissao.setPtovtaventaId(rSet.getInt("ptovtaventaId"));
boletoComissao.setConferidoEntrega(rSet.getBoolean("conferidoEntrega"));
if(boletoComissao.getStatus() == null && boletoComissao.getConferidoEntrega() != null && boletoComissao.getConferidoEntrega()) {

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

@ -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());
@ -589,6 +588,7 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService {
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
@ -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());

12
src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java
View File

@ -94,6 +94,8 @@ public class BoletoComissao {
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;
}
}