From 4ee1aff7a1184f1e2c1526b5a9e4208b7ec8ddd4 Mon Sep 17 00:00:00 2001
From: leonardo <leonardo@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 24 Jul 2014 18:09:58 +0000
Subject: [PATCH] Ajustar WS Caja (fixed bug #5519)

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@36815 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/hibernate/CajaHibernateDAO.java           | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java
index a69351dc7..0e8c8c22f 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java
@@ -104,6 +104,9 @@ public class CajaHibernateDAO extends GenericHibernateDAO<Object, Long> implemen
 	}
 	
 	private List<UsuarioVO> buscarCajaCerrado(Date fecha, String cveusuario, String turnoid,boolean sinDatosCaja) {
+		List<CajaCerradoVO> list = new ArrayList<CajaCerradoVO>();
+		HashMap<Long, CajaCerradoVO> map = new HashMap<Long, CajaCerradoVO>();
+		
 		try{
 			String sqlBuscarUsuariosCajaCerrado = sqlBuilder.getSQLBuscarUsuariosCajaCerrado(fecha, cveusuario, turnoid);
 			
@@ -144,7 +147,17 @@ public class CajaHibernateDAO extends GenericHibernateDAO<Object, Long> implemen
 		
 				sql.setResultTransformer(new AliasToBeanResultTransformer(CajaCerradoVO.class));
 		
-				u.setPasajes((List<CajaCerradoVO>)sql.list());
+				for (CajaCerradoVO cv : (List<CajaCerradoVO>)sql.list()){
+					if (map.containsKey(cv.getCajaId()) && map.get(cv.getCajaId()).getImporteTaxaEmbarque() != null &&
+							!map.get(cv.getCajaId()).getImporteTaxaEmbarque().equals(0)){
+						cv.setImporteTaxaEmbarque(new BigDecimal(0));
+					} else {
+						map.put(cv.getCajaId(), cv);
+					}
+					list.add(cv);
+				}
+				
+				u.setPasajes(list);
 				
 				String sqlBuscarReceitaDespesa = sqlBuilder.getSQLBuscarReceitasDespesasCaja(u.getUsuarioId(), fecha);
 				sql = getSession().createSQLQuery(sqlBuscarReceitaDespesa)