fix : 구독서비스 주문/배송 상세조회

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

@@ -202,6 +202,45 @@ public class MyOrdrController {
         );
     }
 
+    /**
+     * 마이 페이지 > MY쇼핑 > 구독서비스 주문/배송조회 > 주문/배송 상세 조회 화면 이동
+     * @return OrdrDtlR.jsp
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value="/selectMbrSubsvcOrdrDtlInqire")
+    public String selectMbrSubsvcOrdrDtlInqire(HttpServletRequest request, ModelMap model, BOOrdrDlvyVO ordrDlvyVO, BOMbrVO vo) throws Exception {
+        AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+        if ("01".equals(user.getSysDvCd())) {
+            ordrDlvyVO.setSopmalCd(user.getSopmalCd());
+        }
+        Map<String, Object> message = boOrdrService.selectMbrOrdrDtlInqire(ordrDlvyVO);
+        /**발급대상구분코드*/
+        BOMaComncdVO bOMaComncdVO = new BOMaComncdVO();
+        bOMaComncdVO.setGroupCd("ISSU_TRGET_DV");
+        List<?> issuTrgetDv = bOMaComncdService.selectBOCommcdDetailList(bOMaComncdVO);
+
+        message.put("issuTrgetDv", issuTrgetDv);
+        model.addAttribute("data", message);
+//        responseHandler.handleResponse(
+//                sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/ordr/ordr/selectBOMbrOrdrDtlInqire", ordrDlvyVO),
+//                model,
+//                "data"
+//        );
+        model.addAttribute("paramVO", new ObjectMapper().writeValueAsString(ordrDlvyVO));
+        model.addAttribute("vo", ordrDlvyVO);
+
+        // 마이페이지 > 상단 회원 정보 ( 등금, 이름, 마일리지, 쿠폰, 위시리스트, 배송중, 등급산정기준 )
+        Map<String, Object> content = selectBOMpageInfoInqire(vo);
+        model.addAttribute("mpageResultMap", content);
+//        responseHandler.handleResponse(
+//                sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/mbr/mbr/selectBOMpageInfoInqire", ordrDlvyVO),
+//                model,
+//                "mpageResultMap"
+//        );
+
+        return Util.getDeviceType(request) + "/mpage/ordr/SubsvcOrdrDtlR";
+    }
+
 
     /**
      * 마이 페이지 > MY쇼핑 > 주문/배송조회 > 주문/배송 목록 조회

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

@@ -5385,7 +5385,7 @@
                                                                              AND GOR.SOPMAL_CD = #{sopmalCd}
                                                                              AND GOR.MBR_DV_CD = #{mbrDvCd}
                                                                              AND GOR.MBR_INNB = #{mbrInnb}
-                                                                             AND GOR.SUBSVC_INNB IS NOT NULL /*구독서비스*/
+                                                                             AND GOR.SUBSVC_AT = 'Y' /*구독서비스*/
                                                                           )
                                GROUP BY FOI.ORDR_INNB
                                   ) ITEM ON ITEM.SOPMAL_CD = FO.SOPMAL_CD
@@ -5393,7 +5393,7 @@
                         LEFT JOIN GC_ORDER_SETLE FOS ON FOS.SOPMAL_CD = FO.SOPMAL_CD
                                                     AND FOS.ORDR_INNB = FO.ORDR_INNB
                             WHERE FO.USE_AT = 'Y'
-                              AND FO.SUBSVC_INNB IS NOT NULL /*구독서비스*/
+                              AND FO.SUBSVC_AT = 'Y' /*구독서비스*/
                               AND ( ( FO.ORDR_STTUS_CD BETWEEN '15' AND '75' ) OR FO.ORDR_STTUS_CD = '95' )
                               AND FO.SOPMAL_CD = #{sopmalCd}
                               AND FO.MBR_DV_CD = #{mbrDvCd}

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

@@ -19,11 +19,11 @@
                 <div class="orderList__description">
                     <div class="orderList__description__first">
                         <div class="orderList__item__top">
-                            <a href="javascript:void(0);" onclick="fn_go_subscribe_dtl('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>');" class="orderList__orderNum"><c:out value="${order.ordrInnb}"/></a>
+                            <a href="javascript:void(0);" onclick="fn_go_subsvc_dtl('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>');" class="orderList__orderNum"><c:out value="${order.ordrInnb}"/></a>
                             <span class="orderList__dot">·</span>
                             <span class="orderList__date"><c:out value="${order.ordrDt}"/> <span class="orderList__dot">·</span> ${order.ordrTyCdNm}</span>
                         </div>
-                        <a href="javascript:void(0);" onclick="fn_go_subscribe_dtl('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>');" class="orderList__productTitle"><c:out value="${order.goodsNm}"/></a>
+                        <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}">

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

@@ -641,13 +641,13 @@
 
 
         /* 구독상세 이동 */
-        const fn_go_subscribe_dtl = function (sopmalCd, ordrInnb) {
+        const fn_go_subsvc_dtl = function (sopmalCd, ordrInnb) {
             var form = $('#condForm');
 
             $(form).append($('<input/>', {type: 'hidden', name: 'ordrInnb', id: 'ordrInnb', value: ordrInnb}));
 
             $(form).attr('method', 'get');
-            $(form).attr('action', '<c:url value="/sopmal/mpage/ordr/selectMbrOrdrDtlInqire"/>');
+            $(form).attr('action', '<c:url value="/sopmal/mpage/ordr/selectMbrSubsvcOrdrDtlInqire"/>');
 
             $(form).submit();
         }