From d3ae877447f239e31fe4e5a5bbf121608ebb0340 Mon Sep 17 00:00:00 2001
From: leebj <leebj91@xit.co.kr>
Date: Wed, 20 Aug 2025 09:04:39 +0900
Subject: [PATCH] =?UTF-8?q?1.=20=EB=82=A9=EB=B6=80=EC=9E=90=20=EC=82=AC?=
 =?UTF-8?q?=EC=A0=84=EB=93=B1=EB=A1=9D=EA=B2=B0=EC=A0=9C=20=EC=8B=A4?=
 =?UTF-8?q?=ED=8C=A8=EC=8B=9C=20=EC=8B=A4=ED=8C=A8=20=EB=A1=9C=EA=B7=B8?=
 =?UTF-8?q?=EA=B0=80=20=EA=B8=B0=EB=A1=9D=EC=95=88=EB=90=98=EB=8A=94=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=202.=20=EC=88=98?=
 =?UTF-8?q?=EB=8F=99=EC=9E=AC=EC=B2=AD=EA=B5=AC=20=EC=8B=A4=ED=8C=A8?=
 =?UTF-8?q?=EC=8B=9C=20=EC=98=A4=EB=A5=98=EC=82=AC=EC=9C=A0=20=EB=B9=84?=
 =?UTF-8?q?=EA=B3=A0=EC=97=90=20=ED=91=9C=EC=8B=9C=EB=90=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/CommSmartPlatformPRPController.java   |  2 +-
 .../web/CommWebBrowserPayController.java      | 30 ++++++++++++++++---
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/main/java/cfs/trsmrcv/web/CommSmartPlatformPRPController.java b/src/main/java/cfs/trsmrcv/web/CommSmartPlatformPRPController.java
index a86c79d..4d5c355 100644
--- a/src/main/java/cfs/trsmrcv/web/CommSmartPlatformPRPController.java
+++ b/src/main/java/cfs/trsmrcv/web/CommSmartPlatformPRPController.java
@@ -348,7 +348,7 @@ public class CommSmartPlatformPRPController {
 					commSmartPlatformPRPService.callSP_UPDATE_READING_PEN(mapOrg);		
 		        }
 		        
-				if(mapOrg.get("out_ret").toString().equals("-1") == true) {
+		        if(mapOrg.get("out_ret") != null && mapOrg.get("out_ret").toString().equals("-1")) {
 					result.setErrorMsg(ResultSmartPlatform.STATUS_ERROR_DEFAULT_DETAIL_CODE, null);
 					logger.info(result.getResult().get("resultMessage").toString());
 					return result.getResult(); 
diff --git a/src/main/java/cfs/trsmrcv/web/CommWebBrowserPayController.java b/src/main/java/cfs/trsmrcv/web/CommWebBrowserPayController.java
index d54b354..7c1eda0 100644
--- a/src/main/java/cfs/trsmrcv/web/CommWebBrowserPayController.java
+++ b/src/main/java/cfs/trsmrcv/web/CommWebBrowserPayController.java
@@ -332,7 +332,7 @@ public class CommWebBrowserPayController {
 				}
 			} else if(apiResMap != null 
 					&& apiResMap.get("result") != null
-					&& !apiResMap.get("result").toString().equals("SUCCESS")
+					&& (apiResMap.get("result").toString().equals("FAIL")||apiResMap.get("result").toString().equals("EXCEPTION"))
 					&& apiResMap.get("resultCode") != null
 					){
 				
@@ -570,6 +570,7 @@ public class CommWebBrowserPayController {
 			return callPrpResultMap;
 		}
 		
+		String detailFailResn = "";
 		
 		try {
 			// 사전등록결제 요청 추가
@@ -678,6 +679,14 @@ public class CommWebBrowserPayController {
 						rspnsMssage = StringUtil.objToStr(jsonResult.get("rspnsMssage"));
 					}
 					
+					if(!isSuccess){
+						if(!rspnsMssage.equals("")){
+							detailFailResn = rspnsMssage;
+						} else {
+							detailFailResn = rspnsCode;
+						}
+					}
+					
 					if(jsonResult.get("setleAmount") != null 
 							&& !jsonResult.get("setleAmount").toString().equals("")){
 						setleAmount = Integer.parseInt(jsonResult.get("setleAmount").toString());
@@ -696,16 +705,24 @@ public class CommWebBrowserPayController {
 					}
 				}
 			} else if(apiResMap != null && apiResMap.get("result") != null
-					&& apiResMap.get("result").toString().equals("FAIL")
+					&& (apiResMap.get("result").toString().equals("FAIL") || apiResMap.get("result").toString().equals("EXCEPTION"))
 					&& apiResMap.get("resultCode") != null
 					){
+	
+				if(apiResMap.get("resultMessage") != null && !apiResMap.get("resultMessage").equals("")){
+					detailFailResn = apiResMap.get("resultMessage").toString();
+				} else {
+					detailFailResn = apiResMap.get("resultCode").toString();
+				}
+				
 				
 				if(apiResMap.get("resultCode").toString().equals("ES0009") //차량상태 정상인 회원정보 없음
 					||apiResMap.get("resultCode").toString().equals("ES0011") //바로녹색 탈퇴회원
 					||apiResMap.get("resultCode").toString().equals("EC0007") //공통 이용료 미동의
 					||apiResMap.get("resultCode").toString().equals("EC0021") //이용기간 종료
 					||apiResMap.get("resultCode").toString().equals("EC0019") //상세 과태료,이용료 결제 미동의
-					){
+					){	
+					
 					//변동분 등록(미사용 회원)
 					Map<String, Object> mapFail = new HashMap<String, Object>();
 					mapFail.put("CAR_NO", carNo);
@@ -723,6 +740,7 @@ public class CommWebBrowserPayController {
 				}
 				
 			}
+
 			
 			tranLogMap.put("PRP_REQ_SEQ", newPrpReqSeq);
 			tranLogMap.put("BRS_MNO", brsMno);
@@ -798,8 +816,12 @@ public class CommWebBrowserPayController {
 		
 		/////////////////
 		if(!isSuccess){
+			String remarks = (dateForPerson).format(new Date())+" "+"사전등록 수동 재청구 실패";
+			if(!detailFailResn.equals("")){
+				remarks += "("+detailFailResn+")";
+			}
 			
-			remarksMap.put("REMARKS", (dateForPerson).format(new Date())+" "+"사전등록 수동 재청구 실패");
+			remarksMap.put("REMARKS", remarks);
 			trsmrcvDao.updateFaraTerminalInfoRemarks(remarksMap);
 			
 			return callPrpResultMap;