fix : 마이페이지 메인 - 최근 주문 (구독서비스) 추가

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

@@ -171,6 +171,26 @@ public class MyOrdrController {
         return Util.getDeviceType(request) + "/mpage/ordr/SubsvcOrdrDlvyListRForm";
     }
 
+    /**
+     * 마이 페이지 > MY쇼핑 > 마이페이지 > 주문/배송 목록 조회
+     * @param ordrDlvyVO
+     * @return ResponseEntity<WnbtResponse>
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value="/selectMbrSubsvcOrdrListInqireMapge")
+    public String selectMbrSubsvcOrdrListInqireMapge(ModelMap model, BOOrdrDlvyVO ordrDlvyVO) {
+
+        Map<String, Object> content = selectBOMbrSubsvcOrdrListInqireAjax(ordrDlvyVO);
+        model.addAttribute("data", content);
+//        responseHandler.handleResponse(
+//                sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/ordr/ordr/selectBOMbrOrdrListInqireAjax", ordrDlvyVO),
+//                model,
+//                "data"
+//        );
+
+        return "sopmal/mpage/ordr/SubsvcOrdrDlvyListMpageRList";
+    }
+
     /**
      * 마이 페이지 > MY쇼핑 > 구독서비스 주문/배송 > 구독서비스 주문/배송 목록 조회
      * @param ordrDlvyVO

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

@@ -40,6 +40,7 @@
          **********************************************************/
         const fn_init = function () {
             fn_get_ordr_dlvy_list(1);
+            fn_get_subsvc_ordr_dlvy_list(1);
         }
 
         /* ********************************************************
@@ -542,6 +543,29 @@
             });
         }
 
+        /* 구독서비스 주문/배송 목록 조회 */
+        const fn_get_subsvc_ordr_dlvy_list = function (index) {
+            if (!fn_is_empty(index)) {
+                $('#subsvcPageIndex').val(index);
+            }
+
+            let data = $('#subsvcCondForm').serialize();
+
+            $.ajax({
+                type:'post',
+                url:'<c:url value="/sopmal/mpage/ordr/selectMbrSubsvcOrdrListInqireMapge"/>',
+                data:data,
+                success:function (html) {
+                    $('#subsvcPageDiv').html(html);
+                },
+                error:function (request) {
+                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+
+                    alert(message.errorMsg);
+                }
+            });
+        }
+
         /* 주문 무효 상태 수정 */
         const fn_post_cancl_ordr = function (sopmalCd, ordrInnb) {
             if (!confirm('주문을 취소하시겠습니까?')) {
@@ -611,6 +635,19 @@
             $(form).submit();
         }
 
+        /* 구독서비스 주문상세 이동 */
+        const fn_go_subsvc_dtl = function (sopmalCd, ordrInnb) {
+            var form = $('#condForm');
+
+            $(form).append($('<input/>', {type: 'hidden', name: 'ordrInnb', id: 'ordrInnb', value: ordrInnb}));
+            $(form).append($('<input/>', {type: 'hidden', name: 'dateRange', id: 'dateRange', value: 'allDays'}));
+
+            $(form).attr('method', 'get');
+            $(form).attr('action', '<c:url value="/sopmal/mpage/ordr/selectMbrSubsvcOrdrDtlInqire"/>');
+
+            $(form).submit();
+        }
+
         /* 검색조건 세팅 */
         const fn_set_param = function () {
             const params = ${paramVO};
@@ -932,6 +969,15 @@
                             <a class="sub-right-content__more" href="/sopmal/mpage/ordr/selectMbrOrdrListInqire">전체보기</a>
                         </div>
 
+                        <div class="sub-right-content__section">
+                            <h3 class="sub-right-content__innerTitle">최근 주문 (구독서비스)</h3>
+                            <form id="subsvcCondForm">
+                                <input type="hidden" name="pageIndex" id="subsvcPageIndex" value="1">
+                            </form>
+                            <div id="subsvcPageDiv"></div>
+                            <a class="sub-right-content__more" href="/sopmal/mpage/ordr/selectMbrSubsvcOrdrListInqireRForm">전체보기</a>
+                        </div>
+
                         <div class="sub-right-content__section">
                             <h3 class="sub-right-content__innerTitle">위시리스트</h3>
                                 <c:choose>

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

@@ -0,0 +1,92 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="ui" uri="http://www.winbit.kr/ctl/ui"%>
+<%@ taglib prefix="f" uri="/WEB-INF/tlds/f.tld"%>
+
+<c:choose>
+    <c:when test="${not empty data.resultList}">
+        <c:forEach var="order" items="${data.resultList}" begin="0" end="4">
+        <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('currency-unit.default')" var="curUnit"/>
+                    <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">
+                            <a href="javascript:void(0);" onclick="fn_go_subsvc_dtl('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>');" class="orderList__orderNum"><c:out value="${order.ordrInnb}"/></a>
+                            <span class="orderList__dot">·</span>
+                            <span class="orderList__date"><c:out value="${order.ordrDt}"/> 주문</span>
+                        </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">--%>
+<%--                        <span class="orderList__mileage"><span class="comma">예상적립 <fmt:formatNumber value="${order.mlgAmt}" pattern="#,###"/></span>점</span>--%>
+<%--                    </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>
+                            <c:when test="${order.ordrSttusCd > 39 && order.ordrSttusCd < 71}">
+                                <span class="orderList__status delivery"><c:out value="${order.ordrSttusNm}"/></span>
+                            </c:when>
+                            <c:when test="${order.ordrSttusCd == 75}">
+                                <span class="orderList__status complete"><c:out value="${order.ordrSttusNm}"/></span>
+                            </c:when>
+                            <c:when test="${order.ordrSttusCd > 84 && order.ordrSttusCd < 100}">
+                                <span class="orderList__status cancel"><c:out value="${order.ordrSttusNm}"/></span>
+                            </c:when>
+                        </c:choose>
+                    </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}"/>');" class="btn-ordr-sttus btn gray sm full">주문무효</a>
+                                <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:when>
+                            <c:when test="${order.ordrSttusCd > 24 && order.ordrSttusCd < 36}">
+                                <a href="javascript:void(0);" onclick="fn_call_setle_cancl_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '');" class="btn-ordr-sttus btn gray sm full">결제취소</a>
+                                <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:when>
+
+                            <c:when test="${order.ordrSttusCd > 39 && order.ordrSttusCd < 66}">
+                                <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_refund_pop('<c:out value="${order.ordrInnb}"/>');" class="btn-ordr-sttus btn gray sm full">반품신청</a>
+                           </c:when>
+                            <c:when test="${order.ordrSttusCd > 69 && order.ordrSttusCd < 76}">
+                                <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_refund_pop('<c:out value="${order.ordrInnb}"/>');" class="btn-ordr-sttus btn gray sm full">반품신청</a>
+                                <a href="<c:url value="/sopmal/mpage/act/selectMyRvwInqireForm"/>" class="btn-ordr-sttus btn outline sm full">리뷰작성</a>
+                                <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">구매확정111</a>
+                            </c:when>
+                        </c:choose>
+                    </div>
+                    --%>
+                </div>
+            </div>
+            <a class="sub-right-content__more" href="/sopmal/mpage/ordr/selectMbrOrdrListInqire">전체보기</a>
+        </div>
+        </c:forEach>
+    </c:when>
+    <c:otherwise>
+        <div class="orderList__no-result">
+            <img src="<c:url value="/pc/images/icon__no-result.png"/>" alt="">
+            <p class="orderList__no-result-text">주문내역이 없습니다.</p>
+        </div>
+    </c:otherwise>
+</c:choose>