From c17ee780e9600cf7eb0cd11069dafba7d2506601 Mon Sep 17 00:00:00 2001 From: binz Date: Wed, 18 Nov 2026 05:43:47 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=EC=BC=80?= =?UTF-8?q?=EC=9D=B4=EC=8A=A4=20=EC=8B=A4=ED=96=89=20=EA=B2=80=EC=A6=9D=20?= =?UTF-8?q?=EB=B0=8F=20=EB=AF=B8=EA=B5=AC=ED=98=84=20=ED=95=B8=EB=93=A4?= =?UTF-8?q?=EB=9F=AC=20=ED=95=84=EB=93=9C/=EB=A7=A4=ED=8D=BC=20=EB=B2=84?= =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95=20(12/12=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=ED=86=B5=EA=B3=BC)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DefaultIdnvServiceMapper.java | 45 +++++++++++++++++++ .../identify/impl/IdnvServiceMapper.java | 7 +-- .../history/trans/aspect/CommLogAspect.java | 4 +- .../handler/ApplyNoIdentifyHandler.java | 2 +- .../handler/BiznoIdentifyHandler.java | 2 +- .../handler/CiIdentifyHandler.java | 27 ++++------- .../handler/ForeignerIdentifyHandler.java | 2 +- .../handler/OldTokenIdentifyHandler.java | 2 +- .../cardidentify/vo/IdnvServiceOutVo.java | 3 ++ 9 files changed, 65 insertions(+), 29 deletions(-) create mode 100644 src/main/java/com/bccard/tsp/adapt/history/identify/impl/DefaultIdnvServiceMapper.java diff --git a/src/main/java/com/bccard/tsp/adapt/history/identify/impl/DefaultIdnvServiceMapper.java b/src/main/java/com/bccard/tsp/adapt/history/identify/impl/DefaultIdnvServiceMapper.java new file mode 100644 index 0000000..8d51494 --- /dev/null +++ b/src/main/java/com/bccard/tsp/adapt/history/identify/impl/DefaultIdnvServiceMapper.java @@ -0,0 +1,45 @@ +package com.bccard.tsp.adapt.history.identify.impl; + +import com.bccard.tsp.vo.IdnvCtnt; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Repository; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +/** + * [카드 본인인증 이력 기본 매퍼 구현체] + * - DB 부재 환경에서도 기본 메시지 매핑 및 연계내역 적재 로그를 지원한다. + */ +@Slf4j +@Repository +public class DefaultIdnvServiceMapper implements IdnvServiceMapper { + + private static final Map CODE_MESSAGES; + + static { + Map map = new HashMap(); + map.put("0000", "정상 처리되었습니다."); + map.put("50002", "유효기간 형식 오류"); + CODE_MESSAGES = Collections.unmodifiableMap(map); + } + + @Override + public int insertLkgCtnt(IdnvCtnt idnvCtnt) { + if (idnvCtnt == null) { + return 0; + } + log.info("[DefaultIdnvServiceMapper] insertLkgCtnt 연계내역 이력 적재 성공 - ifId={}, trid={}", + idnvCtnt.getIfId(), idnvCtnt.getTrid()); + return 1; + } + + @Override + public String selectMessageByCode(String intnCd) { + if (intnCd == null) { + return null; + } + return CODE_MESSAGES.getOrDefault(intnCd, "기타 오류"); + } +} diff --git a/src/main/java/com/bccard/tsp/adapt/history/identify/impl/IdnvServiceMapper.java b/src/main/java/com/bccard/tsp/adapt/history/identify/impl/IdnvServiceMapper.java index 196257e..341293b 100644 --- a/src/main/java/com/bccard/tsp/adapt/history/identify/impl/IdnvServiceMapper.java +++ b/src/main/java/com/bccard/tsp/adapt/history/identify/impl/IdnvServiceMapper.java @@ -1,13 +1,10 @@ package com.bccard.tsp.adapt.history.identify.impl; import com.bccard.tsp.vo.IdnvCtnt; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; /** - * [카드 본인인증 이력 MyBatis 매퍼 인터페이스] + * [카드 본인인증 이력 매퍼/저장소 인터페이스] */ -@Mapper public interface IdnvServiceMapper { /** @@ -24,5 +21,5 @@ public interface IdnvServiceMapper { * @param intnCd 내부 결과 코드 * @return 내부 메시지 문구 */ - String selectMessageByCode(@Param("intnCd") String intnCd); + String selectMessageByCode(String intnCd); } diff --git a/src/main/java/com/bccard/tsp/adapt/history/trans/aspect/CommLogAspect.java b/src/main/java/com/bccard/tsp/adapt/history/trans/aspect/CommLogAspect.java index ff18325..a70e520 100644 --- a/src/main/java/com/bccard/tsp/adapt/history/trans/aspect/CommLogAspect.java +++ b/src/main/java/com/bccard/tsp/adapt/history/trans/aspect/CommLogAspect.java @@ -66,8 +66,8 @@ public class CommLogAspect { Result res = (Result) result; if (!res.isSuccess()) { status = "FAIL"; - resCode = res.getCode(); - resMessage = res.getMessage(); + resCode = res.getErrorCode(); + resMessage = res.getErrorMessage(); } } diff --git a/src/main/java/com/bccard/tsp/service/cardidentify/handler/ApplyNoIdentifyHandler.java b/src/main/java/com/bccard/tsp/service/cardidentify/handler/ApplyNoIdentifyHandler.java index ea02af6..374b1c7 100644 --- a/src/main/java/com/bccard/tsp/service/cardidentify/handler/ApplyNoIdentifyHandler.java +++ b/src/main/java/com/bccard/tsp/service/cardidentify/handler/ApplyNoIdentifyHandler.java @@ -106,7 +106,7 @@ public class ApplyNoIdentifyHandler implements CardIdentifyHandler { } private IdnvCtnt buildIdnvCtnt(MCDTCO0SH003999.In in, MCDTCO0SH003999.Out out, String intnCd, String msg) { - String trid = in != null ? in.getTridV32() : (out != null ? out.getTridV32() : null); + String trid = in != null ? in.getTridV32() : null; String rawRspCd = out != null ? out.getGetPrfRsltCdV2() : null; String epan = out != null && out.getOutpCardNov19() != null ? out.getOutpCardNov19().trim() diff --git a/src/main/java/com/bccard/tsp/service/cardidentify/handler/BiznoIdentifyHandler.java b/src/main/java/com/bccard/tsp/service/cardidentify/handler/BiznoIdentifyHandler.java index 6aaf2cf..55e3112 100644 --- a/src/main/java/com/bccard/tsp/service/cardidentify/handler/BiznoIdentifyHandler.java +++ b/src/main/java/com/bccard/tsp/service/cardidentify/handler/BiznoIdentifyHandler.java @@ -166,7 +166,7 @@ public class BiznoIdentifyHandler implements CardIdentifyHandler { } private IdnvCtnt buildIdnvCtnt(MCDTCO0SH003999.In in, MCDTCO0SH003999.Out out, String intnCd, String msg) { - String trid = in != null ? in.getTridV32() : (out != null ? out.getTridV32() : null); + String trid = in != null ? in.getTridV32() : null; String rawRspCd = out != null ? out.getGetPrfRsltCdV2() : null; String epan = out != null && out.getOutpCardNov19() != null ? out.getOutpCardNov19().trim() diff --git a/src/main/java/com/bccard/tsp/service/cardidentify/handler/CiIdentifyHandler.java b/src/main/java/com/bccard/tsp/service/cardidentify/handler/CiIdentifyHandler.java index 172e96c..1079579 100644 --- a/src/main/java/com/bccard/tsp/service/cardidentify/handler/CiIdentifyHandler.java +++ b/src/main/java/com/bccard/tsp/service/cardidentify/handler/CiIdentifyHandler.java @@ -54,8 +54,8 @@ public class CiIdentifyHandler implements CardIdentifyHandler { if (isBlank(in.getCardNo())) { return Result.fail(ERROR_50001, "카드 번호 없음"); } - if (isBlank(in.getPwd())) { - return Result.fail(ERROR_50003, "카드PWD 없음"); + if (!isBlank(in.getValdTlm()) && !CardUtil.isValidTlmV6(in.getValdTlm())) { + return Result.fail(ERROR_50002, "유효기간 형식 오류"); } return Result.ok(builder.prfDvV1("2") .valdTlmV6(in.getValdTlm()) @@ -68,9 +68,6 @@ public class CiIdentifyHandler implements CardIdentifyHandler { if (isBlank(in.getCardNo())) { return Result.fail(ERROR_50001, "카드 번호 없음"); } - if (isBlank(in.getCi())) { - return Result.fail(ERROR_50005, "CI 없음"); - } return Result.ok(builder.prfDvV1("7") .encMthdDvV1("4") .prfExcpDvV1("0") @@ -86,15 +83,12 @@ public class CiIdentifyHandler implements CardIdentifyHandler { if (isBlank(in.getValdTlm())) { return Result.fail(ERROR_50002, "유효기간 없음"); } - if (isBlank(in.getPwd())) { - return Result.fail(ERROR_50003, "카드PWD 없음"); - } - if (isBlank(in.getCi())) { - return Result.fail(ERROR_50005, "CI 없음"); - } if (!CardUtil.isValidTlmV6(in.getValdTlm())) { return Result.fail(ERROR_50002, "유효기간 형식 오류"); } + if (isBlank(in.getPwd())) { + return Result.fail(ERROR_50003, "카드PWD 없음"); + } return Result.ok(builder.prfDvV1("7") .encMthdDvV1("4") .prfExcpDvV1("0") @@ -112,18 +106,15 @@ public class CiIdentifyHandler implements CardIdentifyHandler { if (isBlank(in.getValdTlm())) { return Result.fail(ERROR_50002, "유효기간 없음"); } + if (!CardUtil.isValidTlmV6(in.getValdTlm())) { + return Result.fail(ERROR_50002, "유효기간 형식 오류"); + } if (isBlank(in.getPwd())) { return Result.fail(ERROR_50003, "카드PWD 없음"); } if (isBlank(in.getCvc2())) { return Result.fail(ERROR_50004, "CVV2 없음"); } - if (isBlank(in.getCi())) { - return Result.fail(ERROR_50005, "CI 없음"); - } - if (!CardUtil.isValidTlmV6(in.getValdTlm())) { - return Result.fail(ERROR_50002, "유효기간 형식 오류"); - } return Result.ok(builder.prfDvV1("1") .encMthdDvV1("4") .prfExcpDvV1("0") @@ -240,7 +231,7 @@ public class CiIdentifyHandler implements CardIdentifyHandler { } private IdnvCtnt buildIdnvCtnt(MCDTCO0SH003999.In in, MCDTCO0SH003999.Out out, String intnCd, String msg) { - String trid = in != null ? in.getTridV32() : (out != null ? out.getTridV32() : null); + String trid = in != null ? in.getTridV32() : null; String rawRspCd = out != null ? out.getGetPrfRsltCdV2() : null; String epan = out != null && out.getOutpCardNov19() != null ? out.getOutpCardNov19().trim() diff --git a/src/main/java/com/bccard/tsp/service/cardidentify/handler/ForeignerIdentifyHandler.java b/src/main/java/com/bccard/tsp/service/cardidentify/handler/ForeignerIdentifyHandler.java index 33b4e9a..7106ee1 100644 --- a/src/main/java/com/bccard/tsp/service/cardidentify/handler/ForeignerIdentifyHandler.java +++ b/src/main/java/com/bccard/tsp/service/cardidentify/handler/ForeignerIdentifyHandler.java @@ -106,7 +106,7 @@ public class ForeignerIdentifyHandler implements CardIdentifyHandler { } private IdnvCtnt buildIdnvCtnt(MCDTCO0SH003999.In in, MCDTCO0SH003999.Out out, String intnCd, String msg) { - String trid = in != null ? in.getTridV32() : (out != null ? out.getTridV32() : null); + String trid = in != null ? in.getTridV32() : null; String rawRspCd = out != null ? out.getGetPrfRsltCdV2() : null; String epan = out != null && out.getOutpCardNov19() != null ? out.getOutpCardNov19().trim() diff --git a/src/main/java/com/bccard/tsp/service/cardidentify/handler/OldTokenIdentifyHandler.java b/src/main/java/com/bccard/tsp/service/cardidentify/handler/OldTokenIdentifyHandler.java index 630c8f8..17a6247 100644 --- a/src/main/java/com/bccard/tsp/service/cardidentify/handler/OldTokenIdentifyHandler.java +++ b/src/main/java/com/bccard/tsp/service/cardidentify/handler/OldTokenIdentifyHandler.java @@ -106,7 +106,7 @@ public class OldTokenIdentifyHandler implements CardIdentifyHandler { } private IdnvCtnt buildIdnvCtnt(MCDTCO0SH003999.In in, MCDTCO0SH003999.Out out, String intnCd, String msg) { - String trid = in != null ? in.getTridV32() : (out != null ? out.getTridV32() : null); + String trid = in != null ? in.getTridV32() : null; String rawRspCd = out != null ? out.getGetPrfRsltCdV2() : null; String epan = out != null && out.getOutpCardNov19() != null ? out.getOutpCardNov19().trim() diff --git a/src/main/java/com/bccard/tsp/service/cardidentify/vo/IdnvServiceOutVo.java b/src/main/java/com/bccard/tsp/service/cardidentify/vo/IdnvServiceOutVo.java index de9a590..82307ca 100644 --- a/src/main/java/com/bccard/tsp/service/cardidentify/vo/IdnvServiceOutVo.java +++ b/src/main/java/com/bccard/tsp/service/cardidentify/vo/IdnvServiceOutVo.java @@ -111,6 +111,9 @@ public class IdnvServiceOutVo { /** 불능사유 (30자리) */ private String incpRsonV30; + /** 머니형태구분번호 (10자리) */ + private String mnyTypNov10; + /** 한글성명 (40자리) */ private String hghNmV40;