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

Merge remote-tracking branch 'origin/master' into AL-2696

master
wallace.henrique 2023-07-06 18:04:00 -03:00
parent ad74a4c32d d835c11eae
commit 64e0dc5886
4 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ModelWeb</artifactId> <artifactId>ModelWeb</artifactId>
<version>1.6.5</version> <version>1.6.7</version>
<distributionManagement> <distributionManagement>
<repository> <repository>
<id>rj-releases</id> <id>rj-releases</id>

13
src/com/rjconsultores/ventaboletos/entidad/Cliente.java
View File

@ -36,7 +36,10 @@ import org.hibernate.annotations.Where;
@Entity @Entity
@SequenceGenerator(name = "CLIENTE_SEQ", sequenceName = "CLIENTE_SEQ", allocationSize = 1) @SequenceGenerator(name = "CLIENTE_SEQ", sequenceName = "CLIENTE_SEQ", allocationSize = 1)
@Table(name = "CLIENTE") @Table(name = "CLIENTE")
public class Cliente implements Serializable { public class Cliente implements Serializable {
@Column(name="ROWID", updatable=false, insertable=false)
private String rowId;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@ -553,4 +556,14 @@ public class Cliente implements Serializable {
this.fecbloqueiopcd = fecbloqueiopcd; this.fecbloqueiopcd = fecbloqueiopcd;
} }
public String getRowId() {
return rowId;
}
public void setRowId(String rowId) {
this.rowId = rowId;
}
} }

11
src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresa.java
View File

@ -80,6 +80,9 @@ public class PtovtaEmpresa implements Serializable, Auditavel<PtovtaEmpresa>{
@Column(name = "NUMSITEF") @Column(name = "NUMSITEF")
private String numeroSitef; private String numeroSitef;
@Column(name = "MERCHANTSTOREADYEN")
private String merchantStoreAdyen;
@NaoAuditar @NaoAuditar
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY) @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
@JoinColumn(name = "PTOVTAEMPRESA_ID", referencedColumnName = "PTOVTAEMPRESA_ID") @JoinColumn(name = "PTOVTAEMPRESA_ID", referencedColumnName = "PTOVTAEMPRESA_ID")
@ -233,6 +236,14 @@ public class PtovtaEmpresa implements Serializable, Auditavel<PtovtaEmpresa>{
this.contasBancaria = contasBancaria; this.contasBancaria = contasBancaria;
} }
public String getMerchantStoreAdyen() {
return merchantStoreAdyen;
}
public void setMerchantStoreAdyen(String merchantStoreAdyen) {
this.merchantStoreAdyen = merchantStoreAdyen;
}
public String getContasBancariaInfo() { public String getContasBancariaInfo() {
if (!getContasBancaria().isEmpty()) { if (!getContasBancaria().isEmpty()) {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();

11
src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java
View File

@ -346,9 +346,6 @@ public class PuntoVenta implements Serializable, Auditavel<PuntoVenta> {
@Column(name = "INDBLOQUEARDESCONTOWEB") @Column(name = "INDBLOQUEARDESCONTOWEB")
private Boolean indBloquearDescontoWEB; private Boolean indBloquearDescontoWEB;
@Column(name = "MERCHANTSTOREADYEN")
private String merchantStoreAdyen;
public List<CobrancaAdcPuntoVenta> getCobrancaAdicionalList() { public List<CobrancaAdcPuntoVenta> getCobrancaAdicionalList() {
return cobrancaAdicionalList; return cobrancaAdicionalList;
} }
@ -1373,14 +1370,6 @@ public class PuntoVenta implements Serializable, Auditavel<PuntoVenta> {
this.indBloquearDescontoWEB = indBloquearDescontoWEB; this.indBloquearDescontoWEB = indBloquearDescontoWEB;
} }
public String getMerchantStoreAdyen() {
return merchantStoreAdyen;
}
public void setMerchantStoreAdyen(String merchantStoreAdyen) {
this.merchantStoreAdyen = merchantStoreAdyen;
}
public Integer getTempoMaxServicoEmVenda() { public Integer getTempoMaxServicoEmVenda() {
return tempoMaxServicoEmVenda; return tempoMaxServicoEmVenda;
} }