fix : 마이페이지 구독서비스 목록/상세 수정

src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/service/BOOrdrService.java

@@ -2013,6 +2013,8 @@ public class BOOrdrService{
 
         List<DataMap> mlgAccmlNtcList = purchsMapper.selectMlgAccmlNtcList(purchsrVO);
 
+        /*구독 취소*/
+
         content.put("order", ordrDtl);
         content.put("goodsList", goodsList);
         content.put("shippingList", shippingList);

src/main/java/com/wb/domainserver/domain/sopmal/mpage/ordr/controller/MyOrdrController.java

@@ -228,10 +228,12 @@ public class MyOrdrController {
      */
     @Policy(AuthPolicy.RESTRICTED)
     @RequestMapping(value="/selectMbrSubsvcOrdrDtlInqire")
-    public String selectMbrSubsvcOrdrDtlInqire(HttpServletRequest request, ModelMap model, BOOrdrDlvyVO ordrDlvyVO, BOMbrVO vo) throws Exception {
+    public String selectMbrSubsvcOrdrDtlInqire(HttpServletRequest request, ModelMap model, BOOrdrDlvyVO ordrDlvyVO, BOMbrVO vo, BORtngudrefndVO boRtngudrefndVO) throws Exception {
+        boRtngudrefndVO.setServerDv("sopmal");
         AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
         if ("01".equals(user.getSysDvCd())) {
             ordrDlvyVO.setSopmalCd(user.getSopmalCd());
+            boRtngudrefndVO.setSopmalCd(user.getSopmalCd());
         }
         Map<String, Object> message = boOrdrService.selectMbrOrdrDtlInqire(ordrDlvyVO);
         /**발급대상구분코드*/
@@ -248,6 +250,13 @@ public class MyOrdrController {
 //        );
         model.addAttribute("paramVO", new ObjectMapper().writeValueAsString(ordrDlvyVO));
         model.addAttribute("vo", ordrDlvyVO);
+        /**환불내역이 있으면 정보조회*/
+        if(message.get("order") != null && !"".equals(((DataMap)message.get("order")).get("orderReInnb"))){
+            boRtngudrefndVO.setOrderReInnb((String)((DataMap)message.get("order")).get("orderReInnb"));
+            Map<String, Object> refund = new HashMap<String, Object>();
+            refund.put("result", boRtngudrefndService.selectBORtngudRefndDtlInqire(boRtngudrefndVO));
+            model.addAttribute("resultMap", refund);
+        }
 
         // 마이페이지 > 상단 회원 정보 ( 등금, 이름, 마일리지, 쿠폰, 위시리스트, 배송중, 등급산정기준 )
         Map<String, Object> content = selectBOMpageInfoInqire(vo);

src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml

@@ -997,6 +997,7 @@
              , IFNULL(FOI.MLG_AMT, 0) AS MLG_AMT
              , IFNULL(FOS.DLVY_AMT, 0) AS DLVY_AMT
              , IFNULL(FO.RL_SETLE_AMT, 0) AS SETLE_AMT
+             , ROUND(FO.WON_RL_SETLE_AMT) AS WON_RL_SETLE_AMT
           FROM (
                SELECT FOI.SOPMAL_CD
                     , FOI.ORDR_INNB
@@ -1484,6 +1485,12 @@
               END AS SALES_POSBLE_REGIST_AT /* 현금영수증 신청 가능 여부 */
             , IF(FO.SMRT_SHOPNG_ORDRNB IS NOT NULL AND FO.SMRT_SHOPNG_ORDRNB != '0', FO.SMRT_SHOPNG_ORDRNB, NULL) AS SMRT_SHOPNG_ORDRNB
             , CONCAT(SP.SOPMAL_NM, ' ', STR.STR_NM) AS STR_NM
+            , (SELECT MAX(CAST(GOR.ORDER_REFUND_INNB AS CHAR))
+               FROM GC_ORDER_REFUND GOR
+               WHERE GOR.SOPMAL_CD = FO.SOPMAL_CD
+                 AND GOR.ORDR_INNB = FO.ORDR_INNB
+                 AND GOR.USE_AT = 'Y'
+                 AND GOR.REFUND_PROCS_STTUS_CD = '03'	/*처리상태:환불완료*/) AS ORDER_RE_INNB
           FROM GC_ORDER FO
     INNER JOIN (
                SELECT FOI.SOPMAL_CD
@@ -2505,7 +2512,7 @@
                  WHEN FOS.PG_CMPNY_NM = 'kcp' THEN GPL.KCP_MID
                  ELSE GPL.OLD_TOSS_MID
                 END AS MID
-             , FOS.WON_SETLE_AMT
+             , ROUND(FOS.WON_SETLE_AMT)                 AS WON_SETLE_AMT
           FROM GC_ORDER_SETLE FOS
                   INNER JOIN GC_PAY_LINK GPL
             ON FOS.SOPMAL_CD = GPL.SOPMAL_CD
@@ -5373,7 +5380,14 @@
     <!-- 사용자 > 마이페이지 > 구독서비스 주문/배송 목록 조회 -->
     <select id="selectMbrSubsvcOrdrList" parameterType="com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrDlvyVO" resultType="dataMap">
         <![CDATA[
-            SELECT *
+            SELECT PV.*
+                        , (SELECT MAX('구독취소')
+                           FROM GC_ORDER_REFUND GOR
+                           WHERE GOR.SOPMAL_CD = PV.SOPMAL_CD
+                             AND GOR.ORDR_INNB = PV.ORDR_INNB
+                             AND GOR.USE_AT = 'Y'
+                             AND GOR.REFUND_PROCS_STTUS_CD = '03'	/*처리상태:환불완료*/
+                             AND GOR.REFUND_TY_CD != '01'	/*환불구분:결제취소가 아님*/) AS REFUND_STTUS_NM
               FROM (
                    SELECT CAST(@ROWNUM:=@ROWNUM + 1 AS UNSIGNED) AS RNUM
                         , TB.*

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>
 

src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.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 : 마이페이지 주문/배송조회
@@ -1625,7 +1626,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>
@@ -1646,45 +1647,6 @@
                                                         </td>
                                                     </tr>
                                                 </c:if>
-                                                <c:if test="${setle.reqstDvCd ne '04'}">
-                                                    <c:if test="${not empty setle.issuSttusCd && order.ordrSttusCd ne '85' && order.ordrSttusCd ne '95'}">
-                                                        <tr>
-                                                            <th>현금영수증</th>
-                                                            <td>
-                                                                <c:choose>
-                                                                    <c:when test="${order.salesPosbleRegistAt eq 'N'}">
-                                                                        <span class="orderDetail__waiting"><c:out value="${setle.crtnb eq '0100001234' ? '미신청' : setle.crtnb}"/></span>
-                                                                        <button type="button" class="btn xsm gray2" onclick="fn_regist_popopen('<c:out value="${setle.selngPrufInnb}"/>','update');">정보수정</button>
-                                                                    </c:when>
-                                                                    <c:when test="${order.salesPosbleRegistAt eq 'Y' && setle.crtnb eq '0100001234'}">
-                                                                        <span class="orderDetail__waiting">미신청</span>
-                                                                        <button type="button" class="btn xsm gray2" onclick="fn_regist_popopen('<c:out value="${setle.selngPrufInnb}"/>','regist');">신청하기</button>
-                                                                    </c:when>
-                                                                    <c:otherwise>
-                                                                        <span class="orderDetail__waiting" id='ctrnb'><script>$("#ctrnb").text('${setle.issuSttusNm} ('+fn_format_mbtlnb('${setle.crtnb}')+')');</script></span>
-                                                                        <span class="orderDetail__deduction"><c:out value="${setle.issuTrgetDvCd eq '01' ? '개인소득공제' : '사업자지출증빙'}"/></span>
-                                                                        <c:if test="${ !empty setle.cshRciptDelngNb }">
-                                                                            <%-- 현:현금영수증 --%>
-                                                                            <button type="button" class="btn xsm gray2" onclick="fn_open_selng_pruf_inqire_modal(
-                                                                                    '<c:out value="${ setle.sopmalCd }" />'
-                                                                                    ,'<c:out value="${ setle.pgInnb }" />'
-                                                                                    ,'<c:out value="${ setle.pgCmpnyNm }" />'
-                                                                                    ,'<c:out value="${ setle.cshRciptDelngNb }" />'
-                                                                                    ,'<c:out value="${ setle.reqstDvCd }" />'
-                                                                                    ,'<c:out value="${ setle.setleTyCd }" />'
-                                                                                    ,'<c:out value="${ setle.ordrSetleInnb }" />'
-                                                                                    ,'<c:out value="${ setle.ordrInnb }" />'
-                                                                                    ,'<c:out value="${ setle.mid }" />'
-                                                                                    ,'<fmt:parseNumber value="${ setle.setleAmt }"/>'); return false;">
-                                                                                보기
-                                                                            </button>
-                                                                        </c:if>
-                                                                    </c:otherwise>
-                                                                </c:choose>
-                                                            </td>
-                                                        </tr>
-                                                    </c:if>
-                                                </c:if>
                                                 </tbody>
                                             </table>
                                         </c:forEach>
@@ -1731,7 +1693,7 @@
                                     </ul>
                                     <div class="cartOrderBox__total">
                                         <span class="cartOrderBox__totalTh">결제금액</span>
-                                        <span class="cartOrderBox__totalTd"><span class="comma"><fmt:formatNumber value="${total.setleAmt}" pattern="#,###"/></span><span class="priceUnit">${curUnit}</span></span>
+                                        <span class="cartOrderBox__totalTd"><span class="comma"><fmt:formatNumber value="${total.setleAmt}" pattern="#,###"/></span><span class="priceUnit">${curUnit}</span> / <span class="comma">${total.wonRlSetleAmt}</span><span class="priceUnit">${krUnit}</span></span>
                                     </div>
                                 </div>
                             </div>

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

@@ -12,10 +12,8 @@
         <c:forEach var="order" items="${data.resultList}">
         <div class="orderList__item">
             <div class="orderList__item__inner">
-                <a href="<c:url value="/sopmal/goods/selectGoodsDtl?sopmalCd=${order.sopmalCd}&goodsInnb=${order.goodsInnb}"/>" class="orderList__image">
+                <spring:eval expression="@environment.getProperty('sopmalfo.common.fileupload.cdnurl')" var="cdnurl"/>
-                    <spring:eval expression="@environment.getProperty('sopmalfo.common.fileupload.cdnurl')" var="cdnurl"/>
+                <img src="<c:out value="${ cdnurl }${order.goodsImageUrl}"/>" onerror="this.src='/pc/images/image_placeholder.png'" alt="<c:out value="${order.goodsNm}"/>">
-                    <img src="<c:out value="${ cdnurl }${order.goodsImageUrl}"/>" onerror="this.src='/pc/images/image_placeholder.png'" alt="<c:out value="${order.goodsNm}"/>">
-                </a>
                 <div class="orderList__description">
                     <div class="orderList__description__first">
                         <div class="orderList__item__top">
@@ -24,34 +22,32 @@
                             <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>--%>
-                        <span class="cartItem__productOption"><span class="option-badge">옵션</span> <c:out value="${order.optnNm}"/></span>
-                        <c:if test="${not empty order.inputOptnText}">
-                            <span class="orderList__option"><c:out value="${order.inputOptnText}"/></span>
-                        </c:if>
                     </div>
                     <div class="orderList__description__second">
                         <span class="orderList__price"><span class="comma"><fmt:formatNumber value="${order.setleAmt}" pattern="#,###"/></span>${curUnit}</span>
                     </div>
-<%--                    <div class="orderList__description__third">--%>
-<%--                        <c:if test = "${!(order.ordrSttusCd > 84 && order.ordrSttusCd < 100)}">--%>
-<%--                        <span class="orderList__mileage"><span class="comma">예상적립 <fmt:formatNumber value="${order.mlgAmt}" pattern="#,###"/></span>점</span>--%>
-<%--                        </c:if>--%>
-<%--                    </div>--%>
                     <div class="orderList__description__fourth">
                         <c:choose>
-                            <c:when test="${order.ordrSttusCd > 14 && order.ordrSttusCd < 36}">
+                            <%--구독취소가 아닌경우--%>
-                                <span class="orderList__status"><c:out value="${order.ordrSttusNm}"/></span>
+                            <c:when test="${order.refundSttusNm == null || order.refundSttusNm == ''}">
-                            </c:when>
+                                <c:choose>
-                            <c:when test="${order.ordrSttusCd > 39 && order.ordrSttusCd < 71}">
+                                    <c:when test="${order.ordrSttusCd > 14 && order.ordrSttusCd < 36}">
-                                <span class="orderList__status delivery"><c:out value="${order.ordrSttusNm}"/></span>
+                                        <span class="orderList__status"><c:out value="${order.ordrSttusNm}"/></span>
-                            </c:when>
+                                    </c:when>
-                            <c:when test="${order.ordrSttusCd == 75}">
+                                    <c:when test="${order.ordrSttusCd > 39 && order.ordrSttusCd < 71}">
-                                <span class="orderList__status complete"><c:out value="${order.ordrSttusNm}"/></span>
+                                        <span class="orderList__status delivery"><c:out value="${order.ordrSttusNm}"/></span>
-                            </c:when>
+                                    </c:when>
-                            <c:when test="${order.ordrSttusCd >= 85}">
+                                    <c:when test="${order.ordrSttusCd == 75}">
-                                <span class="orderList__status cancel"><c:out value="${order.ordrSttusNm}"/></span>
+                                        <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:when>
+                            <c:otherwise>
+                                <span class="orderList__status cancel"><c:out value="${order.refundSttusNm}"/></span>
+                            </c:otherwise>
                         </c:choose>
                         <c:if test="${ order.ordrTyCd == '04'}">
                             <br/>
@@ -71,43 +67,6 @@
                             </c:choose>
                         </c:if>
                     </div>
-<%--                    <div class="orderList__btnControls">--%>
-<%--                        <c:choose>--%>
-<%--                            <c:when test="${order.ordrSttusCd == 15}">--%>
-<%--                                <a href="javascript:void(0);" onclick="fn_post_cancl_ordr('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '<c:out value="${order.ordrSttusCd}"/>');" class="btn-ordr-sttus btn gray sm full">주문취소</a>--%>
-<%--                                <c:if test="${ order.ordrTyCd != '05' }">--%>
-<%--                                    <a href="javascript:void(0);" onclick="fn_dlvylc_manage_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '<c:out value="${order.ordrDlvyInnb}"/>', '<c:out value="${order.mbrInnb}"/>', '<c:out value="${order.mbrDvCd}"/>');" class="btn-ordr-sttus btn outline sm full">배송지 변경</a>--%>
-<%--                                </c:if>--%>
-<%--                            </c:when>--%>
-<%--                            <c:when test="${order.ordrSttusCd > 24 && order.ordrSttusCd < 34}">--%>
-<%--                                <a href="javascript:void(0);" onclick="fn_call_setle_cancl_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '', '<c:out value="${order.ordrRceptDt}"/>', '<c:out value="${order.ordrSttusCd}"/>');" class="btn-ordr-sttus btn gray sm full">결제취소</a>--%>
-<%--                                <c:if test="${ order.ordrTyCd != '05' }">--%>
-<%--                                    <a href="javascript:void(0);" onclick="fn_dlvylc_manage_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '<c:out value="${order.ordrDlvyInnb}"/>', '<c:out value="${order.mbrInnb}"/>', '<c:out value="${order.mbrDvCd}"/>');" class="btn-ordr-sttus btn outline sm full">배송지 변경</a>--%>
-<%--                                </c:if>--%>
-<%--                            </c:when>--%>
-
-<%--                            <c:when test="${order.ordrSttusCd > 34 && order.ordrSttusCd < 55}">--%>
-<%--                                <a href="javascript:void(0);" onclick="fn_call_dlvy_sweettracker_pop('<c:out value="${order.ordrInnb}"/>');" class="btn outline sm full">배송조회</a>--%>
-<%--                                <a href="javascript:void(0);" onclick="fn_call_setle_cancl_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '', '<c:out value="${order.ordrRceptDt}"/>', '<c:out value="${order.ordrSttusCd}"/>');" class="btn-ordr-sttus btn gray sm full">결제취소</a>--%>
-<%--                            </c:when>--%>
-<%--                            <c:when test="${order.ordrSttusCd > 54 && order.ordrSttusCd < 76 && order.sknEnvrnCd ne 'POS'}">--%>
-<%--                                <a href="javascript:void(0);" onclick="fn_call_dlvy_sweettracker_pop('<c:out value="${order.ordrInnb}"/>');" class="btn outline sm full">배송조회</a>--%>
-<%--                                <c:if test="${ order.purchsDcsnAt eq 'Y' }">--%>
-<%--&lt;%&ndash;                                    <a href="javascript:void(0);" onclick="fn_call_refund_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>','<c:out value="${order.ordrRceptDt}"/>', '<c:out value="${order.setleTyCd}"/>', '<c:out value="${order.ordrSttusCd}"/>');" class="btn-ordr-sttus btn gray sm full">반품신청</a>&ndash;%&gt;--%>
-<%--                                    <a href="javascript:void(0);" onclick="fn_pop_m2mqna_regist('<c:out value="${order.ordrInnb}"/>');" class="btn-ordr-sttus btn gray sm full">반품신청</a>--%>
-<%--                                </c:if>--%>
-<%--                                <c:if test="${ order.reviewAt eq 'Y' }">--%>
-<%--                                    <a href="<c:url value="/sopmal/mpage/act/selectMyRvwInqireForm"/>" class="btn-ordr-sttus  btn theme sm  full">리뷰작성</a>--%>
-<%--                                </c:if>--%>
-<%--                                <c:if test="${ order.purchsDcsnAt eq 'Y' }">--%>
-<%--                                    <a href="javascript:void(0);" onclick="fn_post_purchs_dcsn_by_ordr('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>');" class="btn-ordr-sttus  btn theme sm  full">구매확정</a>--%>
-<%--                                </c:if>--%>
-<%--                            </c:when>--%>
-<%--                            <c:when test="${order.ordrSttusCd > 84 && order.ordrSttusCd < 100}">--%>
-<%--                                <a class="btn full orderList__status cancel" style="background-color:transparent;"><c:out value="${order.ordrSttusNm}"/></a>--%>
-<%--                            </c:when>--%>
-<%--                        </c:choose>--%>
-<%--                    </div>--%>
                 </div>
             </div>
         </div>

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

@@ -1132,6 +1132,359 @@
                             <c:set var="setle" value="${data.setleList[0]}" />
                             <c:set var="setleTyCd" value="${setle.setleTyCd}" />
                         </c:if>
+<%--환불 내역 시작--%>
+                        <c:if test="${order.orderReInnb != null && order.orderReInnb ne ''}">
+                            <div class="sub-right-content__section">
+                                <h3 class="sub-right-content__title"><c:if test = "${not empty resultMap.result.refnd.returnProcsSttusCd}">반품/</c:if>환불 내역</h3>
+                                <div class="sub-right-content__section">
+                                    <h3 class="orderDetail__title"><c:out value="${ resultMap.result.refnd.registDt }"/>
+                                        <span class="orderDetail__titleNum">
+                                        <c:choose>
+                                            <c:when test = "${not empty resultMap.result.refnd.returnProcsSttusCd}">
+                                                반품번호
+                                            </c:when>
+                                            <c:otherwise>
+                                                환불번호
+                                            </c:otherwise>
+                                        </c:choose>
+                                        <c:out value="${ resultMap.result.refnd.orderRefundInnb }"/>
+                                    </span>
+                                    </h3>
+                                </div>
+                            </div>
+                            <div class="sub-right-content__section">
+                                <h3 class="sub-right-content__innerTitle"><c:if test = "${not empty resultMap.result.refnd.returnProcsSttusCd}">반품/</c:if>환불 처리</h3>
+                                <div class="table-wrapper orderDetail__table">
+                                    <table class="table">
+                                        <caption>해당 테이블에 대한 설명</caption>
+                                        <!-- 각 열 width 설정 -->
+                                        <colgroup>
+                                            <col style="width: 220px;">
+                                            <col style="width: auto;">
+                                        </colgroup>
+                                        <tbody>
+                                        <tr>
+                                            <th><c:if test = "${not empty resultMap.result.refnd.returnProcsSttusCd}">반품/</c:if>환불 상태</th>
+                                            <td>
+                                                <c:choose>
+                                                    <c:when test="${ not empty resultMap.result.refnd.returnProcsSttusCd }">
+                                                        <c:out value="${ resultMap.result.refnd.returnProcsSttusCdNm }"/>
+                                                    </c:when>
+                                                    <c:otherwise>
+                                                        <c:out value="${ resultMap.result.refnd.refundProcsSttusCdNm }"/>
+                                                    </c:otherwise>
+                                                </c:choose>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th><c:if test = "${not empty resultMap.result.refnd.returnProcsSttusCd}">반품/</c:if>환불 번호</th>
+                                            <td><c:out value="${ resultMap.result.refnd.orderRefundInnb }"/></td>
+                                        </tr>
+                                        <tr>
+                                            <th>환불 종류</th>
+                                            <td><c:out value="${ resultMap.result.refnd.refundTyCdNm }"/></td>
+                                        </tr>
+                                        <c:if test = "${not empty resultMap.result.refnd.returnProcsSttusCd}">
+                                            <tr>
+                                                <th>반품 접수일</th>
+                                                <td><c:out value="${ resultMap.result.refnd.returnRceptDt }"/></td>
+                                            </tr>
+                                        </c:if>
+                                        <tr>
+                                            <th>환불 접수일</th>
+                                            <td><c:out value="${ resultMap.result.refnd.refundReqstDt }"/></td>
+                                        </tr>
+                                        <c:if test = "${not empty resultMap.result.refnd.returnComptDt}">
+                                            <tr>
+                                                <th>반품 완료일</th>
+                                                <td><c:out value="${ resultMap.result.refnd.returnComptDt }"/></td>
+                                            </tr>
+                                        </c:if>
+                                        <c:if test = "${not empty resultMap.result.refnd.refundComptDt}">
+                                            <tr>
+                                                <th>환불 완료일</th>
+                                                <td><c:out value="${ resultMap.result.refnd.refundComptDt }"/></td>
+                                            </tr>
+                                        </c:if>
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
+                            <c:if test="${ not empty resultMap.result.refnd.returnRceptDt }">
+                                <div class="sub-right-content__section">
+                                    <h3 class="sub-right-content__innerTitle">반품정보
+                                    </h3>
+                                    <form id="returnDlvyUpdtForm">
+                                        <input type="hidden" name="orderReInnb" value="<c:out value="${ resultMap.result.refnd.orderRefundInnb }"/>"/>
+                                        <div id="returnInfoContent01" class="table-wrapper orderDetail__table">
+                                            <table class="table">
+                                                <caption>해당 테이블에 대한 설명</caption>
+                                                <!-- 각 열 width 설정 -->
+                                                <colgroup>
+                                                    <col style="width: 220px;">
+                                                    <col style="width: auto;">
+                                                </colgroup>
+                                                <tbody>
+                                                <tr>
+                                                    <th>
+                                                        <span class="orderDetail__thText">회수방법</span>
+                                                    </th>
+                                                    <td>
+                                                        <c:out value="${ resultMap.result.refnd.returnMthCdNm }"/>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <th>
+                                                        <span class="orderDetail__thText">주소</span>
+                                                    </th>
+                                                    <td>
+                                                        <c:if test="${ not empty resultMap.result.refnd.senderZip }">
+                                                            (<c:out value="${ resultMap.result.refnd.senderZip }"/>)
+                                                        </c:if>
+                                                        <c:choose>
+                                                            <c:when test="${ resultMap.result.refnd.senderAdresDvCd eq '01'}">
+                                                                <c:out value="${ resultMap.result.refnd.senderRnmAdres }"/>
+                                                            </c:when>
+                                                            <c:when test="${ resultMap.result.refnd.senderAdresDvCd eq '02'}">
+                                                                <c:out value="${ resultMap.result.refnd.senderLnbAdres }"/>
+                                                            </c:when>
+                                                        </c:choose>
+                                                        <c:out value="${ resultMap.result.refnd.senderAdresDtl }"/>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <th>
+                                                        <span class="orderDetail__thText">휴대폰 번호</span>
+                                                    </th>
+                                                    <td>
+                                                        <c:out value="${ resultMap.result.refnd.returnCstmrMbtlnb }"/>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <th>
+                                                        <span class="orderDetail__thText">반품 사유</span>
+                                                    </th>
+                                                    <td>
+                                                        <c:out value="${ resultMap.result.refnd.returnResnCdNm }"/>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <th>
+                                                        <span class="orderDetail__thText">상세 사유</span>
+                                                    </th>
+                                                    <td>
+                                                        <c:out value="${ resultMap.result.refnd.returnResnCn }"/>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <th>
+                                                        <span class="orderDetail__thText">배송비 입금</span>
+                                                    </th>
+                                                    <td>
+                                                            <%--우리은행 1005-102-768159<br>(예금주: ㈜에스엘바이오텍)--%>
+                                                        <c:if test="${ not empty resultMap.result.refnd.returnDlvyRcpmnyAcntnb }">
+                                                            <c:out value="${ resultMap.result.refnd.returnDlvyRcpmnyAcntnb }"/><br>(예금주: <c:out value="${ resultMap.result.refnd.returnDlvyRcpmnyNm }"/>)
+                                                        </c:if>
+                                                    </td>
+                                                </tr>
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                    </form>
+                                </div>
+                            </c:if>
+                            <div class="sub-right-content__section">
+                                <h3 class="sub-right-content__innerTitle">환불정보</h3>
+                                <form id="refundAcntUpdtForm">
+                                    <input type="hidden" name="orderReInnb" value="<c:out value="${ resultMap.result.refnd.orderRefundInnb }"/>"/>
+                                    <div id="refundInfoContent01" class="table-wrapper orderDetail__table">
+                                        <table class="table">
+                                            <caption>해당 테이블에 대한 설명</caption>
+                                            <!-- 각 열 width 설정 -->
+                                            <colgroup>
+                                                <col style="width: 220px;">
+                                                <col style="width: auto;">
+                                            </colgroup>
+                                            <tbody>
+                                            <tr>
+                                                <th>
+                                                    <span class="orderDetail__thText">환불은행</span>
+                                                </th>
+                                                <td>
+                                                    <c:out value="${ resultMap.result.refnd.refundAcntBnnkNm }"/>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>
+                                                    <span class="orderDetail__thText">예금주</span>
+                                                </th>
+                                                <td>
+                                                    <c:out value="${ resultMap.result.refnd.refundAcntDpstrNm }"/>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>
+                                                    <span class="orderDetail__thText">계좌번호</span>
+                                                </th>
+                                                <td>
+                                                    <c:out value="${ resultMap.result.refnd.refundAcntnb }"/>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>
+                                                    <span class="orderDetail__thText">취소 사유</span>
+                                                </th>
+                                                <td>
+                                                    <c:out value="${ resultMap.result.refnd.returnResnCdNm }"/>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>
+                                                    <span class="orderDetail__thText">상세 사유</span>
+                                                </th>
+                                                <td>
+                                                    <c:out value="${ resultMap.result.refnd.returnResnCn }"/>
+                                                </td>
+                                            </tr>
+                                            </tbody>
+                                        </table>                                    </div>
+                                </form>
+                            </div>
+                            <div class="sub-right-content__section">
+                                <h3 class="sub-right-content__innerTitle">
+                                    환불 금액
+                                </h3>
+                                <div class="priceSum">
+                                    <c:set var="reTotAmt" value="${ resultMap.result.totRefundDscntAmt }"/>
+                                    <div class="priceSum__inner">
+                                        <div class="priceSum__item">
+                                            <span class="priceSum__itemTitle"><c:out value="${ reTotAmt.setleTyCdNm }"/></span>
+                                            <span class="priceSum__itemPrice">
+                                            <span class="comma priceSum__itemNum"><c:out value="${ reTotAmt.refundAmtQySum }"/></span>
+                                            <span class="priceUnit">${curUnit}</span>
+                                        </span>
+                                        </div>
+                                        <div class="priceSum__operator">
+                                            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" 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"
+                                                            fill="black" />
+                                                </g>
+                                                <defs>
+                                                    <clipPath id="clip0_160_29539">
+                                                        <rect width="16" height="16" fill="white" />
+                                                    </clipPath>
+                                                </defs>
+                                            </svg>
+                                        </div>
+                                        <div class="priceSum__item priceSum__item--misc">
+                                            <span class="priceSum__itemTitle">마일리지</span>
+                                            <span class="priceSum__itemPrice">
+                                            <span class="comma priceSum__itemNum"><c:out value="${ reTotAmt.totRefundMlgAmt }"/></span>
+                                            <span class="priceUnit">점</span>
+                                        </span>
+                                        </div>
+                                        <!-- 마이너스 -->
+                                        <!-- <div class="priceSum__operator">
+                                            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"
+                                                fill="none">
+                                                <path d="M16 7H0V9.00002H16V7Z" fill="black" />
+                                            </svg>
+                                        </div> -->
+                                        <div class="priceSum__operator">
+                                            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"
+                                                 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"
+                                                            fill="black" />
+                                                </g>
+                                                <defs>
+                                                    <clipPath id="clip0_160_29539">
+                                                        <rect width="16" height="16" fill="white" />
+                                                    </clipPath>
+                                                </defs>
+                                            </svg>
+                                        </div>
+                                        <div class="priceSum__item priceSum__item--misc">
+                                            <span class="priceSum__itemTitle">쿠폰</span>
+                                            <span class="priceSum__itemPrice">
+                                            <span class="comma priceSum__itemNum"><c:out value="${ reTotAmt.totRefundCouponAmt }"/></span>
+                                            <span class="priceUnit">${curUnit}</span>
+                                        </span>
+                                        </div>
+                                        <c:if test="${ reTotAmt.rlDlvyAmtRefundAmt > 0}">
+                                            <div class="priceSum__operator">
+                                                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"
+                                                     fill="none">
+                                                    <path d="M16 7H0V9.00002H16V7Z" fill="black" />
+                                                </svg>
+                                            </div>
+                                            <div class="priceSum__item priceSum__item--misc">
+                                                <span class="priceSum__itemTitle">반품배송비</span>
+                                                <span class="priceSum__itemPrice">
+                                                <span class="comma priceSum__itemNum"><c:out value="${ reTotAmt.rlDlvyAmtRefundAmt }"/></span>
+                                                <span class="priceUnit">${curUnit}</span>
+                                            </span>
+                                            </div>
+                                        </c:if>
+                                        <c:if test="${ reTotAmt.totReturnDlvyAmt > 0}">
+                                            <div class="priceSum__operator">
+                                                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"
+                                                     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"
+                                                                fill="black" />
+                                                    </g>
+                                                    <defs>
+                                                        <clipPath id="clip0_160_29539">
+                                                            <rect width="16" height="16" fill="white" />
+                                                        </clipPath>
+                                                    </defs>
+                                                </svg>
+                                            </div>
+                                            <div class="priceSum__item priceSum__item--misc">
+                                                <span class="priceSum__itemTitle">환불배송비</span>
+                                                <span class="priceSum__itemPrice">
+                                                <span class="comma priceSum__itemNum"><c:out value="${ reTotAmt.totReturnDlvyAmt }"/></span>
+                                                <span class="priceUnit">${curUnit}</span>
+                                            </span>
+                                            </div>
+                                        </c:if>
+                                        <div class="priceSum__equals">
+                                            <svg xmlns="http://www.w3.org/2000/svg" width="28" height="28"
+                                                 viewBox="0 0 28 28" fill="none">
+                                                <path d="M3.5 17.5H24.5V19.8333H3.5V17.5Z" fill="black" />
+                                                <path d="M3.5 8.16699H24.5V10.5003H3.5V8.16699Z" fill="black" />
+                                            </svg>
+                                        </div>
+                                        <div class="priceSum__item priceSum__item--misc" style="align-items: unset;">
+                                            <div class="priceSum__total">
+                                                <span class="priceSum__totalTitle">총 환불금액</span>
+                                                <div class="priceSum__itemPrice">
+                                                    <span class="comma"><c:out value="${ reTotAmt.rlRefundAmt }"/></span>
+                                                    <span class="priceUnit">${curUnit}</span>
+                                                </div>
+                                            </div>
+                                            <div class="priceSum__total">
+                                                <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>
+                                </div>
+                            </div>
+                        </c:if>
+<%--환불 내역 종료--%>
 
                         <div class="sub-right-content__section">
                             <h3 class="sub-right-content__title">구독서비스 주문상세내역</h3>
@@ -1141,7 +1494,7 @@
                                     <c:when test="${order.ordrSttusCd == 25}">
                                         <a href="javascript:void(0);" onclick="fn_call_setle_cancl_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '', '<c:out value="${setleDt}"/>', '<c:out value="${setleTyCd}"/>', '<c:out value="${order.ordrSttusCd}"/>');" class="btn gray2">전체 결제취소</a>
                                     </c:when>
-                                    <c:when test="${order.ordrSttusCd > 34 && order.ordrSttusCd < 71}">
+                                    <c:when test="${(order.orderReInnb == null || order.orderReInnb eq '') && order.ordrSttusCd > 34 && order.ordrSttusCd < 71}">
                                         <a href="javascript:void(0);" onclick="fn_pop_m2mqna_regist('<c:out value="${order.ordrInnb}"/>');" class="btn gray2">구독취소</a>
                                     </c:when>
                                 </c:choose>
@@ -1434,45 +1787,6 @@
                                                         </td>
                                                     </tr>
                                                 </c:if>
-                                                <c:if test="${setle.reqstDvCd ne '04'}">
-                                                    <c:if test="${not empty setle.issuSttusCd && order.ordrSttusCd ne '85' && order.ordrSttusCd ne '95'}">
-                                                        <tr>
-                                                            <th>현금영수증</th>
-                                                            <td>
-                                                                <c:choose>
-                                                                    <c:when test="${order.salesPosbleRegistAt eq 'N'}">
-                                                                        <span class="orderDetail__waiting"><c:out value="${setle.crtnb eq '0100001234' ? '미신청' : setle.crtnb}"/></span>
-                                                                        <button type="button" class="btn xsm gray2" onclick="fn_regist_popopen('<c:out value="${setle.selngPrufInnb}"/>','update');">정보수정</button>
-                                                                    </c:when>
-                                                                    <c:when test="${order.salesPosbleRegistAt eq 'Y' && setle.crtnb eq '0100001234'}">
-                                                                        <span class="orderDetail__waiting">미신청</span>
-                                                                        <button type="button" class="btn xsm gray2" onclick="fn_regist_popopen('<c:out value="${setle.selngPrufInnb}"/>','regist');">신청하기</button>
-                                                                    </c:when>
-                                                                    <c:otherwise>
-                                                                        <span class="orderDetail__waiting" id='ctrnb'><script>$("#ctrnb").text('${setle.issuSttusNm} ('+fn_format_mbtlnb('${setle.crtnb}')+')');</script></span>
-                                                                        <span class="orderDetail__deduction"><c:out value="${setle.issuTrgetDvCd eq '01' ? '개인소득공제' : '사업자지출증빙'}"/></span>
-                                                                        <c:if test="${ !empty setle.cshRciptDelngNb }">
-                                                                            <%-- 현:현금영수증 --%>
-                                                                            <button type="button" class="btn xsm gray2" onclick="fn_open_selng_pruf_inqire_modal(
-                                                                                    '<c:out value="${ setle.sopmalCd }" />'
-                                                                                    ,'<c:out value="${ setle.pgInnb }" />'
-                                                                                    ,'<c:out value="${ setle.pgCmpnyNm }" />'
-                                                                                    ,'<c:out value="${ setle.cshRciptDelngNb }" />'
-                                                                                    ,'<c:out value="${ setle.reqstDvCd }" />'
-                                                                                    ,'<c:out value="${ setle.setleTyCd }" />'
-                                                                                    ,'<c:out value="${ setle.ordrSetleInnb }" />'
-                                                                                    ,'<c:out value="${ setle.ordrInnb }" />'
-                                                                                    ,'<c:out value="${ setle.mid }" />'
-                                                                                    ,'<fmt:parseNumber value="${ setle.setleAmt }"/>'); return false;">
-                                                                                보기
-                                                                            </button>
-                                                                        </c:if>
-                                                                    </c:otherwise>
-                                                                </c:choose>
-                                                            </td>
-                                                        </tr>
-                                                    </c:if>
-                                                </c:if>
                                                 </tbody>
                                             </table>
                                         </c:forEach>
@@ -1484,44 +1798,6 @@
                                         </div>
                                     </c:otherwise>
                                 </c:choose>
-
-                                <c:set var="total" value="${data.total}"/>
-                                <div class="orderDetail__orderPrice">
-                                    <ul class="cartOrderBox__list">
-                                        <li>
-                                            <span class="cartOrderBox__th">총 주문금액</span>
-                                            <span class="cartOrderBox__td"><span class="comma"><fmt:formatNumber value="${total.slepric}" pattern="#,###"/></span><span class="priceUnit">${curUnit}</span></span>
-                                        </li>
-                                        <li>
-                                            <span class="cartOrderBox__th">할인금액</span>
-                                            <span class="cartOrderBox__td"><span class="cartOrderBox__discountMinus">(-)</span><span class="comma"><fmt:formatNumber value="${total.dscntAmt}" pattern="#,###"/></span><span class="priceUnit">${curUnit}</span></span>
-                                        </li>
-                                        <c:forEach var="dscnt" items="${data.dscntList}" varStatus="status">
-                                            <c:if test="${'03' != dscnt.dscntDvCd}">
-                                                <li class="cartOrderBox__miscItem ${1 == status.count ? 'first' : ''}">
-                                                    <span class="cartOrderBox__miscTh"><c:out value="${dscnt.dscntDvNm}"/></span>
-                                                    <span class="cartOrderBox__miscTd"><span class="comma"><fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/></span><span class="priceUnit">${curUnit}</span></span>
-                                                </li>
-                                            </c:if>
-                                        </c:forEach>
-                                        <li>
-                                            <span class="cartOrderBox__th">배송비</span>
-                                            <span class="cartOrderBox__td"><span class="comma"><fmt:formatNumber value="${total.dlvyAmt}" pattern="#,###"/></span><span class="priceUnit">${curUnit}</span></span>
-                                        </li>
-                                        <c:forEach var="dscnt" items="${data.dscntList}" varStatus="status">
-                                            <c:if test="${'03' == dscnt.dscntDvCd}">
-                                                <li class="cartOrderBox__miscItem ${1 == status.count ? 'first' : ''}">
-                                                    <span class="cartOrderBox__miscTh"><c:out value="${dscnt.dscntDvNm}"/></span>
-                                                    <span class="cartOrderBox__miscTd"><span class="comma"><fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/></span><span class="priceUnit">${curUnit}</span></span>
-                                                </li>
-                                            </c:if>
-                                        </c:forEach>
-                                    </ul>
-                                    <div class="cartOrderBox__total">
-                                        <span class="cartOrderBox__totalTh">결제금액</span>
-                                        <span class="cartOrderBox__totalTd"><span class="comma"><fmt:formatNumber value="${total.setleAmt}" pattern="#,###"/></span><span class="priceUnit">${curUnit}</span></span>
-                                    </div>
-                                </div>
                             </div>
                         </div>
 

src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDtlR.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>
@@ -1109,7 +1110,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 <c:if test = "${empty setle.issuSttusCd}">style="border-bottom: 0.5px solid #e9ecef;"</c:if>>
@@ -1130,47 +1131,6 @@
                                                             </td>
                                                         </tr>
                                                     </c:if>
-                                                    <c:if test="${setle.reqstDvCd ne '04'}">
-                                                        <c:if test="${not empty setle.issuSttusCd && order.ordrSttusCd ne '85' && order.ordrSttusCd ne '95'}">
-                                                            <%--현금영수증 발급상태가 존재하고, 주문상태가 주문취소, 결제취소가 아닐 때 노출--%>
-                                                            <tr style="border-bottom: 0.5px solid #e9ecef;">
-                                                                <th>현금영수증</th>
-                                                                <td>
-                                                                    <c:choose>
-                                                                        <c:when test="${order.salesPosbleRegistAt eq 'N'}">
-                                                                            <span class="orderDetail__waiting"><c:out value="${setle.crtnb eq '0100001234' ? '미신청' : setle.crtnb}"/></span>
-                                                                            <button type="button" class="btn xsm gray2" onclick="fn_regist_popopen('<c:out value="${setle.selngPrufInnb}"/>','update');">정보수정</button>
-                                                                        </c:when>
-                                                                        <c:when test="${order.salesPosbleRegistAt eq 'Y' && setle.crtnb eq '0100001234'}">
-                                                                            <span class="orderDetail__waiting">미신청</span>
-                                                                            <button type="button" class="btn xsm gray2" onclick="fn_regist_popopen('<c:out value="${setle.selngPrufInnb}"/>','regist');">신청하기</button>
-                                                                        </c:when>
-                                                                        <c:otherwise>
-                                                                            <span class="orderDetail__waiting" id='ctrnb'><script>$("#ctrnb").text('${setle.issuSttusNm} ('+fn_format_mbtlnb('${setle.crtnb}')+')');</script></span>
-                                                                            <br/>
-                                                                            <span class="orderDetail__deduction"><c:out value="${setle.issuTrgetDvCd eq '01' ? '개인소득공제' : '사업자지출증빙'}"/></span>
-                                                                            <c:if test="${ !empty setle.cshRciptDelngNb }">
-                                                                                <%-- 현:현금영수증 --%>
-                                                                                <button type="button" class="btn xsm gray2" onclick="fn_open_selng_pruf_inqire_modal(
-                                                                                        '<c:out value="${ setle.sopmalCd }" />'
-                                                                                        ,'<c:out value="${ setle.pgInnb }" />'
-                                                                                        ,'<c:out value="${ setle.pgCmpnyNm }" />'
-                                                                                        ,'<c:out value="${ setle.cshRciptDelngNb }" />'
-                                                                                        ,'<c:out value="${ setle.reqstDvCd }" />'
-                                                                                        ,'<c:out value="${ setle.setleTyCd }" />'
-                                                                                        ,'<c:out value="${ setle.ordrSetleInnb }" />'
-                                                                                        ,'<c:out value="${ setle.ordrInnb }" />'
-                                                                                        ,'<c:out value="${ setle.mid }" />'
-                                                                                        ,'<fmt:parseNumber value="${ setle.setleAmt }"/>'); return false;">
-                                                                                    보기
-                                                                                </button>
-                                                                            </c:if>
-                                                                        </c:otherwise>
-                                                                    </c:choose>
-                                                                </td>
-                                                            </tr>
-                                                        </c:if>
-                                                    </c:if>
                                                     </tbody>
                                                 </table>
                                             </c:forEach>
@@ -1233,7 +1193,7 @@
                                                 <tr>
                                                     <th>총 결제금액</th>
                                                     <td>
-                                                        <span class="comma"><fmt:formatNumber value="${total.setleAmt}" pattern="#,###"/></span>${curUnit}
+                                                        <span class="comma"><fmt:formatNumber value="${total.setleAmt}" pattern="#,###"/></span>${curUnit} / <span class="comma">${total.wonRlSetleAmt}</span>${krUnit}
                                                     </td>
                                                 </tr>
                                             </tfoot>

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

@@ -148,21 +148,20 @@
                     div += '        </div>';
                     div += '        <div class="orderListItem__body">';
                     div += '            <div class="orderListItem__image">';
-                    div += '                <a href="/sopmal/goods/selectGoodsDtl?sopmalCd=' + row.sopmalCd + '&goodsInnb=' + row.goodsInnb + '">';
+                    div += '                <img src="' + cdnurl + row.goodsImageUrl + '" onerror="this.src=\'/pc/images/image_placeholder.png\'" alt="' + row.goodsNm + '">';
-                    div += '                    <img src="' + cdnurl + row.goodsImageUrl + '" onerror="this.src=\'/pc/images/image_placeholder.png\'" alt="' + row.goodsNm + '">';
-                    div += '                </a>';
                     div += '            </div>';
                     div += '            <div class="orderListItem__right">';
                     div += '                <div class="orderListItem__info">';
-                    div += '                    <p class="orderListItem__info__status">' + row.ordrSttusNm;
+                    if (row.refundSttusNm == null || row.refundSttusNm == ''){
+                        div += '                    <p class="orderListItem__info__status">' + row.ordrSttusNm;
+                    }else{
+                        div += '                    <p class="orderListItem__info__status">' + row.refundSttusNm;
+                    }
                     if (!fn_is_empty(row.giftSttusCd)) {
                         div += '                    (' + row.giftSttusCdNm + ')';
                     }
                     div += '                    </p>';
                     div += '                    <a href="javascript:void(0);" onclick="fn_go_subsvc_dtl(\'' + row.sopmalCd + '\', \'' + row.ordrInnb + '\');" class="orderListItem__info__name">' + row.goodsNm + '</a>';
-                    if (row.optnNm != null) {
-                        div += '                    <p class="orderListItem__info__option">' + row.optnNm + '</p>';
-                    }
                     <%--div += '                    <p class="orderListItem__info__quantity">' + row.orderCnt + '개<span class="orderListItem__info__dot">·</span><span class="comma">' + (row.setleAmt).toLocaleString() + '</span>' + '${curUnit}';--%>
                     div += '                    <p class="orderListItem__info__quantity">' + (row.setleAmt).toLocaleString() + '</span>' + '${curUnit}';
                     div += '                    </p>';

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

@@ -681,13 +681,294 @@
                         <c:set var="setle" value="${data.setleList[0]}" />
                         <c:set var="setleTyCd" value="${setle.setleTyCd}" />
                     </c:if>
+                    <%--환불 내역 시작--%>
+                    <c:if test="${order.orderReInnb != null && order.orderReInnb ne ''}">
+                        <div class="orderDetail">
+                            <c:if test="${ not empty resultMap.result.refnd.refundComptDt }">
+                                <div class="detailTop">
+                                    <p class="detailTop__title"><em>반품/환불 완료</em> <c:out value="${ resultMap.result.refnd.refundComptDt }"/></p>
+                                </div>
+                            </c:if>
+                            <div class="orderDetailTop">
+                                <span class="orderDetailTop__date">
+                                    <span class="misc">접수일 : </span><c:out value="${ resultMap.result.refnd.registDt }"/>
+                                </span>
+                                <span class="orderDetailTop__num">주문번호 <c:out value="${ resultMap.result.refnd.ordrInnb }"/></span>
+                            </div>
+                            <div class="sub-box">
+                                <div class="orderDetailProduct">
+                                    <div class="orderDetailProduct__top" role="button" tabindex="0">
+                                        <span class="orderDetailProduct__top__title"><c:if test="${ not empty resultMap.result.refnd.returnProcsSttusCd }">반품/</c:if>환불 정보</span>
+                                        <span class="orderDetailProduct__top__chevron"></span>
+                                    </div>
+                                    <div class="orderDetail__content">
+                                        <div class="orderDetail__body">
+                                            <div class="table-wrapper orderDetail__table">
+                                                <table class="table">
+                                                    <caption>해당 테이블에 대한 설명</caption>
+                                                    <!-- 각 열 width 설정 -->
+                                                    <colgroup>
+                                                        <col style="width: 40%">
+                                                        <col style="width: 60%">
+                                                    </colgroup>
+                                                    <tbody>
+                                                    <tr>
+                                                        <th><c:if test="${ not empty resultMap.result.refnd.returnProcsSttusCd }">반품/</c:if>환불 상태</th>
+                                                        <td>
+                                                            <c:choose>
+                                                                <c:when test="${ not empty resultMap.result.refnd.returnProcsSttusCd }">
+                                                                    <c:out value="${ resultMap.result.refnd.returnProcsSttusCdNm }"/>
+                                                                </c:when>
+                                                                <c:otherwise>
+                                                                    <c:out value="${ resultMap.result.refnd.refundProcsSttusCdNm }"/>
+                                                                </c:otherwise>
+                                                            </c:choose>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <th>반품/환불 번호</th>
+                                                        <td>
+                                                            <c:out value="${ resultMap.result.refnd.orderRefundInnb }"/>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <th>환불 종류</th>
+                                                        <td><c:out value="${ resultMap.result.refnd.refundTyCdNm }"/></td>
+                                                    </tr>
+                                                    <c:if test="${ not empty resultMap.result.refnd.returnRceptDt}">
+                                                        <tr>
+                                                            <th>반품 접수일</th>
+                                                            <td><c:out value="${ resultMap.result.refnd.returnRceptDt }"/></td>
+                                                        </tr>
+                                                    </c:if>
+                                                    <tr>
+                                                        <th>환불 접수일</th>
+                                                        <td><c:out value="${ resultMap.result.refnd.refundReqstDt }"/></td>
+                                                    </tr>
+                                                    <c:if test="${ not empty resultMap.result.refnd.returnComptDt}">
+                                                        <tr>
+                                                            <th>반품 완료일</th>
+                                                            <td><c:out value="${ resultMap.result.refnd.returnComptDt }"/></td>
+                                                        </tr>
+                                                    </c:if>
+                                                    <c:if test = "${not empty resultMap.result.refnd.refundComptDt }">
+                                                        <tr>
+                                                            <th>환불 완료일</th>
+                                                            <td><c:out value="${ resultMap.result.refnd.refundComptDt }"/></td>
+                                                        </tr>
+                                                    </c:if>
+                                                    </tbody>
+                                                </table>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <c:if test="${ not empty resultMap.result.refnd.returnRceptDt }">
+                            <div class="sub-box">
+                                <div class="orderDetailProduct">
+                                    <div class="orderDetailProduct__top" role="button" tabindex="0">
+                                        <span class="orderDetailProduct__top__title">회수지 정보</span>
+                                        <span class="orderDetailProduct__top__chevron"></span>
+                                    </div>
+                                    <div class="orderDetail__content">
+                                        <div class="orderDetail__body">
+                                            <div class="table-wrapper orderDetail__table">
+                                                <table class="table">
+                                                    <caption>해당 테이블에 대한 설명</caption>
+                                                    <!-- 각 열 width 설정 -->
+                                                    <colgroup>
+                                                        <col style="width: 40%">
+                                                        <col style="width: 60%">
+                                                    </colgroup>
+                                                    <tbody>
+                                                    <tr>
+                                                        <th>회수방법</th>
+                                                        <td>
+                                                            <c:out value="${ resultMap.result.refnd.returnMthCdNm }"/>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <th>주소</th>
+                                                        <td>
+                                                            <c:if test="${ not empty resultMap.result.refnd.senderZip }">
+                                                                (<c:out value="${ resultMap.result.refnd.senderZip }"/>)
+                                                            </c:if>
+                                                            <c:choose>
+                                                                <c:when test="${ resultMap.result.refnd.senderAdresDvCd eq '01'}">
+                                                                    <c:out value="${ resultMap.result.refnd.senderRnmAdres }"/>
+                                                                </c:when>
+                                                                <c:when test="${ resultMap.result.refnd.senderAdresDvCd eq '02'}">
+                                                                    <c:out value="${ resultMap.result.refnd.senderLnbAdres }"/>
+                                                                </c:when>
+                                                            </c:choose>
+                                                            <c:out value="${ resultMap.result.refnd.senderAdresDtl }"/>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <th>휴대폰 번호</th>
+                                                        <td>
+                                                            <c:out value="${ resultMap.result.refnd.returnCstmrMbtlnb }"/>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <th>반품 사유</th>
+                                                        <td>
+                                                            <c:out value="${ resultMap.result.refnd.returnResnCdNm }"/>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <th>상세 사유</th>
+                                                        <td>
+                                                            <c:out value="${ resultMap.result.refnd.returnResnCn }"/>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <th>배송비 입금</th>
+                                                        <td>
+                                                            <c:if test="${ not empty resultMap.result.refnd.returnDlvyRcpmnyAcntnb }">
+                                                                <c:out value="${ resultMap.result.refnd.returnDlvyRcpmnyAcntnb }"/><br>(예금주: <c:out value="${ resultMap.result.refnd.returnDlvyRcpmnyNm }"/>)
+                                                            </c:if>
+                                                        </td>
+                                                    </tr>
+                                                    </tbody>
+                                                </table>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                </c:if>
+                                <div class="sub-box">
+                                    <div class="orderDetailProduct">
+                                        <div class="orderDetailProduct__top" role="button" tabindex="0">
+                                            <span class="orderDetailProduct__top__title">환불정보</span>
+                                            <span class="orderDetailProduct__top__chevron"></span>
+                                        </div>
+                                        <div class="orderDetail__content">
+                                            <div class="orderDetail__body">
+                                                <div class="table-wrapper orderDetail__table">
+                                                    <table class="table">
+                                                        <caption>해당 테이블에 대한 설명</caption>
+                                                        <!-- 각 열 width 설정 -->
+                                                        <colgroup>
+                                                            <col style="width: 40%">
+                                                            <col style="width: 60%">
+                                                        </colgroup>
+                                                        <tbody>
+                                                        <tr>
+                                                            <th>환불은행</th>
+                                                            <td><c:out
+                                                                    value="${ resultMap.result.refnd.refundAcntBnnkNm }"/></td>
+                                                        </tr>
+                                                        <tr>
+                                                            <th>예금주</th>
+                                                            <td><c:out
+                                                                    value="${ resultMap.result.refnd.refundAcntDpstrNm }"/></td>
+                                                        </tr>
+                                                        <tr>
+                                                            <th>계좌번호</th>
+                                                            <td><c:out
+                                                                    value="${ resultMap.result.refnd.refundAcntnb }"/></td>
+                                                        </tr>
+                                                        <tr>
+                                                            <th>환불사유내용</th>
+                                                            <td><c:out
+                                                                    value="${ resultMap.result.refnd.refundResnCn }"/></td>
+                                                        </tr>
+                                                        </tbody>
+                                                    </table>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="sub-box">
+                                    <div class="orderDetailProduct">
+                                        <div class="orderDetailProduct__top" role="button" tabindex="0">
+                                            <span class="orderDetailProduct__top__title">환불 금액</span>
+                                            <span class="orderDetailProduct__top__chevron"></span>
+                                        </div>
+                                        <div class="orderDetail__content">
+                                            <div class="orderDetail__body">
+                                                <c:set var="reTotAmt" value="${ resultMap.result.totRefundDscntAmt }"/>
+                                                <div class="table-wrapper orderDetail__table orderDetail__table--price">
+                                                    <table class="table">
+                                                        <caption>해당 테이블에 대한 설명</caption>
+                                                        <!-- 각 열 width 설정 -->
+                                                        <colgroup>
+                                                            <col style="width: 40%">
+                                                            <col style="width: 60%">
+                                                        </colgroup>
+                                                        <tbody>
+                                                        <tr>
+                                                            <th>총 상품금액</th>
+                                                            <td>
+                                                            <span class="orderDetail__table__productPrice">
+                                                                <span class="comma"><c:out value="${ reTotAmt.refundAmtQySum }"/></span>${curUnit}
+                                                            </span>
+                                                            </td>
+                                                        </tr>
+                                                        <tr>
+                                                            <th>총 배송비</th>
+                                                            <td><span class="comma"><c:out value="${ reTotAmt.rlDlvyAmt }"/></span>${curUnit}</td>
+                                                        </tr>
+                                                        <tr>
+                                                            <th>마일리지</th>
+                                                            <td><span class="comma"><c:out value="${ reTotAmt.totRefundMlgAmt }"/></span>점</td>
+                                                        </tr>
+                                                        <tr>
+                                                            <th>쿠폰</th>
+                                                            <td><span class="comma"><c:out value="${ reTotAmt.totRefundCouponAmt }"/></span>${curUnit}</td>
+                                                        </tr>
+                                                        <c:if test="${ reTotAmt.totReturnDlvyAmt > 0}">
+                                                            <tr>
+                                                                <th>환불배송비</th>
+                                                                <td><span class="comma"><c:out value="${ reTotAmt.totReturnDlvyAmt }"/></span>${curUnit}</td>
+                                                            </tr>
+                                                        </c:if>
+                                                        <tr>
+                                                            <th>총 차감금액</th>
+                                                            <td>-<c:out value="${ reTotAmt.rlDlvyAmtRefundAmt }"/>${curUnit}</td>
+                                                        </tr>
+                                                        <c:if test="${ reTotAmt.rlDlvyAmtRefundAmt > 0}">
+                                                            <tr class="orderDetail__table__discountSub">
+                                                                <th><span>반품배송비</span></th>
+                                                                <td>-<c:out value="${ reTotAmt.rlDlvyAmtRefundAmt }"/>${curUnit}</td>
+                                                            </tr>
+                                                        </c:if>
+                                                        </tbody>
+                                                        <tfoot class="orderDetail__table__sum">
+                                                        <tr>
+                                                            <th>총 환불금액</th>
+                                                            <td>
+                                                                <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>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                    </c:if>
+                    <%--환불 내역 종료--%>
                     <div class="detailTop">
                         <p class="detailTop__title">총 <em><c:out value="${fn:length(data.shippingList)}"/>곳</em>의 배송지로 주문하셨습니다.</p>
                         <c:choose>
                             <c:when test="${order.ordrSttusCd == 25}">
                                 <a href="javascript:void(0);" onclick="fn_call_setle_cancl_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '', '<c:out value="${setleDt}"/>', '<c:out value="${setleTyCd}"/>', '<c:out value="${order.ordrSttusCd}"/>');" class="btn gray2">전체 결제취소</a>
                             </c:when>
-                            <c:when test="${order.ordrSttusCd > 34 && order.ordrSttusCd < 71}">
+                            <c:when test="${(order.orderReInnb == null || order.orderReInnb eq '') && order.ordrSttusCd > 34 && order.ordrSttusCd < 71}">
                                 <a href="javascript:void(0);" onclick="fn_pop_m2mqna_regist('<c:out value="${order.ordrInnb}"/>');" class="btn gray2">구독취소</a>
                             </c:when>
                         </c:choose>
@@ -825,67 +1106,6 @@
                             </div>
                         </c:forEach>
                     </c:if>
-                    <%--주문취소, 결제취소시 미노출--%>
-                    <%--적립금 표시 제거--%>
-<%--                    <c:if test = "${order.ordrSttusCd ne '85'  && order.ordrSttusCd ne '95'}">--%>
-<%--                        <div class="sub-box">--%>
-<%--                            <div class="orderDetailProduct">--%>
-<%--                                <div class="orderDetailProduct__top" role="button" tabindex="0">--%>
-<%--                                    <span class="orderDetailProduct__top__title">--%>
-<%--                                        적립금&lt;%&ndash;<span class="misc">(최대 390원)</span>&ndash;%&gt;--%>
-<%--                                    </span>--%>
-<%--                                    <span class="orderDetailProduct__top__chevron"></span>--%>
-<%--                                </div>--%>
-<%--                                <div class="orderDetail__content">--%>
-<%--                                    <div class="orderDetail__body">--%>
-<%--                                        <div class="table-wrapper orderDetail__table">--%>
-<%--                                            <table class="table">--%>
-<%--                                                <colgroup>--%>
-<%--                                                    <col style="width: 40%">--%>
-<%--                                                    <col style="width: 60%">--%>
-<%--                                                </colgroup>--%>
-<%--                                                <tbody>--%>
-<%--                                                    <tr>--%>
-<%--                                                        <th>구매확정 시 적립예정</th>--%>
-<%--                                                        <td>마일리지 <em><fmt:formatNumber value="${data.mlgAccmlAmt}" pattern="#,###"/>점</em></td>--%>
-<%--                                                    </tr>--%>
-<%--                                                    <tr>--%>
-<%--                                                        <th>리뷰작성 시 적립예정</th>--%>
-<%--                                                        <td>--%>
-<%--                                                            <c:forEach var="ntc" items="${data.mlgAccmlNtcList}" varStatus="status">--%>
-<%--                                                            <c:choose>--%>
-<%--                                                                <c:when test="${'06' == ntc.bbsTyCd}">--%>
-<%--                                                                    <c:if test="${not empty ntc.gnrlRvwAmt}">--%>
-<%--                                                                        일반리뷰 <em><c:out value="${ntc.gnrlRvwAmt}"/>점</em> 적립--%>
-<%--                                                                    </c:if>--%>
-<%--                                                                    <c:if test="${not empty ntc.photoRvwAmt}">--%>
-<%--                                                                        <br/>포토리뷰 <em><c:out value="${ntc.photoRvwAmt}"/>점</em> 적립--%>
-<%--                                                                    </c:if>--%>
-<%--                                                                </c:when>--%>
-<%--                                                                <c:otherwise>--%>
-<%--                                                                    <br/>한달리뷰 <em><c:out value="${ntc.photoRvwAmt}"/>점</em> 적립--%>
-<%--                                                                </c:otherwise>--%>
-<%--                                                            </c:choose>--%>
-<%--                                                            <c:if test="${not empty ntc.bgnDe && not empty ntc.endDe}">--%>
-<%--                                                                <fmt:parseDate value="${ntc.bgnDe}" var="bgnDeDate" pattern="yyyyMMdd"/>--%>
-<%--                                                                <fmt:formatDate value="${bgnDeDate}" var="bgnDe" pattern="yyyy-MM-dd"/>--%>
-<%--                                                                <fmt:parseDate value="${ntc.endDe}" var="endDeDate" pattern="yyyyMMdd"/>--%>
-<%--                                                                <fmt:formatDate value="${endDeDate}" var="endDe" pattern="yyyy-MM-dd"/>--%>
-<%--    --%>
-<%--                                                                <br/>(<c:out value="${bgnDe}"/> ~ <c:out value="${endDe}"/> 까지 <i><c:out value="${ntc.aditMlgAmt}"/>점</i> 추가 적립)--%>
-<%--                                                            </c:if>--%>
-<%--                                                            </c:forEach>--%>
-<%--                                                        </td>--%>
-<%--                                                    </tr>--%>
-<%--                                                </tbody>--%>
-<%--                                            </table>--%>
-<%--                                        </div>--%>
-<%--                                    </div>--%>
-<%--                                </div>--%>
-<%--                            </div>--%>
-<%--                        </div>--%>
-<%--                    </c:if>--%>
-
                     <div class="sub-box">
                         <div class="orderDetailProduct">
                             <div class="orderDetailProduct__top" role="button" tabindex="0">
@@ -1014,7 +1234,7 @@
                                                     </c:if>
                                                     <tr>
                                                         <th>결제금액</th>
-                                                        <td><span class="comma"><fmt:formatNumber value="${setle.setleAmt}" pattern="#,###"/></span>${curUnit} / <span class="comma">${setle.setleAmt}</span>${krUnit}</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 <c:if test = "${empty setle.issuSttusCd}">style="border-bottom: 0.5px solid #e9ecef;"</c:if>>
@@ -1035,47 +1255,6 @@
                                                             </td>
                                                         </tr>
                                                     </c:if>
-                                                    <c:if test="${setle.reqstDvCd ne '04'}">
-                                                        <c:if test="${not empty setle.issuSttusCd && order.ordrSttusCd ne '85' && order.ordrSttusCd ne '95'}">
-                                                            <%--현금영수증 발급상태가 존재하고, 주문상태가 주문취소, 결제취소가 아닐 때 노출--%>
-                                                            <tr style="border-bottom: 0.5px solid #e9ecef;">
-                                                                <th>현금영수증</th>
-                                                                <td>
-                                                                    <c:choose>
-                                                                        <c:when test="${order.salesPosbleRegistAt eq 'N'}">
-                                                                            <span class="orderDetail__waiting"><c:out value="${setle.crtnb eq '0100001234' ? '미신청' : setle.crtnb}"/></span>
-                                                                            <button type="button" class="btn xsm gray2" onclick="fn_regist_popopen('<c:out value="${setle.selngPrufInnb}"/>','update');">정보수정</button>
-                                                                        </c:when>
-                                                                        <c:when test="${order.salesPosbleRegistAt eq 'Y' && setle.crtnb eq '0100001234'}">
-                                                                            <span class="orderDetail__waiting">미신청</span>
-                                                                            <button type="button" class="btn xsm gray2" onclick="fn_regist_popopen('<c:out value="${setle.selngPrufInnb}"/>','regist');">신청하기</button>
-                                                                        </c:when>
-                                                                        <c:otherwise>
-                                                                            <span class="orderDetail__waiting" id='ctrnb'><script>$("#ctrnb").text('${setle.issuSttusNm} ('+fn_format_mbtlnb('${setle.crtnb}')+')');</script></span>
-                                                                            <br/>
-                                                                            <span class="orderDetail__deduction"><c:out value="${setle.issuTrgetDvCd eq '01' ? '개인소득공제' : '사업자지출증빙'}"/></span>
-                                                                            <c:if test="${ !empty setle.cshRciptDelngNb }">
-                                                                                <%-- 현:현금영수증 --%>
-                                                                                <button type="button" class="btn xsm gray2" onclick="fn_open_selng_pruf_inqire_modal(
-                                                                                        '<c:out value="${ setle.sopmalCd }" />'
-                                                                                        ,'<c:out value="${ setle.pgInnb }" />'
-                                                                                        ,'<c:out value="${ setle.pgCmpnyNm }" />'
-                                                                                        ,'<c:out value="${ setle.cshRciptDelngNb }" />'
-                                                                                        ,'<c:out value="${ setle.reqstDvCd }" />'
-                                                                                        ,'<c:out value="${ setle.setleTyCd }" />'
-                                                                                        ,'<c:out value="${ setle.ordrSetleInnb }" />'
-                                                                                        ,'<c:out value="${ setle.ordrInnb }" />'
-                                                                                        ,'<c:out value="${ setle.mid }" />'
-                                                                                        ,'<fmt:parseNumber value="${ setle.setleAmt }"/>'); return false;">
-                                                                                    보기
-                                                                                </button>
-                                                                            </c:if>
-                                                                        </c:otherwise>
-                                                                    </c:choose>
-                                                                </td>
-                                                            </tr>
-                                                        </c:if>
-                                                    </c:if>
                                                     </tbody>
                                                 </table>
                                             </c:forEach>
@@ -1085,69 +1264,6 @@
                             </div>
                         </div>
                     </div>
-                    <div class="sub-box">
-                        <div class="orderDetailProduct">
-                            <div class="orderDetailProduct__top" role="button" tabindex="0">
-                                <span class="orderDetailProduct__top__title">결제금액</span>
-                                <span class="orderDetailProduct__top__chevron"></span>
-                            </div>
-                            <div class="orderDetail__content">
-                                <div class="orderDetail__body">
-                                    <c:set var="total" value="${data.total}"/>
-                                    <div class="table-wrapper orderDetail__table orderDetail__table--price">
-                                        <table class="table">
-                                            <colgroup>
-                                                <col style="width: 40%">
-                                                <col style="width: 60%">
-                                            </colgroup>
-                                            <tbody>
-                                                <tr>
-                                                    <th>총 상품금액</th>
-                                                    <td>
-                                                        <span class="orderDetail__table__productPrice">
-                                                            <span class="comma"><fmt:formatNumber value="${total.slepric}" pattern="#,###"/></span>${curUnit}
-                                                        </span>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <th>할인금액</th>
-                                                    <td>-<fmt:formatNumber value="${total.dscntAmt}" pattern="#,###"/>${curUnit}</td>
-                                                </tr>
-                                                <c:forEach var="dscnt" items="${data.dscntList}" varStatus="status">
-                                                    <c:if test="${'03' != dscnt.dscntDvCd}">
-                                                        <tr class="orderDetail__table__discountSub">
-                                                            <th><span><c:out value="${dscnt.dscntDvNm}"/></span></th>
-                                                            <td>-<fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/>${curUnit}</td>
-                                                        </tr>
-                                                    </c:if>
-                                                </c:forEach>
-                                                <tr>
-                                                    <th>배송비</th>
-                                                    <td><span class="comma"><fmt:formatNumber value="${total.dlvyAmt}" pattern="#,###"/></span>${curUnit}</td>
-                                                </tr>
-                                                <c:forEach var="dscnt" items="${data.dscntList}" varStatus="status">
-                                                    <c:if test="${'03' == dscnt.dscntDvCd}">
-                                                        <tr class="orderDetail__table__discountSub">
-                                                            <th><span><c:out value="${dscnt.dscntDvNm}"/></span></th>
-                                                            <td>-<fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/>${curUnit}</td>
-                                                        </tr>
-                                                    </c:if>
-                                                </c:forEach>
-                                            </tbody>
-                                            <tfoot class="orderDetail__table__sum">
-                                                <tr>
-                                                    <th>총 결제금액</th>
-                                                    <td>
-                                                        <span class="comma"><fmt:formatNumber value="${total.setleAmt}" pattern="#,###"/></span>${curUnit}
-                                                    </td>
-                                                </tr>
-                                            </tfoot>
-                                        </table>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
 
 <%--                    <c:if test="${not empty data.refundList}">--%>
 <%--                        <div class="sub-box">--%>