Merge pull request 'fixes bug #AL-2143' (#37) from AL-2143 into master

Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/37
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
master
pinheiro 2023-03-16 12:43:22 +00:00
commit 7aaae1d429
2 changed files with 212 additions and 209 deletions

View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ModelWeb</artifactId>
<version>1.0.39</version>
<version>1.0.40</version>
<distributionManagement>
<repository>
<id>rj-releases</id>

View File

@ -41,7 +41,7 @@ import com.rjconsultores.ventaboletos.utilerias.SendMail.AuthType;
@Service("contingenciaService")
public class ContingenciaServiceImpl implements ContingenciaService {
private static final String EMAIL_COPIA_OCULTA = "suportesco@rjconsultores.com.br";
private static final String EMAIL_SUPORTE_SCO_RJCONSULTORES = "EMAIL_SUPORTE_SCO_RJCONSULTORES";
private static Logger log = Logger.getLogger(ContingenciaServiceImpl.class);
@ -168,7 +168,8 @@ public class ContingenciaServiceImpl implements ContingenciaService {
EmpresaEmail empresaEmail = empresaEmailService.buscarPorEmpresa(historicoCont.getEmpresa());
EmpresaEmailConfig empresaEmailConfig = empresaEmailConfigService.buscarPorEmpresa(historicoCont.getEmpresa());
Constante emailSuporRJConstante = constanteService.buscarPorNomeConstante(EMAIL_SUPORTE_SCO_RJCONSULTORES);
String emailSuporRJ = emailSuporRJConstante !=null ? emailSuporRJConstante.getValorconstante() : null;
if (empresaEmail != null && empresaEmailConfig != null &&
empresaEmailConfig.getIndAutenticacao() != null && empresaEmail.getEmailDe() != null &&
empresaEmailConfig.getTipoAutorizacao() != null && empresaEmailConfig.getSmtp() != null &&
@ -188,7 +189,9 @@ public class ContingenciaServiceImpl implements ContingenciaService {
mail.setSubject("Conting<6E>ncia Off-line BP-e");
mail.setText(getMensagem(historicoCont));
mail.setEmailTo(empresaEmail.getDestinatario());
mail.setEmailToCO(EMAIL_COPIA_OCULTA);
if(StringUtils.isNotBlank(emailSuporRJ)) {
mail.setEmailToCO(emailSuporRJ);
}
mail.send();
}
}