From 0cd6419b0afbeec505f9fc035b504396f5796c20 Mon Sep 17 00:00:00 2001
From: jazz <jazz>
Date: Fri, 20 Mar 2026 18:04:02 +0900
Subject: [PATCH] =?UTF-8?q?fix=20:=20=EC=A0=84=EC=B2=B4=EC=A3=BC=EB=AC=B8?=
 =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EC=A3=BC=EB=AC=B8=EA=B5=AC=EB=B6=84=20?=
 =?UTF-8?q?=EC=A1=B0=EA=B1=B4=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gcone/ordr/ordr/vo/BOOrdrSrchVO.java      |  3 +++
 .../mapper/gcone/ordr/ordr/BOOrdrMapper.xml   |  3 +++
 .../mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp | 27 ++++++++++++++++---
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrSrchVO.java b/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrSrchVO.java
index 3f420cdd..94fd5726 100644
--- a/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrSrchVO.java
+++ b/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrSrchVO.java
@@ -105,4 +105,7 @@ public class BOOrdrSrchVO extends AbstractVO{
 
     private String excelCoulms; // 엑셀다운로드 조회 컬럼
     private String ordrInnb; // 주문고유번호
+
+    /**주문구분*/
+    private String srchSubsvcAt;
 }
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 5e208104..397d681a 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
@@ -476,6 +476,9 @@
             AND FO.ORDRR_MBTLNB = HEX(AES_ENCRYPT(REPLACE(#{mbtlnb}, '-', ''), #{secretKey}))
             AND FO.MBR_INNB = 0
         </if>
+        <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(srchSubsvcAt)">
+            AND FO.SUBSVC_AT = #{srchSubsvcAt}
+        </if>
     </sql>
 
     <!-- 전체 주문 조회 > 매장 목록 조회 -->
diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp
index 92f41bbd..0db26284 100644
--- a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp
+++ b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp
@@ -1934,7 +1934,7 @@
                             </tr>
                             <tr class="search-hide">
                                 <th>배송예정</th>
-                                <td colspan="4">
+                                <td colspan="1">
                                     <div class="td-inner">
                                         <div class="select-box">
                                             <select name="srchResveSndngDvCd" id="srchResveSndngDvCd" title="배송예정">
@@ -1951,10 +1951,8 @@
                                         </div>
                                     </div>
                                 </td>
-                            </tr>
-                            <tr class="search-hide">
                                 <th>배송방법</th>
-                                <td colspan="1">
+                                <td colspan="2">
                                     <div class="td-inner">
                                         <div class="b-checkbox-container">
                                             <c:forEach items="${cond.dlvyMthCdList}" var="dlvyMthCd" varStatus="status">
@@ -1967,6 +1965,27 @@
                                         </div>
                                     </div>
                                 </td>
+                            </tr>
+                            <tr class="search-hide">
+                                <th>주문구분</th>
+                                <td colspan="1">
+                                    <div class="td-inner">
+                                        <div class="custom-radio-container">
+                                            <div class="custom-radio">
+                                                <input type="radio" id="srchSubsvcAt"  name="srchSubsvcAt" checked="checked" value="">
+                                                <label for="srchSubsvcAt">전체</label>
+                                            </div>
+                                            <div class="custom-radio">
+                                                <input type="radio" id="srchSubsvcAtY" name="srchSubsvcAt" value="Y">
+                                                <label for="srchSubsvcAtY">구독서비스</label>
+                                            </div>
+                                            <div class="custom-radio">
+                                                <input type="radio" id="srchSubsvcAtN" name="srchSubsvcAt" value="N">
+                                                <label for="srchSubsvcAtN">일반</label>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </td>
                                 <th>주문유형</th>
                                 <td colspan="2">
                                     <div class="td-inner">