From f1bbe7b07c4f06833dfc11cacfbfed3c90672a31 Mon Sep 17 00:00:00 2001 From: jazz Date: Thu, 26 Feb 2026 14:11:35 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=EB=A7=88=EC=9D=B4=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=EB=B0=98=ED=92=88=ED=99=98=EB=B6=88=20=EC=9B=90?= =?UTF-8?q?=ED=99=94=EA=B8=88=EC=95=A1=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml | 14 +++++--------- .../gcone/ordr/rtngudrefnd/BORtngudrefndMapper.xml | 2 +- .../sopmal/mpage/ordr/SubsvcOrdrDlvyListR.jsp | 5 ++++- .../sopmal/mpage/ordr/SubsvcOrdrDlvyListRForm.jsp | 3 ++- .../views/sopmal/mpage/ordr/SubsvcOrdrDtlR.jsp | 3 ++- .../mpage/ordr/SubsvcOrdrDlvyListRForm.jsp | 4 ++-- .../views/sopmal_m/mpage/ordr/SubsvcOrdrDtlR.jsp | 3 ++- 7 files changed, 18 insertions(+), 16 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 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 @@
-

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

+

구독서비스 진행 현황

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 6176b64c..5213d55d 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 @@ -7,6 +7,7 @@ <%@ taglib prefix="f" uri="/WEB-INF/tlds/f.tld"%> + <%-- Class Name : OrdrDtlR.jsp Description : 구독서비스 주문/배송 상세조회 @@ -1412,7 +1413,7 @@ 결제금액 - ${curUnit} + ${curUnit} / ${setle.wonSetleAmt}${krUnit} <%--주문취소시 미노출--%> diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDlvyListRForm.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDlvyListRForm.jsp index b81ceda7..9190ed7d 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDlvyListRForm.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDlvyListRForm.jsp @@ -31,7 +31,7 @@ * 초기 설정 **********************************************************/ const fn_init = function() { - $('.header').find('h1.header__title').text('구독서비스 주문/배송'); + $('.header').find('h1.header__title').text('구독서비스 진행 현황'); fn_get_ordr_dlvy_list(1); } @@ -142,7 +142,7 @@ div += '
'; div += '
'; div += ' '+ row.ordrDt +'(' + row.ordrInnb +') '; - div += ' · ' + row.ordrTyCdNm; + div += ' · 구독서비스'; div += ' '; div += ' 상세보기'; div += '
'; 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 83089c17..208be036 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 @@ -8,6 +8,7 @@ + @@ -1013,7 +1014,7 @@ 결제금액 - ${curUnit} + ${curUnit} / ${setle.setleAmt}${krUnit} <%--주문취소시 미노출--%> style="border-bottom: 0.5px solid #e9ecef;">