feat: 카카오 send시 ci 사용 추가 반영

dev
gitea-관리자 1 year ago
parent 89d4db5ddd
commit 7a4aa206dc

@ -148,6 +148,12 @@ public class EnsDTO {
* *
*/ */
//private String sndngProcessSttus; //private String sndngProcessSttus;
/**
* ci
*/
private String ci;
/** /**
* *
*/ */

@ -273,6 +273,8 @@ public class EnsBatchService extends EgovAbstractServiceImpl implements IEnsBatc
* 1. : {@link IEnsBatchMapper#selectSendBulkTgts selectSendBulkTgts} * 1. : {@link IEnsBatchMapper#selectSendBulkTgts selectSendBulkTgts}
* - | E-GREEN | SMS 1. / 2. send() * - | E-GREEN | SMS 1. / 2. send()
* *
* 2. send
*
* @param reqDTO BatchEnsRequest * @param reqDTO BatchEnsRequest
* </pre> * </pre>
*/ */
@ -743,7 +745,7 @@ public class EnsBatchService extends EgovAbstractServiceImpl implements IEnsBatc
/** /**
* GET * GET
* * - CI
* @param list List<EnsDTO.SendKakaoTgt> * @param list List<EnsDTO.SendKakaoTgt>
* @param bulkList List<KkopayDocBulkDTO.BulkSendReq> * @param bulkList List<KkopayDocBulkDTO.BulkSendReq>
* @param mstIdList List<String> ID * @param mstIdList List<String> ID
@ -757,14 +759,29 @@ public class EnsBatchService extends EgovAbstractServiceImpl implements IEnsBatc
mstId = sendTgtDTO.getSndngMastrId(); mstId = sendTgtDTO.getSndngMastrId();
mstIdList.add(mstId); mstIdList.add(mstId);
} }
Receiver receiver = Receiver.builder()
/**
* : CI
*/
Receiver receiver = null;
if(StringUtils.isNotEmpty(sendTgtDTO.getCi())){
receiver = Receiver.builder()
.ci(sendTgtDTO.getCi())
.phone_number(StringUtils.EMPTY)
.name(StringUtils.EMPTY)
.birthday(StringUtils.EMPTY)
.is_required_verify_name(false)
.build();
}else{
receiver = Receiver.builder()
.phone_number(sendTgtDTO.getRecvPhoneNumber()) .phone_number(sendTgtDTO.getRecvPhoneNumber())
.name(sendTgtDTO.getRecvName()) .name(sendTgtDTO.getRecvName())
.birthday(sendTgtDTO.getRecvBirthday()) .birthday(sendTgtDTO.getRecvBirthday())
.is_required_verify_name(false) .is_required_verify_name(false)
.build(); .build();
}
PropertyBulk property = PropertyBulk.builder() final PropertyBulk property = PropertyBulk.builder()
.link(sendTgtDTO.getPropLink()) .link(sendTgtDTO.getPropLink())
.payload(sendTgtDTO.getPropPayload()) .payload(sendTgtDTO.getPropPayload())
.message(sendTgtDTO.getPropMessage()) .message(sendTgtDTO.getPropMessage())
@ -834,17 +851,6 @@ public class EnsBatchService extends EgovAbstractServiceImpl implements IEnsBatc
errors.add( errors.add(
String.format("받는이 생년월일은 필수입니다(receiver.birthday[%d] 번째 오류)", idx + 1)); String.format("받는이 생년월일은 필수입니다(receiver.birthday[%d] 번째 오류)", idx + 1));
} }
} else {
StringBuilder sb = new StringBuilder()
.append(StringUtils.defaultString(receiver.getName(), StringUtils.EMPTY))
.append(StringUtils.defaultString(receiver.getPhone_number(),
StringUtils.EMPTY))
.append(
StringUtils.defaultString(receiver.getBirthday(), StringUtils.EMPTY));
if (Checks.isNotEmpty(sb.toString())) {
errors.add(String.format("CI가 지정 되었습니다(받는이 정보 불필요:[%d] 번째 오류) .", idx + 1));
}
} }
idx++; idx++;
} }

@ -451,9 +451,12 @@
, tekmd.prop_message , tekmd.prop_message
, tekmd.prop_cs_name /* 콜센터 명 */ , tekmd.prop_cs_name /* 콜센터 명 */
, tekmd.prop_cs_number /* 콜센터 전화번호 */ , tekmd.prop_cs_number /* 콜센터 전화번호 */
, tec.ci /* ci */
FROM tb_ens_sndng_mastr tesm FROM tb_ens_sndng_mastr tesm
JOIN tb_ens_kakao_my_doc tekmd JOIN tb_ens_kakao_my_doc tekmd
ON tesm.sndng_mastr_id = tekmd.sndng_mastr_id ON tesm.sndng_mastr_id = tekmd.sndng_mastr_id
JOIN tb_ens_ci tec
ON tekmd.unity_sndng_detail_id = tec.unity_sndng_detail_id
WHERE tesm.sndng_mastr_id = #{sndngMastrId} WHERE tesm.sndng_mastr_id = #{sndngMastrId}
-- AND tesm.sndng_process_sttus = #{sndngProcessSttus} -- AND tesm.sndng_process_sttus = #{sndngProcessSttus}
ORDER BY tesm.unity_sndng_mastr_id ORDER BY tesm.unity_sndng_mastr_id

Loading…
Cancel
Save