From 40686ddba65991776249d0ed35118c4be880d450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=8C=80=ED=99=98?= Date: Wed, 12 Aug 2026 12:24:39 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=EA=B2=B0=EC=A0=9C,=20=EC=B7=A8?= =?UTF-8?q?=EC=86=8C=20-=20=ED=82=A4=EC=9B=80=EA=B2=B0=EC=A0=9C=20?= =?UTF-8?q?=EB=84=A4=EC=9D=B4=EB=B2=84=ED=8E=98=EC=9D=B4=20CPID=20?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/gcone/ordr/pay/service/BOPayService.java | 8 ++++---- .../rtngudrefnd/service/BORtngudrefndService.java | 2 +- .../webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp | 12 ++++++------ .../sopmal_m/mpage/ordr/OrdrSetleCanclPopup.jsp | 5 +++-- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/wb/domainserver/domain/gcone/ordr/pay/service/BOPayService.java b/src/main/java/com/wb/domainserver/domain/gcone/ordr/pay/service/BOPayService.java index e3b8c83e..a64f2063 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/ordr/pay/service/BOPayService.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/ordr/pay/service/BOPayService.java @@ -1570,10 +1570,10 @@ public class BOPayService{ String authKey = resultMap.get("kcpSecretKey").toString(); String cpId = resultMap.get("kcpMid").toString(); // 개발서버 네이버페이 CPID 관련 적용 취소 -// if ("naverpay".equals(payVO.getModGubun())) { -// authKey = resultMap.get("bpaySecretKey").toString(); -// cpId = resultMap.get("bpayMid").toString(); -// } + if ("naverpay".equals(payVO.getModGubun())) { + authKey = resultMap.get("bpaySecretKey").toString(); + cpId = resultMap.get("bpayMid").toString(); + } String amount = payVO.getCancelAmount(); //취소금액 String trxId = payVO.getTno(); //거래번호 diff --git a/src/main/java/com/wb/domainserver/domain/gcone/ordr/rtngudrefnd/service/BORtngudrefndService.java b/src/main/java/com/wb/domainserver/domain/gcone/ordr/rtngudrefnd/service/BORtngudrefndService.java index 588eae7c..1022ef1d 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/ordr/rtngudrefnd/service/BORtngudrefndService.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/ordr/rtngudrefnd/service/BORtngudrefndService.java @@ -1120,7 +1120,7 @@ public class BORtngudrefndService { } // 개발서버 네이버페이 CPID 구분 적용 취소 -// payVO.setModGubun(setle.getPgCmpnyNm()); //결제키 구분용 + payVO.setModGubun(setle.getPgCmpnyNm()); //결제키 구분용 if ("kiwoom".equals(setle.getPgCmpnyNm())) { payVO.setPayMethod("CARD"); } else if ("naverpay".equals(setle.getPgCmpnyNm())) { diff --git a/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp b/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp index b931120b..863d38b7 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp @@ -642,12 +642,12 @@ const kcpMid = ''; const bpayMid = ''; // 개발서버 네이버페이 CPID 구분 적용 취소 - $(form).find('#siteCdMid').val(kcpMid); - // if('naverpay' === id) { - // $(form).find('#siteCdMid').val(bpayMid); - // } else { - // $(form).find('#siteCdMid').val(kcpMid); - // } + // $(form).find('#siteCdMid').val(kcpMid); + if('naverpay' === id) { + $(form).find('#siteCdMid').val(bpayMid); + } else { + $(form).find('#siteCdMid').val(kcpMid); + } }); /* 결제예정금액 > 약관 전체동의 선택 이벤트 */ diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrSetleCanclPopup.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrSetleCanclPopup.jsp index 2bda25f1..80263311 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrSetleCanclPopup.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrSetleCanclPopup.jsp @@ -21,6 +21,7 @@ +