diff --git a/pom.xml b/pom.xml index f474240da..e432ba389 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 br.com.rjconsultores ModelWeb - 1.6.5 + 1.6.7 rj-releases diff --git a/src/com/rjconsultores/ventaboletos/entidad/Cliente.java b/src/com/rjconsultores/ventaboletos/entidad/Cliente.java index 1332c62e6..b5b9fc29f 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Cliente.java +++ b/src/com/rjconsultores/ventaboletos/entidad/Cliente.java @@ -36,7 +36,10 @@ import org.hibernate.annotations.Where; @Entity @SequenceGenerator(name = "CLIENTE_SEQ", sequenceName = "CLIENTE_SEQ", allocationSize = 1) @Table(name = "CLIENTE") + public class Cliente implements Serializable { + @Column(name="ROWID", updatable=false, insertable=false) + private String rowId; private static final long serialVersionUID = 1L; @Id @@ -553,4 +556,14 @@ public class Cliente implements Serializable { this.fecbloqueiopcd = fecbloqueiopcd; } + public String getRowId() { + return rowId; + } + + public void setRowId(String rowId) { + this.rowId = rowId; + } + + + } diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresa.java b/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresa.java index 460910ef8..02f9f9bb7 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresa.java +++ b/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresa.java @@ -79,6 +79,9 @@ public class PtovtaEmpresa implements Serializable, Auditavel{ @Column(name = "NUMSITEF") private String numeroSitef; + + @Column(name = "MERCHANTSTOREADYEN") + private String merchantStoreAdyen; @NaoAuditar @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY) @@ -233,6 +236,14 @@ public class PtovtaEmpresa implements Serializable, Auditavel{ this.contasBancaria = contasBancaria; } + public String getMerchantStoreAdyen() { + return merchantStoreAdyen; + } + + public void setMerchantStoreAdyen(String merchantStoreAdyen) { + this.merchantStoreAdyen = merchantStoreAdyen; + } + public String getContasBancariaInfo() { if (!getContasBancaria().isEmpty()) { StringBuilder sb = new StringBuilder(); diff --git a/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java b/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java index d79dce8c7..061e1ae88 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java +++ b/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java @@ -346,9 +346,6 @@ public class PuntoVenta implements Serializable, Auditavel { @Column(name = "INDBLOQUEARDESCONTOWEB") private Boolean indBloquearDescontoWEB; - @Column(name = "MERCHANTSTOREADYEN") - private String merchantStoreAdyen; - public List getCobrancaAdicionalList() { return cobrancaAdicionalList; } @@ -1373,14 +1370,6 @@ public class PuntoVenta implements Serializable, Auditavel { this.indBloquearDescontoWEB = indBloquearDescontoWEB; } - public String getMerchantStoreAdyen() { - return merchantStoreAdyen; - } - - public void setMerchantStoreAdyen(String merchantStoreAdyen) { - this.merchantStoreAdyen = merchantStoreAdyen; - } - public Integer getTempoMaxServicoEmVenda() { return tempoMaxServicoEmVenda; }