fix : 마이페이지 반품/교환/취소 상세조회

src/main/resources/mybatis/xml/mapper/gcone/ordr/rtngudrefnd/BORtngudrefndMapper.xml

@@ -326,12 +326,11 @@
 	<sql id="mbrRefundListWhere">
 		<![CDATA[
 			WHERE 1=1
-		]]>
-		<![CDATA[
 				AND RE.SOPMAL_CD = #{sopmalCd}
 				AND O.MBR_DV_CD = #{mbrDvCd}
 				AND O.MBR_INNB = #{mbrInnb}
 				AND RE.USE_AT = 'Y'
+				AND RE.REFUND_PROCS_STTUS_CD = '03'		/*환불완료*/
 		]]>
 			<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(srchwrd)">
 				AND (
@@ -364,6 +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'		/*구독상품 제외*/
 		]]>
 	</sql>
 
@@ -854,6 +854,42 @@
 						         END + (REI.REFUND_MLG_AMT + REI.REFUND_MLG_RMNDR_AMT) + (REI.REFUND_CASH_AMT + REI.REFUND_CASH_RMNDR_AMT)))
 			 , 0) AS RL_REFUND_AMT        -- 마일리지, 배송비 제외한 실 환불 금액
 			 , IFNULL(
+               ROUND(CASE
+								 WHEN RE.REFUND_TY_CD = '01' THEN RE.REFUND_AMT + RE.REFUND_DLVY_AMT
+								 WHEN RE.REFUND_TY_CD = '02' THEN
+									 CASE
+										 WHEN RE.RETURN_DLVY_PYMNT_TY_CD = '02' THEN
+																					   CASE
+																						   WHEN RE.RETURN_DLVY_RSPNSBL_CD = '01' THEN GREATEST(RE.REFUND_AMT - IFNULL(RE.DLVY_AMT_REFUND_AMT, 0), 0)
+																						   WHEN RE.RETURN_DLVY_RSPNSBL_CD = '02' THEN GREATEST(RE.REFUND_AMT + IFNULL(RE.REFUND_DLVY_AMT, 0), 0)
+																					   END
+										 ELSE
+											 CASE
+												 WHEN RE.RETURN_DLVY_RSPNSBL_CD = '01' THEN RE.REFUND_AMT
+												 WHEN RE.RETURN_DLVY_RSPNSBL_CD = '02' THEN GREATEST(RE.REFUND_AMT + IFNULL(RE.REFUND_DLVY_AMT, 0), 0)
+											 END
+										 END
+						         END)
+			 , 0) AS REAL_REFUND_AMT        -- 마일리지, 쿠폰, 캐시를 제외한 실 환불 금액
+			 , IFNULL(
+				ROUND(CASE
+						  WHEN RE.REFUND_TY_CD = '01' THEN RE.WON_REFUND_AMT + RE.WON_REFUND_DLVY_AMT
+						  WHEN RE.REFUND_TY_CD = '02' THEN
+							  CASE
+								  WHEN RE.RETURN_DLVY_PYMNT_TY_CD = '02' THEN
+									  CASE
+										  WHEN RE.RETURN_DLVY_RSPNSBL_CD = '01' THEN GREATEST(RE.WON_REFUND_AMT - IFNULL(RE.WON_DLVY_AMT_REFUND_AMT, 0), 0)
+										  WHEN RE.RETURN_DLVY_RSPNSBL_CD = '02' THEN GREATEST(RE.WON_REFUND_AMT + IFNULL(RE.WON_REFUND_DLVY_AMT, 0), 0)
+										  END
+								  ELSE
+									  CASE
+										  WHEN RE.RETURN_DLVY_RSPNSBL_CD = '01' THEN RE.WON_REFUND_AMT
+										  WHEN RE.RETURN_DLVY_RSPNSBL_CD = '02' THEN GREATEST(RE.WON_REFUND_AMT + IFNULL(RE.WON_REFUND_DLVY_AMT, 0), 0)
+										  END
+								  END
+					END)
+			, 0) AS REAL_WON_REFUND_AMT        -- 마일리지, 쿠폰, 캐시를 제외한 실 환불 금액
+			 , IFNULL(
 		             ROUND((CASE
 								 WHEN RE.REFUND_TY_CD = '01' THEN 0
 								 WHEN RE.REFUND_TY_CD = '02' THEN

src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/RtngudCanclRefndDtlR.jsp

@@ -165,6 +165,7 @@
             <div class="sub-rl">
                 <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"/>
                 <%-- 마이페이지 Left 영역 --%>
                 <jsp:include page="/WEB-INF/views/comm/mpage/MypageLeft.jsp"/>
                 <div class="sub-right-content">
@@ -758,8 +759,7 @@
                                         </span>
                                     </div>
                                     <div class="priceSum__operator">
-                                        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"
+                                        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
-                                             viewBox="0 0 16 16" fill="none">
                                             <g clip-path="url(#clip0_160_29539)">
                                                 <path
                                                         d="M8.99824 7.00176V0H7.00176V7.00176H0V8.99824H7.00176V16H8.99824V8.99824H16V7.00176H8.99824Z"
@@ -854,14 +854,24 @@
                                             <path d="M3.5 8.16699H24.5V10.5003H3.5V8.16699Z" fill="black" />
                                         </svg>
                                     </div>
-                                    <div class="priceSum__total">
+                                    <div class="priceSum__item priceSum__item--misc" style="align-items: unset;">
-                                        <span class="priceSum__totalTitle">환불 금액</span>
+                                        <div class="priceSum__total">
-                                        <div class="priceSum__totalPrice">
+                                            <span class="priceSum__totalTitle">총 환불금액</span>
-                                            <span class="comma"><c:out value="${ reTotAmt.rlRefundAmt }"/></span>
+                                            <div class="priceSum__itemPrice">
-                                            <span class="priceUnit">${curUnit}</span>
+                                                <span class="comma"><c:out value="${ reTotAmt.rlRefundAmt }"/></span>
+                                                <span class="priceUnit">${curUnit}</span>
+                                            </div>
                                         </div>
-                                        <div class="priceSum__totalDetail">
+                                        <div class="priceSum__total">
-                                            (상품금액 <span class="comma"><c:out value="${ reTotAmt.refundAmtQySum }"/></span>${curUnit} + 배송비 <span class="comma"><c:out value="${ reTotAmt.rlDlvyAmt }"/></span>${curUnit})
+                                            <span class="priceSum__totalTitle">실 환불금액</span>
+                                            <div class="priceSum__totalPrice">
+                                                <span class="comma"><c:out value="${ reTotAmt.rlRefundAmt }"/></span>
+                                                <span class="priceUnit">${curUnit}</span>
+                                            </div>
+                                            <span class="priceSum__itemPrice">
+                                                [<span class="comma"><c:out value="${ reTotAmt.realWonRefundAmt }"/></span>
+                                                <span class="priceUnit">${krUnit}</span>]
+                                            </span>
                                         </div>
                                     </div>
                                 </div>

src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/RtngudCanclRefndDtlR.jsp

@@ -200,6 +200,7 @@
                     <div class="sub-page">
                         <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"/>
                         <div class="orderDetail">
                             <c:if test="${ not empty resultMap.result.refnd.refundComptDt }">
                                 <div class="detailTop">
@@ -686,6 +687,12 @@
                                                             <span class="comma"><c:out value="${ reTotAmt.rlRefundAmt }"/></span>${curUnit}
                                                         </td>
                                                     </tr>
+                                                    <tr>
+                                                        <th>실 환불금액</th>
+                                                        <td>
+                                                            <span class="comma"><c:out value="${ reTotAmt.realRefundAmt }"/></span>${curUnit} [<span class="comma"><c:out value="${ reTotAmt.realWonRefundAmt }"/></span>${krUnit}]
+                                                        </td>
+                                                    </tr>
                                                     </tfoot>
                                                 </table>
                                             </div>