From d70936df658a8208406e45d96e9d1f8dbbae0d50 Mon Sep 17 00:00:00 2001
From: thiago <thiago@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 10 Jun 2016 19:03:19 +0000
Subject: [PATCH] =?UTF-8?q?fixed=20bug=20#7423=20-=20Altera=C3=A7=C3=A3o?=
 =?UTF-8?q?=20em=20tela=20de=20cadastro=20de=20parametro=20de=20OCD=20incl?=
 =?UTF-8?q?us=C3=A3o=20de=20campo=20para=20definir=20se=20haver=C3=A1=20OC?=
 =?UTF-8?q?D=20para=20formas=20de=20pagamento=20diferentes=20de=20cart?=
 =?UTF-8?q?=C3=A3o=20de=20cr=C3=A9dito.=20Altera=C3=A7=C3=A3o=20de=20Relat?=
 =?UTF-8?q?=C3=B3rios=20adequando=20=C3=A0=20demanda.?=
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@56875 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../ventaboletos/entidad/OCD.java             | 28 +++++++++++++++++++
 .../ventaboletos/entidad/OCDParam.java        | 16 +++++++++++
 .../service/impl/OCDParamServiceImpl.java     | 11 ++++----
 3 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/entidad/OCD.java b/src/com/rjconsultores/ventaboletos/entidad/OCD.java
index 494a4537f..24d3f6e27 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/OCD.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/OCD.java
@@ -28,6 +28,10 @@ public class OCD implements java.io.Serializable {
 	
 	private Long boletoId;
 	private PuntoVenta puntoVenta;
+	
+	private String numtarjeta;
+	private String numautorizacion;
+	private String nsu;
 		
 	private String numoperacion;
 	
@@ -240,5 +244,29 @@ public class OCD implements java.io.Serializable {
 	public void setUsuarioId(Integer usuarioId) {
 		this.usuarioId = usuarioId;
 	}
+	@Column(name = "NUMTARJETA",length=16)
+	public String getNumtarjeta() {
+		return numtarjeta;
+	}
+
+	public void setNumtarjeta(String numtarjeta) {
+		this.numtarjeta = numtarjeta;
+	}
+	@Column(name = "NUMAUTORIZACION",length=15)
+	public String getNumautorizacion() {
+		return numautorizacion;
+	}
+
+	public void setNumautorizacion(String numautorizacion) {
+		this.numautorizacion = numautorizacion;
+	}
+	@Column(name = "NSU",length=6)
+	public String getNsu() {
+		return nsu;
+	}
+
+	public void setNsu(String nsu) {
+		this.nsu = nsu;
+	}
 	
 }
diff --git a/src/com/rjconsultores/ventaboletos/entidad/OCDParam.java b/src/com/rjconsultores/ventaboletos/entidad/OCDParam.java
index cb3f62e7f..d4b1532fe 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/OCDParam.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/OCDParam.java
@@ -36,6 +36,7 @@ public class OCDParam implements java.io.Serializable  {
 	private Boolean indOCDDefault;
 	private Boolean indOCDTroca;
 	private Boolean indPenalizacionOCD;
+	private Boolean indOcdDinheiro;
 
 	public OCDParam(Long ocdparamId, BigDecimal penalizacion,
 			Integer diasPagar, PuntoVenta puntoventa, Empresa empresa,
@@ -166,5 +167,20 @@ public class OCDParam implements java.io.Serializable  {
 
 	public void setIndPenalizacionOCD(Boolean indPenalizacionOCD) {
 		this.indPenalizacionOCD = indPenalizacionOCD;
+	}
+
+	/**
+	 * @return the indOcdDinheiro
+	 */
+	@Column(name = "INDOCDDINHEIRO")
+	public Boolean getIndOcdDinheiro() {
+		return indOcdDinheiro;
+	}
+
+	/**
+	 * @param indOcdDinheiro the indOcdDinheiro to set
+	 */
+	public void setIndOcdDinheiro(Boolean indOcdDinheiro) {
+		this.indOcdDinheiro = indOcdDinheiro;
 	}			
 }
\ No newline at end of file
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/OCDParamServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/OCDParamServiceImpl.java
index 19e46e1bc..2fa80e963 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/OCDParamServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/OCDParamServiceImpl.java
@@ -39,12 +39,11 @@ public class OCDParamServiceImpl implements OCDParamService {
 	
 	@Transactional
 	public OCDParam suscribirActualizar(OCDParam entidad){
-		OCDParam param = null;
-		
-		if (ocdParamDAO.buscaOCDParamPorEmpresa(entidad.getEmpresa()) == null){
-			param = ocdParamDAO.suscribirActualizar(entidad);
-		} 
-		return param;
+		if (entidad.getOcdparamId() == null && ocdParamDAO.buscaOCDParamPorEmpresa(entidad.getEmpresa()) != null){
+			return null;
+		} else{
+			return ocdParamDAO.suscribirActualizar(entidad);
+		}
 	}
 
 	@Transactional