Skip to content

Commit c474973

Browse files
change controller venda
1 parent 61e9995 commit c474973

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

src/main/java/com/virtusconsultoria/configsecurity/SecurityConfig.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,11 @@ public PasswordEncoder passwordEncoder() {
110110
public CorsConfigurationSource corsConfigurationSource() {
111111
CorsConfiguration configuration = new CorsConfiguration();
112112
configuration.setAllowedOrigins(Arrays.asList(
113+
"http://localhost:8081",
114+
"http://localhost:8080",
115+
"http://localhost:8080/",
116+
"http://localhost:8081/",
117+
"http://192.168.0.38:8080/",
113118
"https://front-end-virtus.vercel.app/"
114119
));
115120
configuration.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "DELETE", "OPTIONS"));

src/main/java/com/virtusconsultoria/service/VendaService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -482,13 +482,13 @@ public VendasMesDto obterDashboardVendas(LocalDate dataInicial, LocalDate dataFi
482482

483483
BigDecimal valorComissaoColaboradorClt = vendasPeriodoAtual.stream()
484484
.filter(v -> v.getColaborador() != null && ColaboradorRegimeContratacao.CLT.equals(v.getColaborador().getRegimeContratacao()))
485-
.map(Venda::getComissaoEmpresa)
485+
.map(Venda::getComissaoColaborador)
486486
.filter(Objects::nonNull)
487487
.reduce(BigDecimal.ZERO, BigDecimal::add);
488488

489489
BigDecimal valorComissaoColaboradorMei = vendasPeriodoAtual.stream()
490490
.filter(v -> v.getColaborador() != null && ColaboradorRegimeContratacao.MEI.equals(v.getColaborador().getRegimeContratacao()))
491-
.map(Venda::getComissaoEmpresa)
491+
.map(Venda::getComissaoColaborador)
492492
.filter(Objects::nonNull)
493493
.reduce(BigDecimal.ZERO, BigDecimal::add);
494494

0 commit comments

Comments
 (0)