Merge remote-tracking branch 'origin/master'

fix : 마이페이지 반품환불 원화금액 추가
2026-02-26 14:11:50 +09:00 · 2026-02-26 14:11:35 +09:00
7 changed files with 18 additions and 16 deletions
--- 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
        ]]>
-        <include refid="mbrOrdrSubsvcListWhere"/>
-        ) PV
-        LIMIT #{recordCountPerPage} OFFSET #{firstIndex}
-    </select>
-
-    <sql id="mbrOrdrSubsvcListWhere">
        <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(srchwrd)">
            AND (
            TB.ORDR_INNB LIKE CONCAT('%', #{srchwrd}, '%') OR
@@ -5525,8 +5520,9 @@
        <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(bgnDt) and @com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(endDt)">
            AND TB.ORDR_RCEPT_DT BETWEEN DATE(#{bgnDt}) AND DATE(#{endDt}) + 1
        </if>
-    </sql>
-
+        ) PV
+        LIMIT #{recordCountPerPage} OFFSET #{firstIndex}
+    </select>
 </mapper>


--- 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'*/		/*구독상품 제외*/
 		]]>
 	</sql>

--- 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 @@
                        <div class="orderList__item__top">
                            <a href="javascript:void(0);" onclick="fn_go_subsvc_dtl('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>');" class="orderList__orderNum"><c:out value="${order.ordrInnb}"/></a>
                            <span class="orderList__dot">·</span>
-                            <span class="orderList__date"><c:out value="${order.ordrDt}"/> <span class="orderList__dot">·</span> ${order.ordrTyCdNm}</span>
+                            <span class="orderList__date"><c:out value="${order.ordrDt}"/> <span class="orderList__dot">·</span> 구독서비스</span>
                        </div>
                        <a href="javascript:void(0);" onclick="fn_go_subsvc_dtl('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>');" class="orderList__productTitle"><c:out value="${order.goodsNm}"/></a>
                        <%--<span class="orderList__option"><c:out value="${order.optnNm}"/></span>--%>
@@ -49,6 +49,9 @@
                            <c:when test="${order.ordrSttusCd == 75}">
                                <span class="orderList__status complete"><c:out value="${order.ordrSttusNm}"/></span>
                            </c:when>
+                            <c:when test="${order.ordrSttusCd >= 85}">
+                                <span class="orderList__status cancel"><c:out value="${order.ordrSttusNm}"/></span>
+                            </c:when>
                        </c:choose>
                        <c:if test="${ order.ordrTyCd == '04'}">
                            <br/>
--- 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 내용 수정
 --%>
 <!DOCTYPE html>
 <html lang="ko">
@@ -1046,7 +1047,7 @@
                    </div>

                        <div class="sub-right-content__section">
-                            <h3 class="sub-right-content__title">구독서비스 주문/배송조회</h3>
+                            <h3 class="sub-right-content__title">구독서비스 진행 현황</h3>
                            <form id="condForm">
                                <input type="hidden" name="pageIndex" id="pageIndex" value="1">
                                <div class="customer-search">
--- 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"%>

 <spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
+<spring:eval expression="@environment.getProperty('currency-unit.KR')" var="krUnit"/>
 <%--
    Class Name : OrdrDtlR.jsp
    Description : 구독서비스 주문/배송 상세조회
@@ -1412,7 +1413,7 @@
                                                </c:if>
                                                <tr>
                                                    <th>결제금액</th>
-                                                    <td><span class="comma"><fmt:formatNumber value="${setle.setleAmt}" pattern="#,###"/></span>${curUnit}</td>
+                                                    <td><span class="comma"><fmt:formatNumber value="${setle.setleAmt}" pattern="#,###"/></span>${curUnit} / <span class="comma">${setle.wonSetleAmt}</span>${krUnit}</td>
                                                </tr>
                                                <c:if test = "${order.ordrSttusCd ne '85' && order.ordrSttusCd ne '95'}"><%--주문취소시 미노출--%>
                                                    <tr>
--- 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 class="orderListItem">';
                    div += '        <div class="orderListItem__top">';
                    div += '            <span class="orderListItem__top__date"><span class="misc">'+ row.ordrDt +'(' + row.ordrInnb +') ';
-                    div += '            <span className="orderList__dot">·</span> ' + row.ordrTyCdNm;
+                    div += '            <span className="orderList__dot">·</span> 구독서비스';
                    div += '            </span></span>';
                    div += '            <a href="javascript:void(0);" onclick="fn_go_subsvc_dtl(\'' + row.sopmalCd + '\', \'' + row.ordrInnb + '\');" class="orderListItem__top__more">상세보기</a>';
                    div += '        </div>';
--- 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 @@

 <spring:eval expression="@environment.getProperty('sopmalfo.common.fileupload.cdnurl')" var="cdnurl"/>
 <spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
+<spring:eval expression="@environment.getProperty('currency-unit.KR')" var="krUnit"/>
 <!DOCTYPE html>
 <html lang="ko">
 <head>
@@ -1013,7 +1014,7 @@
                                                    </c:if>
                                                    <tr>
                                                        <th>결제금액</th>
-                                                        <td><span class="comma"><fmt:formatNumber value="${setle.setleAmt}" pattern="#,###"/></span>${curUnit}</td>
+                                                        <td><span class="comma"><fmt:formatNumber value="${setle.setleAmt}" pattern="#,###"/></span>${curUnit} / <span class="comma">${setle.setleAmt}</span>${krUnit}</td>
                                                    </tr>
                                                    <c:if test = "${order.ordrSttusCd ne '85' && order.ordrSttusCd ne '95'}"><%--주문취소시 미노출--%>
                                                        <tr <c:if test = "${empty setle.issuSttusCd}">style="border-bottom: 0.5px solid #e9ecef;"</c:if>>
Author	SHA1	Message	Date
jazz	b4d9aeba48	Merge remote-tracking branch 'origin/master'	2026-02-26 14:11:50 +09:00
jazz	f1bbe7b07c	fix : 마이페이지 반품환불 원화금액 추가	2026-02-26 14:11:35 +09:00