From 5fd987ba9f6190818bc4f67c24c3897cc625b474 Mon Sep 17 00:00:00 2001
From: "bruno.neves" <bruno.neves@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 22 May 2017 21:15:52 +0000
Subject: [PATCH] =?UTF-8?q?bug=20#0009037=20-=20altera=C3=A7=C3=A3o=20do?=
 =?UTF-8?q?=20calculo=20do=20pedagio?=
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/Model/trunk/modelWeb@69195 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/hibernate/CalcularPeajeHibernateDAO.java       |  3 ++-
 .../entidad/PricingEspecificoOcupacion.java            | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java
index a7c54ae29..2c18101b8 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java
@@ -185,7 +185,8 @@ public class CalcularPeajeHibernateDAO extends GenericHibernateDAO<String, Strin
 					pracaPedagio.setCasetaPeajeId(pvo.casetaPeajeId);
 					pfp.setPracaPedagioId(pracaPedagio);
 					List<PrecioFixoPedagio> list  = precioFixoPedagioService.buscarPrecioFixoPedagio(pfp);
-					if(list.size()>1){
+					
+					if(list.size()>=1){
 						pvo.importePeaje = list.get(0).getValorFixo();
 					}
 					
diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoOcupacion.java b/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoOcupacion.java
index 8b7128824..fb35724bf 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoOcupacion.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoOcupacion.java
@@ -44,6 +44,8 @@ public class PricingEspecificoOcupacion implements Serializable {
 	@Basic(optional = false)
 	@Column(name = "USUARIO_ID")
 	private Integer usuarioId;
+	@Column(name = "DESCUENTO")
+	private BigDecimal descuento;
 
 	@JoinColumn(name = "PRICINGESPECIFICO_ID", referencedColumnName = "PRICINGESPECIFICO_ID")
 	@ManyToOne
@@ -112,6 +114,14 @@ public class PricingEspecificoOcupacion implements Serializable {
 	public void setPricingEspecifico(PricingEspecifico pricingEspecifico) {
 		this.pricingEspecifico = pricingEspecifico;
 	}
+	
+	public BigDecimal getDescuento() {
+		return descuento;
+	}
+
+	public void setDescuento(BigDecimal descuento) {
+		this.descuento = descuento;
+	}
 
 	@Override
 	public int hashCode() {