From 0a05ab07d3e1873377d6a3ffd13330f7f2492c8e Mon Sep 17 00:00:00 2001
From: jazz <jazz>
Date: Fri, 20 Mar 2026 18:21:39 +0900
Subject: [PATCH] =?UTF-8?q?fix=20:=20=EC=83=81=ED=92=88=EC=A4=80=EB=B9=84(?=
 =?UTF-8?q?35)=20=EA=B2=B0=EC=A0=9C=EC=B7=A8=EC=86=8C=20=EA=B0=80=EB=8A=A5?=
 =?UTF-8?q?=ED=95=98=EB=8F=84=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

---
 .../mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml      | 2 +-
 .../WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp      | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml b/src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml
index 397d681a..bdf67fc9 100644
--- a/src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml
+++ b/src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml
@@ -5239,7 +5239,7 @@
         <![CDATA[
             SELECT
                 CASE
-                     WHEN O.ORDR_STTUS_CD >= '30' AND O.ORDR_STTUS_CD < '85' AND #{refundTyCd} = '01' THEN 'N'
+                     WHEN O.ORDR_STTUS_CD >= '40' AND O.ORDR_STTUS_CD < '85' AND #{refundTyCd} = '01' THEN 'N'
                      ELSE 'Y'
                 END AS CANCEL_POSBLE_AT
             FROM GC_ORDER O
diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp
index bac99424..1e166f81 100644
--- a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp
+++ b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp
@@ -1829,7 +1829,10 @@
                             </c:choose>
                             <button type="button" class="btn-ordr-sttus-35 btn gray">상품 준비</button>
                         </c:if>
-                        <c:if test="${'35' <= dtl.ordrSttusCd && '85' gt dtl.ordrSttusCd && dtl.sknEnvrnCd ne 'POS'}"> <!-- 상품준비 or 출고후 -->
+                        <c:if test="${'35' eq dtl.ordrSttusCd && dtl.sknEnvrnCd ne 'POS'}"> <!-- 상품준비 or 출고후 -->
+                            <a href="javascript:void(0);" id="canclPayment" class="btn outline">결제 취소</a>
+                        </c:if>
+                        <c:if test="${'40' <= dtl.ordrSttusCd && '85' gt dtl.ordrSttusCd && dtl.sknEnvrnCd ne 'POS'}"> <!-- 상품준비 or 출고후 -->
                             <button type="button" class="btn outline" onclick="fn_refund_regist_popup('#modalDiv', '#setleCanclRefndRegistPopupC', '<c:url value="/mngr/ordr/ordrmngr/selectRtngudRegistPopupForm"/>', '${dtl.ordrInnb}', '${dtl.setleTyCd}', '${dtl.ordrSttusCd}');">반품 신청</button>
                         </c:if>
                     </div>