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 d08b211b..b1d11c59 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 @@ -1561,7 +1561,7 @@ public class BOPayService{ //요청코드 String authKey = resultMap.get("kcpSecretKey").toString(); String cpId = resultMap.get("kcpMid").toString(); - String amount = payVO.getCancelAmount(); //취소금액 //todo :: db연결해서 가져와야 함 nullCheck(request.getParameter("AUTHKEY")); + String amount = payVO.getCancelAmount(); //취소금액 String trxId = payVO.getTno(); //거래번호 String cancelReason = payVO.getCancelReason(); //취소사유 String payMethod = payVO.getPayMethod(); //취소결제수단 diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/selngpruf/SelngPrufListInqireForm.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/selngpruf/SelngPrufListInqireForm.jsp index 671d66fb..da745afc 100644 --- a/src/main/webapp/WEB-INF/views/mngr/ordr/selngpruf/SelngPrufListInqireForm.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/ordr/selngpruf/SelngPrufListInqireForm.jsp @@ -12,6 +12,12 @@ ------- -------- --------------------------- since : 2024.05.28 임수영 최초 생성 --%> + +<% + String serverName = request.getServerName(); + String sysEnv = "live"; + if(serverName.contains("dev") || serverName.contains("loc")){sysEnv = "dev";}; +%> @@ -350,12 +356,20 @@ let paycoUrl = "https://bill.payco.com/seller/receipt/GB_UZRSXP/"+ordrInnb+"/"+pgInnb+"" //페이코(as_is) - /* kiwoom url + /* kiwoom url , kiwoom naverpay * DAOUTRX : 다우거래번호 * STATUS : 11 = 승인전표 / 12 = 취소전표 / 16 = 부분취소 / A = 자동상태 */ - const kiwoomCardUrl = "https://agenttest.kiwoompay.co.kr/common/PayInfoPrintDirectCard.jsp?DAOUTRX="+pgInnb+"&STATUS=11"; //개발 - const kiwoomCardLiveUrl = "https://agent.kiwoompay.co.kr/common/PayInfoPrintDirectCard.jsp?DAOUTRX=CTS26033118224396081&STATUS=11"; //운영 + const env = "<%=sysEnv%>"; + let kiwoomCardUrl = ""; + let kiwoomNaverUrl = ""; + if(env == "dev"){ //개발 + kiwoomCardUrl = "https://agenttest.kiwoompay.co.kr/common/PayInfoPrintDirectCard.jsp?DAOUTRX="+pgInnb+"&STATUS=11"; + kiwoomNaverUrl = "https://agenttest.kiwoompay.co.kr/common/PayInfoPrintNaverPay.jsp?DAOUTRX="+pgInnb+"&STATUS=11"; + }else{ + kiwoomCardUrl = "https://agent.kiwoompay.co.kr/common/PayInfoPrintDirectCard.jsp?DAOUTRX="+pgInnb+"&STATUS=11"; + kiwoomNaverUrl = "https://agent.kiwoompay.co.kr/common/PayInfoPrintNaverPay.jsp?DAOUTRX="+pgInnb+"&STATUS=11"; + } $.ajax({ type: "GET", @@ -372,7 +386,9 @@ tossCashUrl = "https://dashboard.tosspayments.com/receipt/mids/" + mid + "/orders/" + cashOrdrInnb + "/cash-receipt?ref=email" // 현금 if(pgCmpnyNm == "kiwoom") { - url = kiwoomCardUrl; + if(setleTyCd=='01'){ url = kiwoomCardUrl;} + } else if(pgCmpnyNm == "naverpay") { + if(setleTyCd=='01'){ url = kiwoomNaverUrl;} } else if (pgCmpnyNm == 'toss') { if (reqstDvCd == '02' || reqstDvCd == "03") { // 현금영수증 if (setleTyCd == '03' || setleTyCd == '04' || setleTyCd == '05') { // 계좌이체, 가상계좌 diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp index a40fbb7d..a75b0bf6 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp @@ -17,6 +17,12 @@ ------- -------- --------------------------- 2024-04-11 김혜인 최초 생성 --%> + +<% + String serverName = request.getServerName(); + String sysEnv = "live"; + if(serverName.contains("dev") || serverName.contains("loc")){sysEnv = "dev";}; +%> @@ -927,8 +933,6 @@ boUrl = ''; } - console.log("boUrl:::",boUrl); - if (confirm('')) { const salesData = $("#sales").serialize(); $.ajax({ @@ -965,16 +969,10 @@ */ const fn_ctrl_refund_resn_cd = function() { - console.log("셀렉트 박스 변경 "); let cdDv = $('#returnResnCd').val(); - let selectedOption = $('#returnResnCd option:selected'); let cdDvData = selectedOption.data('cddv'); - console.log("선택된 값 (value): " + cdDv); - console.log("선택된 data-cddv 값: " + cdDvData); - - if (cdDvData === '01') { $('input[name="returnDlvyRspnsblCd"][value="01"]').click(); $('.returnDlvyAcntnbArea').show(); @@ -1015,15 +1013,25 @@ const tossCardUrl = "https://dashboard.tosspayments.com/receipt/redirection?transactionId="+pgInnb+"&ref=PX"; //카드 / 간편결제(01) const tossAcntUrl = "https://dashboard.tosspayments.com/receipt/payment-detail/bank-transfer?transactionId="+pgInnb+"&ref=PX"; //계좌이체(03), 가상계좌(04,05) - /* kiwoom url + /* kiwoom url , kiwoom naverpay * DAOUTRX : 다우거래번호 * STATUS : 11 = 승인전표 / 12 = 취소전표 / 16 = 부분취소 / A = 자동상태 */ - const kiwoomCardUrl = "https://agenttest.kiwoompay.co.kr/common/PayInfoPrintDirectCard.jsp?DAOUTRX="+pgInnb+"&STATUS=11"; //개발 - const kiwoomCardLiveUrl = "https://agent.kiwoompay.co.kr/common/PayInfoPrintDirectCard.jsp?DAOUTRX=CTS26033118224396081&STATUS=11"; //운영 + const env = "<%=sysEnv%>"; + let kiwoomCardUrl = ""; + let kiwoomNaverUrl = ""; + if(env == "dev"){ //개발 + kiwoomCardUrl = "https://agenttest.kiwoompay.co.kr/common/PayInfoPrintDirectCard.jsp?DAOUTRX="+pgInnb+"&STATUS=11"; + kiwoomNaverUrl = "https://agenttest.kiwoompay.co.kr/common/PayInfoPrintNaverPay.jsp?DAOUTRX="+pgInnb+"&STATUS=11"; + }else{ + kiwoomCardUrl = "https://agent.kiwoompay.co.kr/common/PayInfoPrintDirectCard.jsp?DAOUTRX="+pgInnb+"&STATUS=11"; + kiwoomNaverUrl = "https://agent.kiwoompay.co.kr/common/PayInfoPrintNaverPay.jsp?DAOUTRX="+pgInnb+"&STATUS=11"; + } - if(pgCmpnyNm == "kiwoom" || pgCmpnyNm == "naverpay") { + if(pgCmpnyNm == "kiwoom") { if(setleTyCd=='01'){ url = kiwoomCardUrl;} + } else if(pgCmpnyNm == "naverpay") { + if(setleTyCd=='01'){ url = kiwoomNaverUrl;} } else if(pgCmpnyNm == "kcp") { if(setleTyCd=='01'){ url = kcpCardUrl;} diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDtlR.jsp index 435ca4f9..4704207c 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDtlR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDtlR.jsp @@ -17,6 +17,12 @@ ------- -------- --------------------------- 2026-02-06 이대환 최초 생성 --%> + +<% + String serverName = request.getServerName(); + String sysEnv = "live"; + if(serverName.contains("dev") || serverName.contains("loc")){sysEnv = "dev";}; +%> @@ -921,8 +927,6 @@ boUrl = ''; } - console.log("boUrl:::",boUrl); - if (confirm('')) { const salesData = $("#sales").serialize(); $.ajax({ @@ -959,16 +963,10 @@ */ const fn_ctrl_refund_resn_cd = function() { - console.log("셀렉트 박스 변경 "); let cdDv = $('#returnResnCd').val(); - let selectedOption = $('#returnResnCd option:selected'); let cdDvData = selectedOption.data('cddv'); - console.log("선택된 값 (value): " + cdDv); - console.log("선택된 data-cddv 값: " + cdDvData); - - if (cdDvData === '01') { $('input[name="returnDlvyRspnsblCd"][value="01"]').click(); $('.returnDlvyAcntnbArea').show(); @@ -1009,15 +1007,25 @@ const tossCardUrl = "https://dashboard.tosspayments.com/receipt/redirection?transactionId="+pgInnb+"&ref=PX"; //카드 / 간편결제(01) const tossAcntUrl = "https://dashboard.tosspayments.com/receipt/payment-detail/bank-transfer?transactionId="+pgInnb+"&ref=PX"; //계좌이체(03), 가상계좌(04,05) - /* kiwoom url + /* kiwoom url , kiwoom naverpay * DAOUTRX : 다우거래번호 * STATUS : 11 = 승인전표 / 12 = 취소전표 / 16 = 부분취소 / A = 자동상태 */ - const kiwoomCardUrl = "https://agenttest.kiwoompay.co.kr/common/PayInfoPrintDirectCard.jsp?DAOUTRX="+pgInnb+"&STATUS=11"; //개발 - const kiwoomCardLiveUrl = "https://agent.kiwoompay.co.kr/common/PayInfoPrintDirectCard.jsp?DAOUTRX=CTS26033118224396081&STATUS=11"; //운영 + const env = "<%=sysEnv%>"; + let kiwoomCardUrl = ""; + let kiwoomNaverUrl = ""; + if(env == "dev"){ //개발 + kiwoomCardUrl = "https://agenttest.kiwoompay.co.kr/common/PayInfoPrintDirectCard.jsp?DAOUTRX="+pgInnb+"&STATUS=11"; + kiwoomNaverUrl = "https://agenttest.kiwoompay.co.kr/common/PayInfoPrintNaverPay.jsp?DAOUTRX="+pgInnb+"&STATUS=11"; + }else{ + kiwoomCardUrl = "https://agent.kiwoompay.co.kr/common/PayInfoPrintDirectCard.jsp?DAOUTRX="+pgInnb+"&STATUS=11"; + kiwoomNaverUrl = "https://agent.kiwoompay.co.kr/common/PayInfoPrintNaverPay.jsp?DAOUTRX="+pgInnb+"&STATUS=11"; + } if(pgCmpnyNm == "kiwoom") { if(setleTyCd=='01'){ url = kiwoomCardUrl;} + } else if(pgCmpnyNm == "naverpay") { + if(setleTyCd=='01'){ url = kiwoomNaverUrl;} } else if(pgCmpnyNm == "kcp") { if(setleTyCd=='01'){ url = kcpCardUrl;} diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDtlR.jsp index 53d7ec4e..3d8528bf 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDtlR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDtlR.jsp @@ -9,6 +9,12 @@ + +<% + String serverName = request.getServerName(); + String sysEnv = "live"; + if(serverName.contains("dev") || serverName.contains("loc")){sysEnv = "dev";}; +%> @@ -358,8 +364,6 @@ boUrl = ''; } - console.log("boUrl:::",boUrl); - $("#customConfirmAlertCn").text(''); openConfirmModal2(function (onSuccess) { fn_apply_sales_2(onSuccess,boUrl); @@ -567,15 +571,25 @@ const tossCardUrl = "https://dashboard.tosspayments.com/receipt/redirection?transactionId="+pgInnb+"&ref=PX"; //카드 / 간편결제(01) const tossAcntUrl = "https://dashboard.tosspayments.com/receipt/payment-detail/bank-transfer?transactionId="+pgInnb+"&ref=PX"; //계좌이체(03), 가상계좌(04,05) - /* kiwoom url + /* kiwoom url , kiwoom naverpay * DAOUTRX : 다우거래번호 * STATUS : 11 = 승인전표 / 12 = 취소전표 / 16 = 부분취소 / A = 자동상태 */ - const kiwoomCardUrl = "https://agenttest.kiwoompay.co.kr/common/PayInfoPrintDirectCard.jsp?DAOUTRX="+pgInnb+"&STATUS=11"; //개발 - const kiwoomCardLiveUrl = "https://agent.kiwoompay.co.kr/common/PayInfoPrintDirectCard.jsp?DAOUTRX=CTS26033118224396081&STATUS=11"; //운영 + const env = "<%=sysEnv%>"; + let kiwoomCardUrl = ""; + let kiwoomNaverUrl = ""; + if(env == "dev"){ //개발 + kiwoomCardUrl = "https://agenttest.kiwoompay.co.kr/common/PayInfoPrintDirectCard.jsp?DAOUTRX="+pgInnb+"&STATUS=11"; + kiwoomNaverUrl = "https://agenttest.kiwoompay.co.kr/common/PayInfoPrintNaverPay.jsp?DAOUTRX="+pgInnb+"&STATUS=11"; + }else{ + kiwoomCardUrl = "https://agent.kiwoompay.co.kr/common/PayInfoPrintDirectCard.jsp?DAOUTRX="+pgInnb+"&STATUS=11"; + kiwoomNaverUrl = "https://agent.kiwoompay.co.kr/common/PayInfoPrintNaverPay.jsp?DAOUTRX="+pgInnb+"&STATUS=11"; + } - if(pgCmpnyNm == "kiwoom" || pgCmpnyNm == "naverpay") { + if(pgCmpnyNm == "kiwoom") { if(setleTyCd=='01'){ url = kiwoomCardUrl;} + } else if(pgCmpnyNm == "naverpay") { + if(setleTyCd=='01'){ url = kiwoomNaverUrl;} } else if(pgCmpnyNm == "kcp") { if(setleTyCd=='01'){ url = kcpCardUrl;} diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDtlR.jsp index 35451881..a297dfea 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDtlR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDtlR.jsp @@ -9,6 +9,12 @@ + +<% + String serverName = request.getServerName(); + String sysEnv = "live"; + if(serverName.contains("dev") || serverName.contains("loc")){sysEnv = "dev";}; +%> @@ -341,8 +347,6 @@ boUrl = ''; } - console.log("boUrl:::",boUrl); - $("#customConfirmAlertCn").text(''); openConfirmModal2(function (onSuccess) { fn_apply_sales_2(onSuccess,boUrl); @@ -550,15 +554,25 @@ const tossCardUrl = "https://dashboard.tosspayments.com/receipt/redirection?transactionId="+pgInnb+"&ref=PX"; //카드 / 간편결제(01) const tossAcntUrl = "https://dashboard.tosspayments.com/receipt/payment-detail/bank-transfer?transactionId="+pgInnb+"&ref=PX"; //계좌이체(03), 가상계좌(04,05) - /* kiwoom url + /* kiwoom url , kiwoom naverpay * DAOUTRX : 다우거래번호 * STATUS : 11 = 승인전표 / 12 = 취소전표 / 16 = 부분취소 / A = 자동상태 */ - const kiwoomCardUrl = "https://agenttest.kiwoompay.co.kr/common/PayInfoPrintDirectCard.jsp?DAOUTRX="+pgInnb+"&STATUS=11"; //개발 - const kiwoomCardLiveUrl = "https://agent.kiwoompay.co.kr/common/PayInfoPrintDirectCard.jsp?DAOUTRX=CTS26033118224396081&STATUS=11"; //운영 + const env = "<%=sysEnv%>"; + let kiwoomCardUrl = ""; + let kiwoomNaverUrl = ""; + if(env == "dev"){ //개발 + kiwoomCardUrl = "https://agenttest.kiwoompay.co.kr/common/PayInfoPrintDirectCard.jsp?DAOUTRX="+pgInnb+"&STATUS=11"; + kiwoomNaverUrl = "https://agenttest.kiwoompay.co.kr/common/PayInfoPrintNaverPay.jsp?DAOUTRX="+pgInnb+"&STATUS=11"; + }else{ + kiwoomCardUrl = "https://agent.kiwoompay.co.kr/common/PayInfoPrintDirectCard.jsp?DAOUTRX="+pgInnb+"&STATUS=11"; + kiwoomNaverUrl = "https://agent.kiwoompay.co.kr/common/PayInfoPrintNaverPay.jsp?DAOUTRX="+pgInnb+"&STATUS=11"; + } if(pgCmpnyNm == "kiwoom") { if(setleTyCd=='01'){ url = kiwoomCardUrl;} + } else if(pgCmpnyNm == "naverpay") { + if(setleTyCd=='01'){ url = kiwoomNaverUrl;} } else if(pgCmpnyNm == "kcp") { if(setleTyCd=='01'){ url = kcpCardUrl;}