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

fixes bug#0012560 

dev: thiago
qua: wallysson

Implementação efetuada. O script solicitado encontra-se anexo ao mantis.

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@87173 d1611594-4594-4d17-8e1d-87c2c4800839
master
emerson 2018-11-20 13:55:12 +00:00
parent 46485c4367
commit d1ebdb38f4
5 changed files with 282 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/rjconsultores/ventaboletos/service/CategoriaService.java
View File

@ -16,6 +16,8 @@ public interface CategoriaService extends GenericService<Categoria, Integer> {
public List<Categoria> buscar(String desccategoria);
public Categoria buscarUmaCategoria(String desccategoria);
public List<Categoria> buscarCategoriaPesquisada(String desccategoria);
/**

2
src/com/rjconsultores/ventaboletos/service/PricingService.java
View File

@ -28,5 +28,5 @@ public interface PricingService extends GenericService<Pricing, Integer> {
public void ativar(Pricing entidad);
public Boolean clonarPricing(Integer pricingId, String nomePricing);
public Boolean clonarPricing(Integer pricingId, String nomePricing, boolean incluirPadraoPricingTipoPassagemPET);
}

9
src/com/rjconsultores/ventaboletos/service/impl/CategoriaServiceImpl.java
View File

@ -88,4 +88,13 @@ public class CategoriaServiceImpl implements CategoriaService {
}
return listCategoriasVisibles;
}
@Override
public Categoria buscarUmaCategoria(String desccategoria) {
List<Categoria> categoriaList = buscar(desccategoria);
if (categoriaList.isEmpty()) {
return null;
}
return categoriaList.get(0);
}
}

474
src/com/rjconsultores/ventaboletos/service/impl/PricingServiceImpl.java
View File

@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.rjconsultores.ventaboletos.dao.PricingDAO;
import com.rjconsultores.ventaboletos.entidad.Categoria;
import com.rjconsultores.ventaboletos.entidad.Empresa;
import com.rjconsultores.ventaboletos.entidad.Pricing;
import com.rjconsultores.ventaboletos.entidad.PricingAsiento;
@ -31,6 +32,7 @@ import com.rjconsultores.ventaboletos.entidad.PricingRuta;
import com.rjconsultores.ventaboletos.entidad.PricingTipoPtoVta;
import com.rjconsultores.ventaboletos.entidad.PricingTipoServicio;
import com.rjconsultores.ventaboletos.entidad.PricingVigencia;
import com.rjconsultores.ventaboletos.service.CategoriaService;
import com.rjconsultores.ventaboletos.service.PricingService;
import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
@ -44,6 +46,9 @@ public class PricingServiceImpl implements PricingService {
@Autowired
private PricingDAO pricingDAO;
@Autowired
private CategoriaService categoriaService;
public List<Pricing> obtenerTodos() {
return pricingDAO.obtenerTodos();
}
@ -70,7 +75,7 @@ public class PricingServiceImpl implements PricingService {
return pricingDAO.actualizacion(entidad);
}
private void ativarInativarExcluirPricing(Pricing entidad, Integer statusPricing, Integer ativarInativarExcluir) {
private void ativarInativarExcluirPricing(Pricing entidad, Integer ativarInativarExcluir) {
entidad = obtenerID(entidad.getPricingId());
for (PricingAsiento pricingAsiento : entidad.getPricingAsientoList()) {
@ -172,17 +177,17 @@ public class PricingServiceImpl implements PricingService {
@Transactional
public void borrar(Pricing entidad) {
ativarInativarExcluirPricing(entidad, Pricing.ATIVO, Pricing.EXCLUIDO);
ativarInativarExcluirPricing(entidad, Pricing.EXCLUIDO);
}
@Transactional
public void inativar(Pricing entidad) {
ativarInativarExcluirPricing(entidad, Pricing.ATIVO, Pricing.INATIVO);
ativarInativarExcluirPricing(entidad, Pricing.INATIVO);
}
@Transactional
public void ativar(Pricing entidad) {
ativarInativarExcluirPricing(entidad, Pricing.INATIVO, Pricing.ATIVO);
ativarInativarExcluirPricing(entidad, Pricing.ATIVO);
}
@Transactional
@ -200,7 +205,7 @@ public class PricingServiceImpl implements PricingService {
}
@Transactional
public Boolean clonarPricing(Integer pricingId, String nomePricing) {
public Boolean clonarPricing(Integer pricingId, String nomePricing, boolean incluirPadraoPricingTipoPassagemPET) {
Pricing pricing = this.obtenerID(pricingId);
Pricing clonePricing = new Pricing();
@ -217,100 +222,217 @@ public class PricingServiceImpl implements PricingService {
clonePricing.setIndGeneraFeriadoViaje(pricing.getIndGeneraFeriadoViaje());
clonePricing.setIndtransferible(pricing.getIndtransferible());
clonePricing.setPricingAsientoList(new ArrayList<PricingAsiento>());
clonePricing.setPricingCategoriaList(new ArrayList<PricingCategoria>());
clonePricing.setPricingClaseList(new ArrayList<PricingClase>());
clonePricing.setPricingCorridaList(new ArrayList<PricingCorrida>());
clonePricing.setPricingDiaList(new ArrayList<PricingDia>());
clonePricing.setPricingImporteList(new ArrayList<PricingImporte>());
clonePricing.setPricingMarcaList(new ArrayList<PricingMarca>());
clonePricing.setPricingMercadoList(new ArrayList<PricingMercado>());
clonePricing.setPricingOcupaAntecipaList(new ArrayList<PricingOcupaAntecipa>());
clonePricing.setPricingPuntoventaList(new ArrayList<PricingPuntoVenta>());
clonePricing.setPricingRutaList(new ArrayList<PricingRuta>());
clonePricing.setPricingTipoptovtaList(new ArrayList<PricingTipoPtoVta>());
clonePricing.setPricingTipoServicioList(new ArrayList<PricingTipoServicio>());
clonePricing.setPricingVigenciaList(new ArrayList<PricingVigencia>());
clonePricing = suscribir(clonePricing);
clonePricing = percorrerPricingAtivoParaClonar(pricing, clonePricing);
percorrerPricingAtivoParaClonar(pricing, clonePricing, incluirPadraoPricingTipoPassagemPET);
actualizacion(clonePricing);
inativar(clonePricing);
if (clonePricing.getPricingId() != null) {
return true;
} else {
return false;
}
return clonePricing.getPricingId() != null;
}
private Pricing percorrerPricingAtivoParaClonar(Pricing pricing, Pricing clonePricing) {
private void percorrerPricingAtivoParaClonar(Pricing pricing, Pricing clonePricing, boolean incluirPadraoPricingTipoPassagemPET) {
Integer ativar = Pricing.ATIVO;
clonePricing.setPricingAsientoList(obtemPricingAsientoList(pricing, clonePricing, ativar));
clonePricing.setPricingCategoriaList(obtemPricingCategoriaList(pricing, clonePricing, ativar, incluirPadraoPricingTipoPassagemPET));
clonePricing.setPricingClaseList(obtemPricingClaseList(pricing, clonePricing, ativar));
clonePricing.setPricingCorridaList(obtemPricingCorridaList(pricing, clonePricing, ativar));
clonePricing.setPricingDiaList(obtemPricingDiaList(pricing, clonePricing, ativar));
clonePricing.setPricingImporteList(obtemPricingImporteList(pricing, clonePricing, ativar));
clonePricing.setPricingMarcaList(obtemPricingMarcaList(pricing, clonePricing, ativar));
clonePricing.setPricingMercadoList(obtemPricingMercadoList(pricing, clonePricing, ativar));
clonePricing.setPricingOcupaAntecipaList(obtemPricingOcupaAntecipaList(pricing, clonePricing, ativar));
clonePricing.setPricingPuntoventaList(obtemPricingPuntoVentaList(pricing, clonePricing, ativar));
clonePricing.setPricingRutaList(obtemPricingRutaList(pricing, clonePricing, ativar));
clonePricing.setPricingTipoptovtaList(obtemPricingTipoPtoVtaList(pricing, clonePricing, ativar));
clonePricing.setPricingVigenciaList(obtemPricingVigenciaList(pricing, clonePricing, ativar));
clonePricing.setPricingTipoServicioList(obtemPricingTipoServicioList(pricing, clonePricing, ativar));
clonePricing.setPricingFormapagoList(obtemPricingFormapagoList(pricing, clonePricing, ativar));
}
List<PricingAsiento> pricingAsientoList = new ArrayList<PricingAsiento>();
for (PricingAsiento pricingAsiento : pricing.getPricingAsientoList()) {
private List<PricingFormapago> obtemPricingFormapagoList(Pricing pricing, Pricing clonePricing, Integer ativar) {
List<PricingFormapago> pricingFormapagoList = new ArrayList<PricingFormapago>();
for (PricingFormapago pricingFormapago : pricing.getPricingFormapagoList()) {
PricingAsiento clonePricingAsiento = new PricingAsiento();
PricingFormapago clonePricingFormapago = new PricingFormapago();
clonePricingFormapago.setIndexcepcion(pricingFormapago.getIndexcepcion());
clonePricingFormapago.setFormaPago(pricingFormapago.getFormaPago());
clonePricingAsiento.setNombImagen(pricingAsiento.getNombImagen());
clonePricingAsiento.setNumeasiento(pricingAsiento.getNumeasiento());
clonePricingAsiento.setPorcentaje(pricingAsiento.getPorcentaje());
clonePricingAsiento.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
clonePricingAsiento.setFecmodif(Calendar.getInstance().getTime());
clonePricingAsiento.setActivo(ativar);
clonePricingAsiento.setPricing(clonePricing);
pricingAsientoList.add(clonePricingAsiento);
clonePricingFormapago.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
clonePricingFormapago.setFecmodif(Calendar.getInstance().getTime());
clonePricingFormapago.setActivo(ativar);
clonePricingFormapago.setPricing(clonePricing);
pricingFormapagoList.add(clonePricingFormapago);
}
clonePricing.setPricingAsientoList(pricingAsientoList);
return pricingFormapagoList;
}
List<PricingCategoria> pricingCategoriaList = new ArrayList<PricingCategoria>();
for (PricingCategoria pricingCategoria : pricing.getPricingCategoriaList()) {
private List<PricingTipoServicio> obtemPricingTipoServicioList(Pricing pricing, Pricing clonePricing, Integer ativar) {
List<PricingTipoServicio> pricingTipoServicioList = new ArrayList<PricingTipoServicio>();
for (PricingTipoServicio pricingTipoServicio : pricing.getPricingTipoServicioList()) {
PricingCategoria clonePricingCategoria = new PricingCategoria();
PricingTipoServicio clonePricingTipoServicio = new PricingTipoServicio();
clonePricingTipoServicio.setTipoServicio(pricingTipoServicio.getTipoServicio());
clonePricingCategoria.setCategoria(pricingCategoria.getCategoria());
clonePricingCategoria.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
clonePricingCategoria.setFecmodif(Calendar.getInstance().getTime());
clonePricingCategoria.setActivo(ativar);
clonePricingCategoria.setPricing(clonePricing);
pricingCategoriaList.add(clonePricingCategoria);
clonePricingTipoServicio.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
clonePricingTipoServicio.setFecmodif(Calendar.getInstance().getTime());
clonePricingTipoServicio.setActivo(ativar);
clonePricingTipoServicio.setPricing(clonePricing);
pricingTipoServicioList.add(clonePricingTipoServicio);
}
clonePricing.setPricingCategoriaList(pricingCategoriaList);
List<PricingClase> pricingClaseList = new ArrayList<PricingClase>();
for (PricingClase pricingClase : pricing.getPricingClaseList()) {
return pricingTipoServicioList;
}
PricingClase clonePricingClase = new PricingClase();
private List<PricingVigencia> obtemPricingVigenciaList(Pricing pricing, Pricing clonePricing, Integer ativar) {
List<PricingVigencia> pricingVigenciaList = new ArrayList<PricingVigencia>();
for (PricingVigencia pricingVigencia : pricing.getPricingVigenciaList()) {
clonePricingClase.setClaseServicio(pricingClase.getClaseServicio());
PricingVigencia clonePricingVigencia = new PricingVigencia();
clonePricingClase.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
clonePricingClase.setFecmodif(Calendar.getInstance().getTime());
clonePricingClase.setActivo(ativar);
clonePricingClase.setPricing(clonePricing);
pricingClaseList.add(clonePricingClase);
clonePricingVigencia.setFecfinventa(pricingVigencia.getFecfinventa());
clonePricingVigencia.setFecinicioventa(pricingVigencia.getFecinicioventa());
clonePricingVigencia.setFecinicioviaje(pricingVigencia.getFecinicioviaje());
clonePricingVigencia.setFecfinviaje(pricingVigencia.getFecfinviaje());
clonePricingVigencia.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
clonePricingVigencia.setFecmodif(Calendar.getInstance().getTime());
clonePricingVigencia.setActivo(ativar);
clonePricingVigencia.setPricing(clonePricing);
pricingVigenciaList.add(clonePricingVigencia);
}
clonePricing.setPricingClaseList(pricingClaseList);
return pricingVigenciaList;
}
List<PricingCorrida> pricingCorridaList = new ArrayList<PricingCorrida>();
for (PricingCorrida pricingCorrida : pricing.getPricingCorridaList()) {
private List<PricingTipoPtoVta> obtemPricingTipoPtoVtaList(Pricing pricing, Pricing clonePricing, Integer ativar) {
List<PricingTipoPtoVta> pricingTipoPtoVtaList = new ArrayList<PricingTipoPtoVta>();
for (PricingTipoPtoVta pricingTipoPtoVta : pricing.getPricingTipoptovtaList()) {
PricingCorrida clonePricingCorrida = new PricingCorrida();
PricingTipoPtoVta clonePricingTipoPtoVta = new PricingTipoPtoVta();
clonePricingCorrida.setCorridaCtrl(pricingCorrida.getCorridaCtrl());
clonePricingTipoPtoVta.setTipoPtovta(pricingTipoPtoVta.getTipoPtovta());
clonePricingCorrida.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
clonePricingCorrida.setFecmodif(Calendar.getInstance().getTime());
clonePricingCorrida.setActivo(ativar);
clonePricingCorrida.setPricing(clonePricing);
pricingCorridaList.add(clonePricingCorrida);
clonePricingTipoPtoVta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
clonePricingTipoPtoVta.setFecmodif(Calendar.getInstance().getTime());
clonePricingTipoPtoVta.setActivo(ativar);
clonePricingTipoPtoVta.setPricing(clonePricing);
pricingTipoPtoVtaList.add(clonePricingTipoPtoVta);
}
clonePricing.setPricingCorridaList(pricingCorridaList);
return pricingTipoPtoVtaList;
}
private List<PricingRuta> obtemPricingRutaList(Pricing pricing, Pricing clonePricing, Integer ativar) {
List<PricingRuta> pricingRutaList = new ArrayList<PricingRuta>();
for (PricingRuta pricingRuta : pricing.getPricingRutaList()) {
PricingRuta clonePricingRuta = new PricingRuta();
clonePricingRuta.setRuta(pricingRuta.getRuta());
clonePricingRuta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
clonePricingRuta.setFecmodif(Calendar.getInstance().getTime());
clonePricingRuta.setActivo(ativar);
clonePricingRuta.setPricing(clonePricing);
pricingRutaList.add(clonePricingRuta);
}
return pricingRutaList;
}
private List<PricingPuntoVenta> obtemPricingPuntoVentaList(Pricing pricing, Pricing clonePricing, Integer ativar) {
List<PricingPuntoVenta> pricingPuntoVentaList = new ArrayList<PricingPuntoVenta>();
for (PricingPuntoVenta pricingPuntoVenta : pricing.getPricingPuntoventaList()) {
PricingPuntoVenta clonePricingPuntoVenta = new PricingPuntoVenta();
clonePricingPuntoVenta.setPuntoVenta(pricingPuntoVenta.getPuntoVenta());
clonePricingPuntoVenta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
clonePricingPuntoVenta.setFecmodif(Calendar.getInstance().getTime());
clonePricingPuntoVenta.setActivo(ativar);
clonePricingPuntoVenta.setPricing(clonePricing);
pricingPuntoVentaList.add(clonePricingPuntoVenta);
}
return pricingPuntoVentaList;
}
private List<PricingOcupaAntecipa> obtemPricingOcupaAntecipaList(Pricing pricing, Pricing clonePricing, Integer ativar) {
List<PricingOcupaAntecipa> pricingOcupaAntecipaList = new ArrayList<PricingOcupaAntecipa>();
for (PricingOcupaAntecipa pricingOcupaAntecipa : pricing.getPricingOcupaAntecipaList()) {
PricingOcupaAntecipa clonePricingOcupaAntecipa = new PricingOcupaAntecipa();
clonePricingOcupaAntecipa.setCantasientosmin(pricingOcupaAntecipa.getCantasientosmin());
clonePricingOcupaAntecipa.setCantasientosmax(pricingOcupaAntecipa.getCantasientosmax());
clonePricingOcupaAntecipa.setCantdiasmin(pricingOcupaAntecipa.getCantdiasmin());
clonePricingOcupaAntecipa.setCantdiasmax(pricingOcupaAntecipa.getCantdiasmax());
clonePricingOcupaAntecipa.setImporte(pricingOcupaAntecipa.getImporte());
clonePricingOcupaAntecipa.setPorcentaje(pricingOcupaAntecipa.getPorcentaje());
clonePricingOcupaAntecipa.setOcupacioninicial(pricingOcupaAntecipa.getOcupacioninicial());
clonePricingOcupaAntecipa.setOcupacionfinal(pricingOcupaAntecipa.getOcupacionfinal());
clonePricingOcupaAntecipa.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
clonePricingOcupaAntecipa.setFecmodif(Calendar.getInstance().getTime());
clonePricingOcupaAntecipa.setActivo(ativar);
clonePricingOcupaAntecipa.setPricing(clonePricing);
pricingOcupaAntecipaList.add(clonePricingOcupaAntecipa);
}
return pricingOcupaAntecipaList;
}
private List<PricingMercado> obtemPricingMercadoList(Pricing pricing, Pricing clonePricing, Integer ativar) {
List<PricingMercado> pricingMercadoList = new ArrayList<PricingMercado>();
for (PricingMercado pricingMercado : pricing.getPricingMercadoList()) {
PricingMercado clonePricingMercado = new PricingMercado();
clonePricingMercado.setDestino(pricingMercado.getDestino());
clonePricingMercado.setOrigen(pricingMercado.getOrigen());
clonePricingMercado.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
clonePricingMercado.setFecmodif(Calendar.getInstance().getTime());
clonePricingMercado.setActivo(ativar);
clonePricingMercado.setPricing(clonePricing);
pricingMercadoList.add(clonePricingMercado);
}
return pricingMercadoList;
}
private List<PricingMarca> obtemPricingMarcaList(Pricing pricing, Pricing clonePricing, Integer ativar) {
List<PricingMarca> pricingMarcaList = new ArrayList<PricingMarca>();
for (PricingMarca pricingMarca : pricing.getPricingMarcaList()) {
PricingMarca clonePricingMarca = new PricingMarca();
clonePricingMarca.setMarca(pricingMarca.getMarca());
clonePricingMarca.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
clonePricingMarca.setFecmodif(Calendar.getInstance().getTime());
clonePricingMarca.setActivo(ativar);
clonePricingMarca.setPricing(clonePricing);
pricingMarcaList.add(clonePricingMarca);
}
return pricingMarcaList;
}
private List<PricingImporte> obtemPricingImporteList(Pricing pricing, Pricing clonePricing, Integer ativar) {
List<PricingImporte> pricingImporteList = new ArrayList<PricingImporte>();
for (PricingImporte pricingImporte : pricing.getPricingImporteList()) {
PricingImporte clonePricingImporte = new PricingImporte();
clonePricingImporte.setImporte(pricingImporte.getImporte());
clonePricingImporte.setMoneda(pricingImporte.getMoneda());
clonePricingImporte.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
clonePricingImporte.setFecmodif(Calendar.getInstance().getTime());
clonePricingImporte.setActivo(ativar);
clonePricingImporte.setPricing(clonePricing);
pricingImporteList.add(clonePricingImporte);
}
return pricingImporteList;
}
private List<PricingDia> obtemPricingDiaList(Pricing pricing, Pricing clonePricing, Integer ativar) {
List<PricingDia> pricingDiaList = new ArrayList<PricingDia>();
for (PricingDia pricingDia : pricing.getPricingDiaList()) {
@ -334,169 +456,103 @@ public class PricingServiceImpl implements PricingService {
clonePricingDia.setPricing(clonePricing);
pricingDiaList.add(clonePricingDia);
}
clonePricing.setPricingDiaList(pricingDiaList);
return pricingDiaList;
}
List<PricingImporte> pricingImporteList = new ArrayList<PricingImporte>();
for (PricingImporte pricingImporte : pricing.getPricingImporteList()) {
private List<PricingCorrida> obtemPricingCorridaList(Pricing pricing, Pricing clonePricing, Integer ativar) {
List<PricingCorrida> pricingCorridaList = new ArrayList<PricingCorrida>();
for (PricingCorrida pricingCorrida : pricing.getPricingCorridaList()) {
PricingImporte clonePricingImporte = new PricingImporte();
PricingCorrida clonePricingCorrida = new PricingCorrida();
clonePricingImporte.setImporte(pricingImporte.getImporte());
clonePricingImporte.setMoneda(pricingImporte.getMoneda());
clonePricingCorrida.setCorridaCtrl(pricingCorrida.getCorridaCtrl());
clonePricingImporte.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
clonePricingImporte.setFecmodif(Calendar.getInstance().getTime());
clonePricingImporte.setActivo(ativar);
clonePricingImporte.setPricing(clonePricing);
pricingImporteList.add(clonePricingImporte);
clonePricingCorrida.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
clonePricingCorrida.setFecmodif(Calendar.getInstance().getTime());
clonePricingCorrida.setActivo(ativar);
clonePricingCorrida.setPricing(clonePricing);
pricingCorridaList.add(clonePricingCorrida);
}
clonePricing.setPricingImporteList(pricingImporteList);
return pricingCorridaList;
}
List<PricingMarca> pricingMarcaList = new ArrayList<PricingMarca>();
for (PricingMarca pricingMarca : pricing.getPricingMarcaList()) {
private List<PricingAsiento> obtemPricingAsientoList(Pricing pricing, Pricing clonePricing, Integer ativar) {
List<PricingAsiento> pricingAsientoList = new ArrayList<PricingAsiento>();
for (PricingAsiento pricingAsiento : pricing.getPricingAsientoList()) {
PricingMarca clonePricingMarca = new PricingMarca();
PricingAsiento clonePricingAsiento = new PricingAsiento();
clonePricingMarca.setMarca(pricingMarca.getMarca());
clonePricingAsiento.setNombImagen(pricingAsiento.getNombImagen());
clonePricingAsiento.setNumeasiento(pricingAsiento.getNumeasiento());
clonePricingAsiento.setPorcentaje(pricingAsiento.getPorcentaje());
clonePricingMarca.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
clonePricingMarca.setFecmodif(Calendar.getInstance().getTime());
clonePricingMarca.setActivo(ativar);
clonePricingMarca.setPricing(clonePricing);
pricingMarcaList.add(clonePricingMarca);
clonePricingAsiento.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
clonePricingAsiento.setFecmodif(Calendar.getInstance().getTime());
clonePricingAsiento.setActivo(ativar);
clonePricingAsiento.setPricing(clonePricing);
pricingAsientoList.add(clonePricingAsiento);
}
clonePricing.setPricingMarcaList(pricingMarcaList);
return pricingAsientoList;
}
List<PricingMercado> pricingMercadoList = new ArrayList<PricingMercado>();
for (PricingMercado pricingMercado : pricing.getPricingMercadoList()) {
private List<PricingClase> obtemPricingClaseList(Pricing pricing, Pricing clonePricing, Integer ativar) {
List<PricingClase> pricingClaseList = new ArrayList<PricingClase>();
for (PricingClase pricingClase : pricing.getPricingClaseList()) {
PricingMercado clonePricingMercado = new PricingMercado();
PricingClase clonePricingClase = new PricingClase();
clonePricingMercado.setDestino(pricingMercado.getDestino());
clonePricingMercado.setOrigen(pricingMercado.getOrigen());
clonePricingClase.setClaseServicio(pricingClase.getClaseServicio());
clonePricingMercado.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
clonePricingMercado.setFecmodif(Calendar.getInstance().getTime());
clonePricingMercado.setActivo(ativar);
clonePricingMercado.setPricing(clonePricing);
pricingMercadoList.add(clonePricingMercado);
clonePricingClase.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
clonePricingClase.setFecmodif(Calendar.getInstance().getTime());
clonePricingClase.setActivo(ativar);
clonePricingClase.setPricing(clonePricing);
pricingClaseList.add(clonePricingClase);
}
clonePricing.setPricingMercadoList(pricingMercadoList);
return pricingClaseList;
}
List<PricingOcupaAntecipa> pricingOcupaAntecipaList = new ArrayList<PricingOcupaAntecipa>();
for (PricingOcupaAntecipa pricingOcupaAntecipa : pricing.getPricingOcupaAntecipaList()) {
PricingOcupaAntecipa clonePricingOcupaAntecipa = new PricingOcupaAntecipa();
clonePricingOcupaAntecipa.setCantasientosmin(pricingOcupaAntecipa.getCantasientosmin());
clonePricingOcupaAntecipa.setCantasientosmax(pricingOcupaAntecipa.getCantasientosmax());
clonePricingOcupaAntecipa.setCantdiasmin(pricingOcupaAntecipa.getCantdiasmin());
clonePricingOcupaAntecipa.setCantdiasmax(pricingOcupaAntecipa.getCantdiasmax());
clonePricingOcupaAntecipa.setImporte(pricingOcupaAntecipa.getImporte());
clonePricingOcupaAntecipa.setPorcentaje(pricingOcupaAntecipa.getPorcentaje());
clonePricingOcupaAntecipa.setOcupacioninicial(pricingOcupaAntecipa.getOcupacioninicial());
clonePricingOcupaAntecipa.setOcupacionfinal(pricingOcupaAntecipa.getOcupacionfinal());
clonePricingOcupaAntecipa.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
clonePricingOcupaAntecipa.setFecmodif(Calendar.getInstance().getTime());
clonePricingOcupaAntecipa.setActivo(ativar);
clonePricingOcupaAntecipa.setPricing(clonePricing);
pricingOcupaAntecipaList.add(clonePricingOcupaAntecipa);
private List<PricingCategoria> obtemPricingCategoriaList(Pricing pricing, Pricing clonePricing, Integer ativar, boolean incluirPadraoPricingTipoPassagemPET) {
List<PricingCategoria> pricingCategoriaList = new ArrayList<PricingCategoria>();
for (PricingCategoria pricingCategoria : pricing.getPricingCategoriaList()) {
setCategoria(clonePricing, ativar, pricingCategoriaList, pricingCategoria.getCategoria());
}
clonePricing.setPricingOcupaAntecipaList(pricingOcupaAntecipaList);
List<PricingPuntoVenta> pricingPuntoVentaList = new ArrayList<PricingPuntoVenta>();
for (PricingPuntoVenta pricingPuntoVenta : pricing.getPricingPuntoventaList()) {
PricingPuntoVenta clonePricingPuntoVenta = new PricingPuntoVenta();
clonePricingPuntoVenta.setPuntoVenta(pricingPuntoVenta.getPuntoVenta());
clonePricingPuntoVenta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
clonePricingPuntoVenta.setFecmodif(Calendar.getInstance().getTime());
clonePricingPuntoVenta.setActivo(ativar);
clonePricingPuntoVenta.setPricing(clonePricing);
pricingPuntoVentaList.add(clonePricingPuntoVenta);
if (incluirPadraoPricingTipoPassagemPET) {
configuraInclusaoPadraoTipoPassagemPET(pricing, clonePricing, ativar, pricingCategoriaList);
}
clonePricing.setPricingPuntoventaList(pricingPuntoVentaList);
List<PricingRuta> pricingRutaList = new ArrayList<PricingRuta>();
for (PricingRuta pricingRuta : pricing.getPricingRutaList()) {
return pricingCategoriaList;
}
PricingRuta clonePricingRuta = new PricingRuta();
protected void setCategoria(Pricing clonePricing, Integer ativar, List<PricingCategoria> pricingCategoriaList, Categoria categoria) {
PricingCategoria clonePricingCategoria = new PricingCategoria();
clonePricingCategoria.setCategoria(categoria);
clonePricingCategoria.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
clonePricingCategoria.setFecmodif(Calendar.getInstance().getTime());
clonePricingCategoria.setActivo(ativar);
clonePricingCategoria.setPricing(clonePricing);
pricingCategoriaList.add(clonePricingCategoria);
}
clonePricingRuta.setRuta(pricingRuta.getRuta());
clonePricingRuta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
clonePricingRuta.setFecmodif(Calendar.getInstance().getTime());
clonePricingRuta.setActivo(ativar);
clonePricingRuta.setPricing(clonePricing);
pricingRutaList.add(clonePricingRuta);
private void configuraInclusaoPadraoTipoPassagemPET(Pricing pricing, Pricing clonePricing, Integer ativar, List<PricingCategoria> pricingCategoriaList) {
Categoria categoriaNormal = categoriaService.buscarUmaCategoria("NORMAL");
if (!possuiCategoriaNaLista(pricing.getPricingCategoriaList(), categoriaNormal)) {
setCategoria(clonePricing, ativar, pricingCategoriaList, categoriaNormal);
}
clonePricing.setPricingRutaList(pricingRutaList);
List<PricingTipoPtoVta> pricingTipoPtoVtaList = new ArrayList<PricingTipoPtoVta>();
for (PricingTipoPtoVta pricingTipoPtoVta : pricing.getPricingTipoptovtaList()) {
PricingTipoPtoVta clonePricingTipoPtoVta = new PricingTipoPtoVta();
clonePricingTipoPtoVta.setTipoPtovta(pricingTipoPtoVta.getTipoPtovta());
clonePricingTipoPtoVta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
clonePricingTipoPtoVta.setFecmodif(Calendar.getInstance().getTime());
clonePricingTipoPtoVta.setActivo(ativar);
clonePricingTipoPtoVta.setPricing(clonePricing);
pricingTipoPtoVtaList.add(clonePricingTipoPtoVta);
Categoria categoriaPET = categoriaService.buscarUmaCategoria("PET");
if (!possuiCategoriaNaLista(pricing.getPricingCategoriaList(), categoriaPET)) {
setCategoria(clonePricing, ativar, pricingCategoriaList, categoriaPET);
}
clonePricing.setPricingTipoptovtaList(pricingTipoPtoVtaList);
List<PricingVigencia> pricingVigenciaList = new ArrayList<PricingVigencia>();
for (PricingVigencia pricingVigencia : pricing.getPricingVigenciaList()) {
}
PricingVigencia clonePricingVigencia = new PricingVigencia();
clonePricingVigencia.setFecfinventa(pricingVigencia.getFecfinventa());
clonePricingVigencia.setFecinicioventa(pricingVigencia.getFecinicioventa());
clonePricingVigencia.setFecinicioviaje(pricingVigencia.getFecinicioviaje());
clonePricingVigencia.setFecfinviaje(pricingVigencia.getFecfinviaje());
clonePricingVigencia.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
clonePricingVigencia.setFecmodif(Calendar.getInstance().getTime());
clonePricingVigencia.setActivo(ativar);
clonePricingVigencia.setPricing(clonePricing);
pricingVigenciaList.add(clonePricingVigencia);
private boolean possuiCategoriaNaLista(List<PricingCategoria> categoriaList, Categoria categoria) {
for (PricingCategoria pricingCategoria : categoriaList) {
if (pricingCategoria.getCategoria().equals(categoria)) {
return true;
}
}
clonePricing.setPricingVigenciaList(pricingVigenciaList);
List<PricingTipoServicio> pricingTipoServicioList = new ArrayList<PricingTipoServicio>();
for (PricingTipoServicio pricingTipoServicio : pricing.getPricingTipoServicioList()) {
PricingTipoServicio clonePricingTipoServicio = new PricingTipoServicio();
clonePricingTipoServicio.setTipoServicio(pricingTipoServicio.getTipoServicio());
clonePricingTipoServicio.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
clonePricingTipoServicio.setFecmodif(Calendar.getInstance().getTime());
clonePricingTipoServicio.setActivo(ativar);
clonePricingTipoServicio.setPricing(clonePricing);
pricingTipoServicioList.add(clonePricingTipoServicio);
}
clonePricing.setPricingTipoServicioList(pricingTipoServicioList);
List<PricingFormapago> pricingFormapagoList = new ArrayList<PricingFormapago>();
for (PricingFormapago pricingFormapago : pricing.getPricingFormapagoList()) {
PricingFormapago clonePricingFormapago = new PricingFormapago();
clonePricingFormapago.setIndexcepcion(pricingFormapago.getIndexcepcion());
clonePricingFormapago.setFormaPago(pricingFormapago.getFormaPago());
clonePricingFormapago.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
clonePricingFormapago.setFecmodif(Calendar.getInstance().getTime());
clonePricingFormapago.setActivo(ativar);
clonePricingFormapago.setPricing(clonePricing);
pricingFormapagoList.add(clonePricingFormapago);
}
clonePricing.setPricingFormapagoList(pricingFormapagoList);
return clonePricing;
return false;
}
}

2
src/com/rjconsultores/ventaboletos/utilerias/ApplicationProperties.java
View File

@ -190,7 +190,7 @@ public class ApplicationProperties {
return property.equals("1");
}
public boolean usaPadroPricingEspecificoTipoPassagemPET(){
public boolean usaPadraoPricingTipoPassagemPET(){
String property = p.getProperty("usaPadroPricingEspecificoTipoPassagemPET", "0");
return property.equals("1");
}