From d17ee11825ae516073261f377d0fea31e5269029 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Tue, 28 Nov 2023 17:45:09 +0900 Subject: [PATCH] =?UTF-8?q?QR=20=ED=99=95=EC=9D=B8=20=EC=97=90=EB=9F=AC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/api/bas/laanc/service/BasLaancService.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/service/BasLaancService.java b/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/service/BasLaancService.java index 817adffb..f95ead21 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/service/BasLaancService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/service/BasLaancService.java @@ -1,6 +1,7 @@ package com.palnet.biz.api.bas.laanc.service; import com.google.zxing.WriterException; +import com.itextpdf.io.util.HashCode; import com.palnet.biz.api.acnt.cstmr.model.AnctCstmrModel; import com.palnet.biz.api.acnt.cstmr.model.AnctCstmrTermsModel; import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil; @@ -46,9 +47,7 @@ import java.time.LocalTime; import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; +import java.util.*; import java.util.stream.Collectors; /** @@ -669,7 +668,11 @@ public class BasLaancService { String userIdByToken = jwtTokenUtil.getUserIdByToken(); ComConfirmBas entity = comConfirmBasRepository.findFirstByConfirmKeyOrderByCreateDtDesc(confirmKey); if(entity == null) throw new CustomException(ErrorCode.DATA_NOTFIND, "QR코드 조회 실패"); - if (!"RECEIVED".equals(entity.getStatus())) throw new CustomException(ErrorCode.DATA_NOTFIND, entity.getStatus()); + if (!"RECEIVED".equals(entity.getStatus())){ + Map errorParam = new HashMap<>(); + errorParam.put("status", entity.getStatus()); + throw new CustomException(ErrorCode.DATA_NOTFIND, errorParam); + } // TODO 일자 검증 - 3분 초과 Instant createDt = entity.getCreateDt().plus(3, ChronoUnit.MINUTES);