diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java index 32faa5eb6..c47080c8a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java @@ -102,7 +102,7 @@ public class CajaHibernateDAO extends GenericHibernateDAO implemen .addScalar("origen", StringType.INSTANCE) .addScalar("destino", StringType.INSTANCE) .addScalar("corridaId", IntegerType.INSTANCE) - .addScalar("precioBase", BigDecimalType.INSTANCE) + .addScalar("precioPagado", BigDecimalType.INSTANCE) .addScalar("fecHorVenta", DateType.INSTANCE) .addScalar("importeTaxaEmbarque", BigDecimalType.INSTANCE) .addScalar("ruta", StringType.INSTANCE) diff --git a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java index b14867126..c728539f8 100644 --- a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java +++ b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java @@ -651,8 +651,7 @@ public class SQLBuilderOracle implements SQLBuilder { sb.append(" ori.descparada as \"origen\", "); sb.append(" des.descparada as \"destino\", "); sb.append(" c.CORRIDA_ID as \"corridaId\", "); - sb.append(" (case when c.motivocancelacion_id is null then c.PRECIOBASE else c.PRECIOBASE * -1 end) as \"precioBase\", "); - sb.append(" c.PRECIOPAGADO as \"precioPagado\", "); + sb.append(" (case when c.motivocancelacion_id is null then c.PRECIOPAGADO else c.PRECIOPAGADO * -1 end) as \"precioPagado\", "); sb.append(" c.FECHORVENTA as \"fecHorVenta\", "); sb.append(" c.IMPORTETAXAEMBARQUE as \"importeTaxaEmbarque\", "); sb.append(" ru.descruta as \"ruta\", "); diff --git a/src/com/rjconsultores/ventaboletos/vo/caja/CajaCerradoVO.java b/src/com/rjconsultores/ventaboletos/vo/caja/CajaCerradoVO.java index 104cc77ba..be3523f15 100644 --- a/src/com/rjconsultores/ventaboletos/vo/caja/CajaCerradoVO.java +++ b/src/com/rjconsultores/ventaboletos/vo/caja/CajaCerradoVO.java @@ -15,7 +15,7 @@ public class CajaCerradoVO { private String origen; private String destino; private Integer corridaId; - private BigDecimal precioBase; + private BigDecimal precioPagado; private Date fecHorVenta; private BigDecimal importeTaxaEmbarque; private String ruta; @@ -31,7 +31,7 @@ public class CajaCerradoVO { this.origen = ""; this.destino = ""; this.corridaId = new Integer(-1); - this.precioBase = new BigDecimal(0); + this.precioPagado = new BigDecimal(0); this.fecHorVenta = new Date(); this.importeTaxaEmbarque = new BigDecimal(0); this.ruta = ""; @@ -72,12 +72,15 @@ public class CajaCerradoVO { public void setCorridaId(Integer corridaId) { this.corridaId = corridaId; } - public BigDecimal getPrecioBase() { - return precioBase; + + public BigDecimal getPrecioPagado() { + return precioPagado; } - public void setPrecioBase(BigDecimal precioBase) { - this.precioBase = precioBase; + + public void setPrecioPagado(BigDecimal precioPagado) { + this.precioPagado = precioPagado; } + public Date getFecHorVenta() { return fecHorVenta; }