From 72bb337144d0f41fe7775ceab3a4c19236fdd2d0 Mon Sep 17 00:00:00 2001
From: julio <julio@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 24 Nov 2014 13:03:46 +0000
Subject: [PATCH] WS de cajas (fixes bug #5845) Tempo: 3 horas

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@39849 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/sqlbuilder/impl/SQLBuilderOracle.java        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java
index b2f09f88b..c14ba54c6 100644
--- a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java
+++ b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java
@@ -8,6 +8,9 @@ import com.rjconsultores.ventaboletos.dao.util.DBUtil;
 
 public class SQLBuilderOracle implements SQLBuilder {
 	private static final Integer HORAS_NO_DIA = Integer.valueOf(24);
+	private static final Integer RED_PAGO_FORMAPAGO_ID = Integer.valueOf(95);
+	private static final String RED_PAGO_EMISSOR_TARJETA = "RDP";
+	private static final String RED_PAGO_FORMA_PAGO = "CR";
 
 	@Override
 	public String getSQLGerarTarifaOficial(final Integer codRuta, final Integer usuarioId,
@@ -650,7 +653,6 @@ public class SQLBuilderOracle implements SQLBuilder {
 
 		StringBuilder sb = new StringBuilder("");
 		sb.append(" select   ");
-		sb.append("   ");
 		sb.append(" c.CAJA_ID as \"cajaId\",  ");
 		sb.append(" c.NUMFOLIOSISTEMA as \"numFolioSistema\",  ");
 		sb.append(" ori.descparada as \"origen\",  ");
@@ -660,14 +662,13 @@ public class SQLBuilderOracle implements SQLBuilder {
 		sb.append(" c.FECHORVENTA as \"fecHorVenta\",  ");
 		sb.append(" (case when c.motivocancelacion_id is null then c.IMPORTETAXAEMBARQUE else c.IMPORTETAXAEMBARQUE * -1 end) as \"importeTaxaEmbarque\",  ");
 		sb.append(" ru.descruta as \"ruta\",  ");
-		sb.append(" ct.numautorizacion as \"numAutorizacion\",  ");
+		sb.append(" nvl(ct.numautorizacion, c.numoperacion) as \"numAutorizacion\", ");
 		sb.append(" (case when cfp.formapago_id = 11 then cdp.numdocumento else null end) as \"ordenSevicio\",  ");
 		sb.append(" s.descsecretaria as \"secretaria\",  ");
 		sb.append(" s.CVESECRETARIA  as \"cvesecretaria\",  ");
-		sb.append(" ct.TIPOTARJETA as \"emissorTarjeta\",  ");
+		sb.append(" (case when formapago_id = " + RED_PAGO_FORMAPAGO_ID).append(" then '" + RED_PAGO_EMISSOR_TARJETA + "' else ct.tipotarjeta end) as \"emissorTarjeta\",  ");
 		sb.append(" cat.DESCCATEGORIA as \"tipoPasaje\",  ");
-		sb.append(" fp.CVEPAGO as \"formaPago\"  ");
-		sb.append("   ");
+		sb.append(" (case when formapago_id = " + RED_PAGO_FORMAPAGO_ID).append(" then '" + RED_PAGO_FORMA_PAGO + "' else fp.cvepago end) as \"formaPago\"  ");
 		sb.append(" from   ");
 		sb.append("     caja c  ");
 		sb.append("     left join caja_formapago cfp on cfp.caja_id = c.caja_id  ");
@@ -679,7 +680,6 @@ public class SQLBuilderOracle implements SQLBuilder {
 		sb.append("     left join ruta ru on ru.ruta_id = c.ruta_id  ");
 		sb.append("     left join parada ori on ori.parada_id = c.origen_id  ");
 		sb.append("     left join parada des on des.parada_id = c.destino_id  ");
-		sb.append("   ");
 		sb.append(" where   ");
 		sb.append("     trunc(c.feccorte) = to_date('").append(sdf.format(fecha)).append("','yyyy-MM-dd')");
 		sb.append("     and c.usuario_id = ").append(usuarioId);