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

bug #0009037 - alteração do calculo do pedagio 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@69195 d1611594-4594-4d17-8e1d-87c2c4800839
master
bruno.neves 2017-05-22 21:15:52 +00:00
parent 5cd5d52fe3
commit 5fd987ba9f
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java
View File

@ -185,7 +185,8 @@ public class CalcularPeajeHibernateDAO extends GenericHibernateDAO<String, Strin
pracaPedagio.setCasetaPeajeId(pvo.casetaPeajeId); pracaPedagio.setCasetaPeajeId(pvo.casetaPeajeId);
pfp.setPracaPedagioId(pracaPedagio); pfp.setPracaPedagioId(pracaPedagio);
List<PrecioFixoPedagio> list = precioFixoPedagioService.buscarPrecioFixoPedagio(pfp); List<PrecioFixoPedagio> list = precioFixoPedagioService.buscarPrecioFixoPedagio(pfp);
if(list.size()>1){
if(list.size()>=1){
pvo.importePeaje = list.get(0).getValorFixo(); pvo.importePeaje = list.get(0).getValorFixo();
} }

10
src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoOcupacion.java
View File

@ -44,6 +44,8 @@ public class PricingEspecificoOcupacion implements Serializable {
@Basic(optional = false) @Basic(optional = false)
@Column(name = "USUARIO_ID") @Column(name = "USUARIO_ID")
private Integer usuarioId; private Integer usuarioId;
@Column(name = "DESCUENTO")
private BigDecimal descuento;
@JoinColumn(name = "PRICINGESPECIFICO_ID", referencedColumnName = "PRICINGESPECIFICO_ID") @JoinColumn(name = "PRICINGESPECIFICO_ID", referencedColumnName = "PRICINGESPECIFICO_ID")
@ManyToOne @ManyToOne
@ -112,6 +114,14 @@ public class PricingEspecificoOcupacion implements Serializable {
public void setPricingEspecifico(PricingEspecifico pricingEspecifico) { public void setPricingEspecifico(PricingEspecifico pricingEspecifico) {
this.pricingEspecifico = pricingEspecifico; this.pricingEspecifico = pricingEspecifico;
} }
public BigDecimal getDescuento() {
return descuento;
}
public void setDescuento(BigDecimal descuento) {
this.descuento = descuento;
}
@Override @Override
public int hashCode() { public int hashCode() {