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

bug #6669 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@49453 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2015-10-26 18:46:00 +00:00
parent 66bada7575
commit bc5faa20b2
1 changed files with 51 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java
View File

@ -52,9 +52,34 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService {
@Autowired @Autowired
private DescontoComissaoService descontoComissaoService; private DescontoComissaoService descontoComissaoService;
public boolean validaCompetencia(Date periodo) {
Calendar calendario = Calendar.getInstance();
calendario.setTime(periodo);
int mes = calendario.get(Calendar.MONTH) + 1;
int ano = calendario.get(Calendar.YEAR);
Calendar now = Calendar.getInstance();
int mesNow = now.get(Calendar.MONTH) + 1;
int anoNow = now.get(Calendar.YEAR);
if (anoNow == ano) {
if (mesNow > mes) {
return true;
}
} else if (anoNow > ano) {
return true;
}
return false;
}
@Override @Override
public void registrarCalculoComissao(Integer puntoVentaId, Integer empresaId, Date periodo) throws ComissaoException { public void registrarCalculoComissao(Integer puntoVentaId, Integer empresaId, Date periodo) throws ComissaoException {
if (validaCompetencia(periodo)) {
String competencia = DateUtil.getStringDate(periodo, "MM/yyyy"); String competencia = DateUtil.getStringDate(periodo, "MM/yyyy");
List<Comissao> comissoes = comissaoDAO.buscaComissaoVigencia(puntoVentaId, empresaId, competencia); List<Comissao> comissoes = comissaoDAO.buscaComissaoVigencia(puntoVentaId, empresaId, competencia);
if (comissoes.isEmpty()) { if (comissoes.isEmpty()) {
@ -88,6 +113,9 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService {
} else { } else {
throw new ComissaoException("busquedaCalculoComissaoController.registro.exception"); throw new ComissaoException("busquedaCalculoComissaoController.registro.exception");
} }
} else {
throw new ComissaoException("busquedaCalculoComissaoController.competencia.exception");
}
} }
@Override @Override