From 988ea5d01773e5e1d27d5589e8bfcbce2ce52e51 Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 18 Jan 2018 17:25:31 +0000
Subject: [PATCH] fixes bug #9004

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@78139 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../impl/ConferenciaComissaoServiceImpl.java  | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
index 11b81990e..4f1cd62c6 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
@@ -535,7 +535,6 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
 		resumoComissao.setTotalOcd(totalOcd);
 
 		carregarTotalFormapago(resumoComissao, boletoComissaos, lsEventosFinanceiros);
-		//subtrairOcdFormapagoDinheiro(totalOcd, resumoComissao);
 		carregarTotalDeposito(resumoComissao, boletoComissaos, lsEventosFinanceiros);
 
 		resumoComissao.setListNumSerieECF(puntoVentaDAO.quantidadeECFPorPuntoVenta(conferencia));
@@ -560,8 +559,11 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
 			if (!boletoComissao.isNotSomarBilhete()) {
 				for (FormapagoVO formapago : boletoComissao.getFormapagos()) {
 					if(formaspagosDeposito.contains(formapago.getFormapagoId())) {
+						//subtraindo as quitacoes de ocd
+						if(boletoComissao.isMotivocancelacionQuitacaoOcd()) {
+							totalDeposito = MoneyHelper.subtrair(totalDeposito, formapago.getImporte());
 						//somando as vendas
-						if(boletoComissao.isAbaBilheteVendido() || boletoComissao.isAbaGapVendido() || boletoComissao.isAbaBilheteManual()) {
+						} else if(boletoComissao.isAbaBilheteVendido() || boletoComissao.isAbaGapVendido() || boletoComissao.isAbaBilheteManual()) {
 							totalDeposito = MoneyHelper.somar(totalDeposito, formapago.getImporte());
 						//subtraindo os cancelamentos
 						} else if(boletoComissao.isAbaBilheteCancelado() || boletoComissao.isAbaGapCancelado()) {
@@ -571,9 +573,6 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
 							if(boletoComissao.isMotivocancelacionTrocado() || boletoComissao.isMotivocancelacionDevolvido()) {
 								totalDeposito = MoneyHelper.subtrair(totalDeposito, formapago.getImporte());
 							}
-						//subtraindo as quitacoes de ocd
-						} else if(boletoComissao.isMotivocancelacionQuitacaoOcd()) {
-							totalDeposito = MoneyHelper.subtrair(totalDeposito, formapago.getImporte());
 						}
 					}
 				}
@@ -591,11 +590,6 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
 			}
 		}
 		
-		//subtraindo as ocds pagas
-		/*if(resumoComissao.getTotalOcd() != null && resumoComissao.getTotalOcd().getValorPagar() != null) {
-			totalDeposito = MoneyHelper.subtrair(totalDeposito, resumoComissao.getTotalOcd().getValorPagar());
-		}*/
-
 		resumoComissao.setValorDeposito(totalDeposito);
 		
 	}
@@ -621,8 +615,11 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
 						totalFormapagos.add(formapago);
 					}
 
+					//subtraindo as quitacoes de ocd
+					if(boletoComissao.isMotivocancelacionQuitacaoOcd()) {
+						formapago.subtract(formapagoBoleto.getImporte());
 					//somando as vendas
-					if (boletoComissao.isAbaBilheteVendido() || boletoComissao.isAbaGapVendido() || boletoComissao.isAbaBilheteManual()) {
+					} else if (boletoComissao.isAbaBilheteVendido() || boletoComissao.isAbaGapVendido() || boletoComissao.isAbaBilheteManual()) {
 						formapago.add(formapagoBoleto.getImporte());
 					//subtraindo os cancelamentos
 					} else if (boletoComissao.isAbaBilheteCancelado() || boletoComissao.isAbaGapCancelado()) {
@@ -632,9 +629,6 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
 						if(boletoComissao.isMotivocancelacionTrocado() || boletoComissao.isMotivocancelacionDevolvido() || boletoComissao.isMotivocancelacionQuitacaoOcd()) {
 							formapago.subtract(formapagoBoleto.getImporte());
 						}
-					//subtraindo as quitacoes de ocd
-					} else if(boletoComissao.isMotivocancelacionQuitacaoOcd()) {
-						formapago.subtract(formapagoBoleto.getImporte());
 					}
 				}
 			}