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

fixes bug 6733 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@48960 d1611594-4594-4d17-8e1d-87c2c4800839
master
igor.rodrigo 2015-10-14 12:31:52 +00:00
parent 97e489bd71
commit e3136a079d
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java
View File

@ -24,7 +24,6 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio {
Connection conexao = this.relatorio.getConexao();
Map<String, Object> parametros = this.relatorio.getParametros();
final Integer CARTAO_CREDITO = 2;
final Integer CARTAO_DEBITO = 3;
String sql = getSql();
NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
@ -32,14 +31,13 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio {
stmt.setTimestamp("data_inicial", new Timestamp(DateUtil.inicioFecha((Date) parametros.get("DATA_INICIAL")).getTime()));
stmt.setTimestamp("data_final", new Timestamp(DateUtil.fimFecha((Date) parametros.get("DATA_FINAL")).getTime()));
stmt.setInt("formaPago1", CARTAO_CREDITO);
stmt.setInt("formaPago2", CARTAO_DEBITO); ;
ResultSet rset = stmt.executeQuery();
while (rset.next()) {
Map<String, Object> dataResult = new HashMap<String, Object>();
dataResult.put("estabelecimento", rset.getString("nombpuntoventa"));
dataResult.put("cartao", rset.getString("descpago"));
dataResult.put("cartao", rset.getString("numtarjeta"));
dataResult.put("datavenda", rset.getDate("fechorventa"));
dataResult.put("valorvenda", rset.getBigDecimal("valor_venda"));
dataResult.put("valorcancelar", rset.getBigDecimal("valor_cancelar"));
@ -60,25 +58,26 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio {
private String getSql() {
StringBuilder sql = new StringBuilder();
sql.append(" select distinct c.caja_id, p.nombpuntoventa, f.descpago, c.fechorventa, ptovta.numsitef,");
sql.append(" select distinct c.caja_id, p.nombpuntoventa, ctj.numtarjeta, c.fechorventa, ptovta.numsitef,");
sql.append(" (coalesce(c.preciopagado,0) + coalesce(c.importeoutros,0)+ coalesce(c.importepedagio,0)+ coalesce(c.importeseguro,0) + coalesce(c.importetaxaembarque,0)) as valor_venda,");
sql.append(" cf.importe as valor_cancelar, m.descmotivo, ctj.numautorizacion numautorizacion ");
sql.append(" TO_CHAR((cf.importe*(ocd.PENALIZACION/100)),'FM9999999.90') as valor_cancelar, m.descmotivo, ctj.numautorizacion numautorizacion ");
sql.append(" from caja c inner join punto_venta p on c.puntoventa_id = p.puntoventa_id ");
sql.append(" inner join caja_formapago cf on c.caja_id = cf.caja_id ");
sql.append(" inner join forma_pago f on cf.formapago_id = f.formapago_id ");
sql.append(" inner join ptovta_empresa ptovta on c.puntoventa_id = ptovta.puntoventa_id");
sql.append(" inner join motivo_cancelacion m ");
sql.append(" on c.motivocancelacion_id = m.motivocancelacion_id ");
sql.append(" on c.motivocancelacion_id = m.motivocancelacion_id and m.DESCMOTIVO like 'DEVOLUCAO' ");
if(parametros.get("EMPRESA_ID") != null){
sql.append(" inner join empresa e on p.empresa_id = e.empresa_id and p.empresa_id = " + parametros.get("EMPRESA_ID") );
}
sql.append(" and f.formapago_id in (:formaPago1, :formaPago2) ");
sql.append(" and f.formapago_id in (:formaPago1) ");
sql.append(" inner join caja_det_pago cdt on cdt.caja_id = c.caja_id ");
sql.append(" inner join caja_tarjeta ctj on cdt.cajadetpago_id = ctj.cajadetpago_id ");
sql.append(" and c.fechorventa >= :data_inicial and c.fechorventa <= :data_final ");
if (parametros.get("NUMPUNTOVENTA") != null) {
sql.append(" and p.puntoventa_id IN (" + parametros.get("NUMPUNTOVENTA").toString() + ")");
}
sql.append(" inner join ocd_param ocd on ocd.empresa_id = p.empresa_id ");
sql.append(" and p.empresa_id = ptovta.empresa_id ");
sql.append(" order by c.fechorventa ");
return sql.toString();