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 f44fa68c..c5b63de4 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 @@ -2505,6 +2505,7 @@ WHEN FOS.PG_CMPNY_NM = 'kcp' THEN GPL.KCP_MID ELSE GPL.OLD_TOSS_MID END AS MID + , FOS.WON_SETLE_AMT FROM GC_ORDER_SETLE FOS INNER JOIN GC_PAY_LINK GPL ON FOS.SOPMAL_CD = GPL.SOPMAL_CD @@ -5502,7 +5503,7 @@ AND FOS.ORDR_INNB = FO.ORDR_INNB WHERE FO.USE_AT = 'Y' AND FO.SUBSVC_AT = 'Y' /*구독서비스*/ - AND ( ( FO.ORDR_STTUS_CD BETWEEN '15' AND '75' ) OR FO.ORDR_STTUS_CD = '95' ) + AND FO.ORDR_STTUS_CD BETWEEN '15' AND '95' AND FO.SOPMAL_CD = #{sopmalCd} AND FO.MBR_DV_CD = #{mbrDvCd} AND FO.MBR_INNB = #{mbrInnb} @@ -5510,12 +5511,6 @@ ) TB WHERE (@rownum:=0) = 0 ]]> - - ) PV - LIMIT #{recordCountPerPage} OFFSET #{firstIndex} - - - AND ( TB.ORDR_INNB LIKE CONCAT('%', #{srchwrd}, '%') OR @@ -5525,8 +5520,9 @@ AND TB.ORDR_RCEPT_DT BETWEEN DATE(#{bgnDt}) AND DATE(#{endDt}) + 1 - - + ) PV + LIMIT #{recordCountPerPage} OFFSET #{firstIndex} + diff --git a/src/main/resources/mybatis/xml/mapper/gcone/ordr/rtngudrefnd/BORtngudrefndMapper.xml b/src/main/resources/mybatis/xml/mapper/gcone/ordr/rtngudrefnd/BORtngudrefndMapper.xml index bf08a05d..79f0e75a 100644 --- a/src/main/resources/mybatis/xml/mapper/gcone/ordr/rtngudrefnd/BORtngudrefndMapper.xml +++ b/src/main/resources/mybatis/xml/mapper/gcone/ordr/rtngudrefnd/BORtngudrefndMapper.xml @@ -363,7 +363,7 @@ INNER JOIN GC_ORDER O ON RE.SOPMAL_CD = O.SOPMAL_CD -- 쇼핑몰 코드 AND RE.ORDR_INNB = O.ORDR_INNB -- 주문 고유번호 - AND O.SUBSVC_AT = 'N' /*구독상품 제외*/ + /*AND O.SUBSVC_AT = 'N'*/ /*구독상품 제외*/ ]]> diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListR.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListR.jsp index 82ff3fab..c7e83de3 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListR.jsp @@ -21,7 +21,7 @@
', '');" class="orderList__orderNum"> · - · ${order.ordrTyCdNm} + · 구독서비스
', '');" class="orderList__productTitle"> <%----%> @@ -49,6 +49,9 @@ + + +
diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListRForm.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListRForm.jsp index 3476d80f..36672ab1 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListRForm.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListRForm.jsp @@ -15,6 +15,7 @@ ------- -------- --------------------------- 2026-01-22 전준석 최초 생성 2026-02-05 이대환 내용 수정 + 2026-02-26 jazz 내용 수정 --%> @@ -1046,7 +1047,7 @@
-

구독서비스 주문/배송조회

+

구독서비스 진행 현황