From 333295212575fc90b876df51f8deb1704ddcc10f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=EA=B2=BD=EC=88=99?= <dev14@gcone.kr>
Date: Thu, 2 Apr 2026 15:12:30 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=B0=EC=A0=9C=20-=20=ED=82=A4=EC=9B=80?=
 =?UTF-8?q?=EA=B2=B0=EC=A0=9C=20=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EC=A0=81?=
 =?UTF-8?q?=EC=9A=A9=20=EC=9D=B4=EB=8F=99=ED=85=8C=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=EB=B2=84=EC=A0=846?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ordr/controller/OrdrController.java       | 13 ++--
 .../views/sopmal/ordr/OrdrReqstKiwoomPayR.jsp | 62 ++++++++++---------
 .../views/sopmal_m/ordr/MbrPurchsC.jsp        | 31 ----------
 3 files changed, 42 insertions(+), 64 deletions(-)

diff --git a/src/main/java/com/wb/domainserver/domain/sopmal/ordr/controller/OrdrController.java b/src/main/java/com/wb/domainserver/domain/sopmal/ordr/controller/OrdrController.java
index 90a971d6..c4935749 100644
--- a/src/main/java/com/wb/domainserver/domain/sopmal/ordr/controller/OrdrController.java
+++ b/src/main/java/com/wb/domainserver/domain/sopmal/ordr/controller/OrdrController.java
@@ -1435,11 +1435,16 @@ public class OrdrController {
     @RequestMapping(value="/kiwoomPayPreSuccss")
     public String confirmKiwoom(HttpServletRequest request, ModelMap model) throws Exception {
 
-        System.out.println("=====RESERVEDSTRING===="+request.getParameter("RESERVEDSTRING"));
+        /*System.out.println("=====sopmalCd===="+request.getParameter("sopmalCd"));
+        System.out.println("=====mbrInnb===="+request.getParameter("mbrInnb"));
+        System.out.println("=====mbrId===="+request.getParameter("mbrId"));
+        System.out.println("=====pgCmpnyNm===="+request.getParameter("pgCmpnyNm"));
+        System.out.println("=====setleTyCd===="+request.getParameter("setleTyCd"));
+        System.out.println("=====ordrrNm===="+request.getParameter("ordrrNm"));
+*/
+        //return Util.getDeviceType(request) + "/ordr/OrdrReqstKiwoomPreR";
 
-        return Util.getDeviceType(request) + "/ordr/OrdrReqstKiwoomPreR";
-
-        //return "sopmal/ordr/OrdrReqstKiwoomPreR";
+        return "sopmal/ordr/OrdrReqstKiwoomPreR";
     }
 
 
diff --git a/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrReqstKiwoomPayR.jsp b/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrReqstKiwoomPayR.jsp
index 0e4ae64f..bc178862 100644
--- a/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrReqstKiwoomPayR.jsp
+++ b/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrReqstKiwoomPayR.jsp
@@ -30,30 +30,39 @@
     <script type="text/javascript" language="javascript">
         $(document).ready(function() {
 
-            var pf;
-            pf = document.payForm;
-            pf.HOMEURL.value=window.location.origin + '<c:url value="/sopmal/ordr/kiwoomPayPreSuccss"/>';
-            pf.FAILURL.value=document.payForm.HOMEURL.value;
+            const pf = document.payForm;
 
-            const form = document.forms['order_info'];
-            sessionStorage.setItem("orderFormData", JSON.stringify({
-                sopmalCd: form.sopmalCd.value,
-                ordrInnb: form.ordrInnb.value,
-                pgCmpnyNm: form.pgCmpnyNm.value,
-                setleTyCd: form.setleTyCd.value
-            }));
+            const orderForm = $('#order_info');
+            const setleTyCd = orderForm.find('.setleTyCd').val();
+            const sopmalCd = orderForm.find('.sopmalCd').val();
+            const mbrInnb = orderForm.find('.mbrInnb').val();
+            const mbrId = orderForm.find('.mbrId').val();
+            const pgCmpnyNm = orderForm.find('.pgCmpnyNm').val();
+            const ordrrNm = orderForm.find('.ordrrNm').val();
+            const ordrInnb = orderForm.find('.ordrInnb').val();
+            const setleAmt = orderForm.find('.setleAmt').val();
+            const sesionId = orderForm.find('.sesionId').val();
+
+            let homeUrl = new URL(window.location.origin+"/sopmal/ordr/kiwoomPayPreSuccss");
+
+            if('<c:out value="${ data.ordr.sknEnvrnCd }"/>' === 'M'){
+                homeUrl = new URL(window.location.origin + "/sopmal/ordr/insertKiwoomSetle");
+                homeUrl.searchParams.set("sopmalCd", sopmalCd);
+                homeUrl.searchParams.set("mbrInnb", mbrInnb);
+                homeUrl.searchParams.set("mbrId", mbrId);
+                homeUrl.searchParams.set("pgCmpnyNm", pgCmpnyNm);
+                homeUrl.searchParams.set("setleTyCd", setleTyCd);
+                homeUrl.searchParams.set("ordrrNm", ordrrNm);
+                homeUrl.searchParams.set("ordrInnb", ordrInnb);
+                homeUrl.searchParams.set("setleAmt", setleAmt);
+                homeUrl.searchParams.set("sesionId", sesionId);
+            }
+
+            pf.HOMEURL.value = homeUrl.toString();
+            pf.FAILURL.value=pf.HOMEURL.value;
+
+            console.log("==HOMEURL====::",pf.HOMEURL.value);
 
-            pf.RESERVEDSTRING.value =
-                "<c:out value='${data.setle.sopmalCd}'/>" +"/" +
-                "<c:out value='${data.setle.pgCmpnyNm}'/>" + "/" +
-                "<c:out value='${data.setle.setleTyCd}'/>" + "/" +
-                "<c:out value='${data.setle.goodsNm}'/>" + "/" +
-                "<c:out value='${data.ordr.ordrrNm}'/>" + "/" +
-                "<c:out value='${data.ordr.ordrrEmail}'/>" + "/" +
-                "<c:out value='${data.ordr.ordrrMbtlnb}'/>" + "/" +
-                "<c:out value='${data.ordr.mbrId}'/>" + "/" +
-                "<c:out value='${data.ordr.mbrInnb}'/>" + "/" +
-                "<c:out value='${data.ordr.sesionId}'/>";
             //kiwoomPay();
         //});
 
@@ -91,14 +100,11 @@
                         // kiwoom_ENC 값 입력
                         pf.KIWOOM_ENC.value = enc;
 
-                        console.log("response enc :::::",enc);
-
                         // 결제창 URL 설정
                         var PayServer = pf.SERVER.value;
                         var PayType = pf.TYPE.value;
                         var fileName = "";
-                        console.log("response PayServer :::::", PayServer);
-                        console.log("response PayType :::::", PayType);
+
                         if (PayServer === "DEV") {
                             fileName = "https://apitest.kiwoompay.co.kr/pay/linkEnc";
                         } else if (PayServer === "LIVE") {
@@ -170,11 +176,9 @@
     <input type="hidden" name="AMOUNT" value="${data.setle.wonSetleAmt}" /><%-- 결제금액 --%>
     <input type="hidden" name="PRODUCTNAME" value="${data.setle.goodsNm}" /><%-- 상품명 --%>
     <input type="hidden" name="USERID" value="${data.ordr.mbrId}" /> <%-- 고객 ID --%>
+    <input type="hidden" name="DIRECTRESULTFLAG" value="Y" /> <%-- 키움페이 결제 완료 창 없이 HOMEURL로 바로 이동(Y/N) --%>
     <input type="hidden" name="HOMEURL" value="" /> <%-- 결제 성공 후, 이동할 URL(결제 창에서 이동) --%>
     <input type="hidden" name="FAILURL" value="" /> <%-- 결제실패 후, 확인버튼 입력 시 이동할 URL --%>
-    <input type="hidden" name="DIRECTRESULTFLAG" value="" /> <%-- 키움페이 결제 완료 창 없이 HOMEURL로 바로 이동(Y/N) --%>
-
-    <input type="hidden" name="RESERVEDSTRING" value="" />
 </form>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/ordr/MbrPurchsC.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/ordr/MbrPurchsC.jsp
index 861a9cea..44bf1377 100644
--- a/src/main/webapp/WEB-INF/views/sopmal_m/ordr/MbrPurchsC.jsp
+++ b/src/main/webapp/WEB-INF/views/sopmal_m/ordr/MbrPurchsC.jsp
@@ -3615,37 +3615,6 @@
             });
         }
     </script>
-
-    <script>
-        window.addEventListener("load", function () {
-
-            console.log("=========== 모바일에서 실행되면 좋겠다 =============================");
-
-            const data = sessionStorage.getItem("orderFormData");
-
-            if (data) {
-                const obj = JSON.parse(data);
-                const form = document.forms['order_info'];
-
-                form.sopmalCd.value = obj.sopmalCd;
-                form.ordrInnb.value = obj.ordrInnb;
-                form.pgCmpnyNm.value = obj.pgCmpnyNm;
-                form.setleTyCd.value = obj.setleTyCd;
-
-                sessionStorage.removeItem("orderFormData");
-
-                kiwoom_Completepayment();
-            }
-        });
-
-        function kiwoom_Completepayment() {
-
-            console.log("=========== 모바일에서 실행되면 좋겠다22222 =============================");
-
-            var frm = document.order_info;
-            frm.submit();
-        }
-    </script>
 </head>
 <style>
     @media (max-width: 720px) {