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

Mantis 4730 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@32250 d1611594-4594-4d17-8e1d-87c2c4800839
master
lucas.taia 2013-11-26 13:18:36 +00:00
parent 25c46d16bf
commit b9cdce22ff
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/rjconsultores/ventaboletos/service/impl/PricingOcupaAntecipaServiceImpl.java
View File

@ -1,9 +1,9 @@
package com.rjconsultores.ventaboletos.service.impl; package com.rjconsultores.ventaboletos.service.impl;
import java.math.BigDecimal;
import java.util.Calendar; import java.util.Calendar;
import java.util.List; import java.util.List;
import org.jfree.util.Log;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -76,6 +76,11 @@ public class PricingOcupaAntecipaServiceImpl implements PricingOcupaAntecipaServ
boolean validaCantDias = ((cantdiasmin != null) && (cantdiasmax != null)); boolean validaCantDias = ((cantdiasmin != null) && (cantdiasmax != null));
BigDecimal cantdiasini = pricingOcupaAntecipa.getOcupacioninicial();
BigDecimal cantdiasfin = pricingOcupaAntecipa.getOcupacionfinal();
boolean validaCantPorcentaje = ((cantdiasini != null) && (cantdiasfin != null));
for (PricingOcupaAntecipa poa : lsSalvos) { for (PricingOcupaAntecipa poa : lsSalvos) {
boolean traslapaCantAsiento = false; boolean traslapaCantAsiento = false;
@ -92,7 +97,14 @@ public class PricingOcupaAntecipaServiceImpl implements PricingOcupaAntecipaServ
} }
} }
if (traslapaCantAsiento || traslapaCantDias) { boolean traslapaCantPorcentaje = false;
if (validaCantPorcentaje) {
if ((poa.getOcupacioninicial() != null) && (poa.getOcupacionfinal() != null)) {
traslapaCantPorcentaje = TraslaparUtil.intersectNum(poa.getOcupacioninicial(), poa.getOcupacionfinal(), cantdiasini, cantdiasfin);
}
}
if (traslapaCantAsiento || traslapaCantDias || traslapaCantPorcentaje) {
log.info("registro que traslapa PricingOcupaAntecipa id =" + poa.getPricingocupaantecipaId()); log.info("registro que traslapa PricingOcupaAntecipa id =" + poa.getPricingocupaantecipaId());
traslapa = true; traslapa = true;