261022_01_ENH: 예약 발송 취소 구현, record로 전환 가능한 Class Dto record로 전환, KKO 템플릿 등록시 사용 준비도 등록가능 템플릿으로 지정

This commit is contained in:
2026-10-22 12:33:32 +09:00
parent 7a1501d551
commit f2a9d6bfc6
58 changed files with 1090 additions and 1057 deletions

View File

@@ -120,7 +120,7 @@ public abstract class AbstractPringoSendService extends AbstractSendService {
SendStatusType sendStatus;
short resultCode;
if (pringoRes != null && pringoRes.isSuccess() && pringoRes.getReturnKey() != null) {
if (pringoRes != null && pringoRes.isSuccess() && pringoRes.returnKey() != null) {
//발송 요청에 성공한 것이지 발송이 성공이 아니므로 STANDBY 유지
sendStatus = SendStatusType.STANDBY;
resultCode = NotihubConst.EMAIL_PENDING;
@@ -155,15 +155,15 @@ public abstract class AbstractPringoSendService extends AbstractSendService {
DestInfoDto dest
) {
Map<String, Object> vars = new HashMap<>();
if (dest.getMsgParam() != null) {
vars.putAll(dest.getMsgParam());
if (dest.msgParam() != null) {
vars.putAll(dest.msgParam());
}
return PringoSendRequestDto.builder()
.sender(sendEml)
.senderName(Optional.ofNullable(sendNm).orElse(""))
.recipient(dest.getDestEml())
.recipientName(Optional.ofNullable(dest.getDestNm()).orElse(dest.getDestEml()))
.recipient(dest.destEml())
.recipientName(Optional.ofNullable(dest.destNm()).orElse(dest.destEml()))
.subject(Optional.ofNullable(msgTitle).orElse(""))
.body(Optional.ofNullable(msgBody).orElse(""))
.attachments(tmplatIdx == null
@@ -174,8 +174,8 @@ public abstract class AbstractPringoSendService extends AbstractSendService {
}
private String resolveEmailCmid(PringoSendResponseDto pringoRes) {
if (pringoRes != null && pringoRes.isSuccess() && pringoRes.getReturnKey() != null) {
return String.valueOf(pringoRes.getReturnKey());
if (pringoRes != null && pringoRes.isSuccess() && pringoRes.returnKey() != null) {
return String.valueOf(pringoRes.returnKey());
}
// return_key 미수신 케이스는 SendFau
return CommonUtil.uuid32();