From c1fd006a21fe0e959fdedcd6b8b6b2f4d324c229 Mon Sep 17 00:00:00 2001 From: "igor.rodrigo" Date: Fri, 11 Dec 2015 12:35:19 +0000 Subject: [PATCH] =?UTF-8?q?fixes=20bug=206931=20No=20Relat=C3=B3rio=20de?= =?UTF-8?q?=20Cancelamento=20Cart=C3=A3o,=20as=20OCD's=20referente=20as=20?= =?UTF-8?q?vendas=20efetuadas=20pela=20internet=20(=20site=20Guanabara=20)?= =?UTF-8?q?=20n=C3=A3o=20est=C3=A3o=20sendo=20registradas=20no=20relat?= =?UTF-8?q?=C3=B3rio.=20Query=20alterada=20para=20exibir=20as=20referidas?= =?UTF-8?q?=20vendas.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@51105 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioCancelamentoVendaCartao.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java index 377479018..a73b24b04 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java @@ -62,10 +62,12 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio { private String getSql() { StringBuilder sql = new StringBuilder(); //Busca os boletos originais dos boletos que foram geradas OCDS + //Esses boletos sofreram transferência. //O intuito dessa query é recuperar os dados originais de cartões de crédito sql.append(" WITH boletos_originais AS "); sql.append(" (SELECT distinct b.boleto_id as boleto_id_bo, ctj.numtarjeta as numtarjeta_bo, ptovta.numsitef as numsitef_bo, "); - sql.append(" ctj.numautorizacion as numautorizacion_bo, ctj.nsu as nsu_bo, c.numoperacion AS numoperacion"); + sql.append(" CASE WHEN ctj.numautorizacion IS NULL THEN '-' ELSE ctj.numautorizacion END AS numautorizacion_bo, "); + sql.append(" ctj.nsu as nsu_bo, c.numoperacion AS numoperacion "); sql.append(" FROM boleto b, caja_det_pago cdt, caja c, caja_tarjeta ctj, ptovta_empresa ptovta "); sql.append(" WHERE b.boleto_id IN "); sql.append(" ( SELECT b.boletooriginal_id FROM OCD o "); @@ -85,7 +87,7 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio { sql.append(")"); sql.append(" AND c.numoperacion = b.numoperacion "); - sql.append(" AND b.numfoliosistema = c.numfoliosistema "); + //sql.append(" AND b.numfoliosistema = c.numfoliosistema "); sql.append(" AND cdt.caja_id = c.caja_id "); sql.append(" AND cdt.cajadetpago_id = ctj.cajadetpago_id "); sql.append(" AND cdt.formapago_id IN (2) "); @@ -96,7 +98,7 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio { sql.append(" b.puntoventa_id as puntoventa_id_bn, p.nombpuntoventa as nombpuntoventa_bn, c.fechorventa as fechorventa_bn, "); sql.append(" (coalesce(c.preciopagado,0) + coalesce(c.importeoutros,0)+ coalesce(c.importepedagio,0)+ "); sql.append(" coalesce(c.importeseguro,0) + coalesce(c.importetaxaembarque,0)) as valor_venda_bn, "); - sql.append(" TO_CHAR(coalesce(o.VALOR_TARJETA,0),'FM9999999.90') as valor_cancelar_bn, "); + sql.append(" CASE WHEN o.VALOR_TARJETA is null OR o.VALOR_TARJETA = 0 THEN TO_CHAR(COALESCE(o.VALOR_PAGAR,0),'FM9999999.90')ELSE TO_CHAR(COALESCE(o.VALOR_TARJETA,0),'FM9999999.90') END as valor_cancelar_bn, "); sql.append(" c.numfoliosistema as numfoliosistema_bn, o.fecinc as datadevolucao_bn "); sql.append(" FROM OCD o "); sql.append(" INNER JOIN boleto b ON o.BOLETO_ID = b.BOLETO_ID "); @@ -104,7 +106,7 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio { sql.append(" AND b.numfoliosistema = c.numfoliosistema "); sql.append(" INNER JOIN punto_venta p "); sql.append(" ON p.puntoventa_id = o.puntoventa_id "); - sql.append(" AND o.VALOR_TARJETA <> 0 "); + //sql.append(" AND o.VALOR_TARJETA <> 0 "); sql.append(" AND o.fecinc between :data_inicial and :data_final "); if (parametros.get("EMPRESA_ID") != null) { sql.append(" inner join marca ma on ma.marca_id = c.marca_id");