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

fixed bug#12818 

qua:Renato
dev:Valdir

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@88551 d1611594-4594-4d17-8e1d-87c2c4800839
master
frederico 2019-01-04 18:34:48 +00:00
parent 2c898de153
commit ded32d630b
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/rjconsultores/ventaboletos/entidad/PricingEspecifico.java
View File

@ -175,14 +175,6 @@ public class PricingEspecifico implements Serializable, Cloneable {
this.usuarioId = usuarioId; this.usuarioId = usuarioId;
} }
// public TipoPuntoVenta getTipoPtovta() {
// return tipoPtovta;
// }
//
// public void setTipoPtovta(TipoPuntoVenta tipoPtovta) {
// this.tipoPtovta = tipoPtovta;
// }
public Parada getParada() { public Parada getParada() {
return parada; return parada;
} }

4
src/com/rjconsultores/ventaboletos/service/PricingEspecificoService.java
View File

@ -8,6 +8,8 @@ import com.rjconsultores.ventaboletos.entidad.ClaseServicio;
import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.Empresa;
import com.rjconsultores.ventaboletos.entidad.Parada; import com.rjconsultores.ventaboletos.entidad.Parada;
import com.rjconsultores.ventaboletos.entidad.PricingEspecifico; import com.rjconsultores.ventaboletos.entidad.PricingEspecifico;
import com.rjconsultores.ventaboletos.entidad.PricingEspecificoCategoria;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -21,7 +23,7 @@ public interface PricingEspecificoService extends GenericService<PricingEspecifi
public List<PricingEspecifico> buscarPorNome(String nome); public List<PricingEspecifico> buscarPorNome(String nome);
public PricingEspecifico clonarPricing(Long id, String nome); public PricingEspecifico clonarPricing(Long id, String nome, List<PricingEspecificoCategoria> pricingCategoriaList);
public List<PricingEspecifico> buscar(List<Empresa> empresas, List<ClaseServicio> tipoClasses, List<Parada> origens, List<Parada> destinos, Date vigenciaInicial, Date vigenciaFinal); public List<PricingEspecifico> buscar(List<Empresa> empresas, List<ClaseServicio> tipoClasses, List<Parada> origens, List<Parada> destinos, Date vigenciaInicial, Date vigenciaFinal);
} }

10
src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoServiceImpl.java
View File

@ -82,11 +82,11 @@ public class PricingEspecificoServiceImpl implements PricingEspecificoService {
@Override @Override
@Transactional @Transactional
public PricingEspecifico clonarPricing(Long id, String nome) { public PricingEspecifico clonarPricing(Long id, String nome, List<PricingEspecificoCategoria> pricingCategoriaList) {
PricingEspecifico pricingToClone = obtenerID(id); PricingEspecifico pricingToClone = obtenerID(id);
PricingEspecifico clonePricing = new PricingEspecifico(); PricingEspecifico clonePricing = new PricingEspecifico();
clonePricing.setNombPricing(nome); clonePricing.setNombPricing(nome);
clonePricing.setClaseServicio(pricingToClone.getClaseServicio()); clonePricing.setClaseServicio(pricingToClone.getClaseServicio());
clonePricing.setCorridaId(pricingToClone.getCorridaId()); clonePricing.setCorridaId(pricingToClone.getCorridaId());
@ -102,7 +102,7 @@ public class PricingEspecificoServiceImpl implements PricingEspecificoService {
clonePricing.setPricingEspecificoAgenciasList(getPricingEspecificoAgenciasList(pricingToClone, clonePricing)); clonePricing.setPricingEspecificoAgenciasList(getPricingEspecificoAgenciasList(pricingToClone, clonePricing));
clonePricing.setPricingEspecificoCanalVendasList(getPricingEspecificoCanalVendasList(pricingToClone, clonePricing)); clonePricing.setPricingEspecificoCanalVendasList(getPricingEspecificoCanalVendasList(pricingToClone, clonePricing));
clonePricing.setPricingEspecificoCategoriaList(getPricingEspecificoCategoriaList(pricingToClone, clonePricing)); clonePricing.setPricingEspecificoCategoriaList(getPricingEspecificoCategoriaList(pricingToClone, clonePricing, pricingCategoriaList));
return suscribir(clonePricing); return suscribir(clonePricing);
} }
@ -149,11 +149,11 @@ public class PricingEspecificoServiceImpl implements PricingEspecificoService {
return toReturn; return toReturn;
} }
private List<PricingEspecificoCategoria> getPricingEspecificoCategoriaList(PricingEspecifico pricingToClone, PricingEspecifico clonePricing) { private List<PricingEspecificoCategoria> getPricingEspecificoCategoriaList(PricingEspecifico pricingToClone, PricingEspecifico clonePricing, List<PricingEspecificoCategoria> pricingCategoriaList) {
List<PricingEspecificoCategoria> toReturn = new ArrayList<PricingEspecificoCategoria>(); List<PricingEspecificoCategoria> toReturn = new ArrayList<PricingEspecificoCategoria>();
for (PricingEspecificoCategoria c : pricingToClone.getPricingEspecificoCategoriaList()) { for (PricingEspecificoCategoria c : pricingCategoriaList) {
if (c.getActivo()) { if (c.getActivo()) {
PricingEspecificoCategoria newCategoria = new PricingEspecificoCategoria(); PricingEspecificoCategoria newCategoria = new PricingEspecificoCategoria();