diff --git a/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/service/BOOrdrService.java b/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/service/BOOrdrService.java index 2f13ef77..a38d1bfb 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/service/BOOrdrService.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/service/BOOrdrService.java @@ -1823,7 +1823,7 @@ public class BOOrdrService{ if(resultList == null || resultList.size() == 0){ ordrDlvyVO.getPaginationInfo().setTotalRecordCount(0); }else{ - ordrDlvyVO.getPaginationInfo().setTotalRecordCount(Integer.parseInt((String)resultList.get(0).get("totCnt"))); + ordrDlvyVO.getPaginationInfo().setTotalRecordCount(Integer.parseInt(String.valueOf(resultList.get(0).get("totCnt")))); } return resultList; diff --git a/src/main/java/com/wb/domainserver/domain/sopmal/mpage/ordr/controller/MyOrdrController.java b/src/main/java/com/wb/domainserver/domain/sopmal/mpage/ordr/controller/MyOrdrController.java index febb8f02..4a43b9a0 100644 --- a/src/main/java/com/wb/domainserver/domain/sopmal/mpage/ordr/controller/MyOrdrController.java +++ b/src/main/java/com/wb/domainserver/domain/sopmal/mpage/ordr/controller/MyOrdrController.java @@ -157,18 +157,18 @@ public class MyOrdrController { /** * 마이 페이지 > MY쇼핑 > 구독서비스 주문/배송 > 구독서비스 목록 조회 화면 이동 - * @return SubsvcOrdrDlvyListR.jsp + * @return SubsvcOrdrDlvyListRForm.jsp */ @Policy(AuthPolicy.RESTRICTED) - @RequestMapping(value="/selectMbrSubsvcOrdrListInqire") - public String selectMbrSubsvcOrdrListInqire(HttpServletRequest request, ModelMap model, MyOrdrDlvyVO ordrDlvyVO, BOMbrVO vo) throws Exception { + @RequestMapping(value="/selectMbrSubsvcOrdrListInqireRForm") + public String selectMbrSubsvcOrdrListInqireForm(HttpServletRequest request, ModelMap model, MyOrdrDlvyVO ordrDlvyVO, BOMbrVO vo) throws Exception { model.addAttribute("paramVO", new ObjectMapper().writeValueAsString(ordrDlvyVO)); // 마이페이지 > 상단 회원 정보 ( 등금, 이름, 마일리지, 쿠폰, 위시리스트, 배송중, 등급산정기준 ) Map content = selectBOMpageInfoInqire(vo); model.addAttribute("mpageResultMap", content); - return Util.getDeviceType(request) + "/mpage/ordr/SubsvcOrdrDlvyListR"; + return Util.getDeviceType(request) + "/mpage/ordr/SubsvcOrdrDlvyListRForm"; } /** @@ -182,7 +182,7 @@ public class MyOrdrController { Map content = selectBOMbrSubsvcOrdrListInqireAjax(ordrDlvyVO); model.addAttribute("data", content); - return "sopmal/mpage/ordr/SubsvcOrdrDlvyListRList"; + return "sopmal/mpage/ordr/SubsvcOrdrDlvyListR"; } /** diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListR.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListR.jsp index 570df89d..981f3149 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListR.jsp @@ -5,1084 +5,118 @@ <%@ 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"%> - -<%-- - Class Name : SubsvcOrdrDlvyListR.jsp - Description : 마이페이지 구독서비스 주문/배송조회 - Modification Information - - 수정일 수정자 수정내용 - ------- -------- --------------------------- - 2026-01-22 ㅇㅇㅇ 최초 생성 ---%> - - - - - <%-- 공통 include --%> - - - - - - - -<%-- 공통 Header --%> - - - -
-
-
-
- <%-- 마이페이지 Left 영역 --%> - - -
- <%-- 마이페이지 Right 영역 --%> -
- -
- -
-

구독서비스 주문/배송조회

-
- -
-
- -
-
-
-
- - - - - -
-
- - ~ - -
-
- -
-
-
-
+ + + + + +
+
+ " class="orderList__image"> + + " onerror="this.src='/pc/images/image_placeholder.png'" alt=""> + +
+
+
+ ', '');" class="orderList__orderNum"> + · + · ${order.ordrTyCdNm}
+ ', '');" class="orderList__productTitle"> + <%----%> + 옵션 + + +
+
+ ${curUnit} +
+
+ + 예상적립 점 + +
+
+ + + + + + + + + + + + +
+ + + () + + + () + + + () + + + () + + + +
+<%--
--%> +<%-- --%> +<%-- --%> +<%-- ', '', '');" class="btn-ordr-sttus btn gray sm full">주문취소--%> +<%-- --%> +<%-- ', '', '', '', '');" class="btn-ordr-sttus btn outline sm full">배송지 변경--%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- ', '', '', '', '');" class="btn-ordr-sttus btn gray sm full">결제취소--%> +<%-- --%> +<%-- ', '', '', '', '');" class="btn-ordr-sttus btn outline sm full">배송지 변경--%> +<%-- --%> +<%-- --%> + +<%-- --%> +<%-- ');" class="btn outline sm full">배송조회--%> +<%-- ', '', '', '', '');" class="btn-ordr-sttus btn gray sm full">결제취소--%> +<%-- --%> +<%-- --%> +<%-- ');" class="btn outline sm full">배송조회--%> +<%-- --%> +<%--<%– ', '','', '', '');" class="btn-ordr-sttus btn gray sm full">반품신청–%>--%> +<%-- ');" class="btn-ordr-sttus btn gray sm full">반품신청--%> +<%-- --%> +<%-- --%> +<%-- " class="btn-ordr-sttus btn theme sm full">리뷰작성--%> +<%-- --%> +<%-- --%> +<%-- ', '');" class="btn-ordr-sttus btn theme sm full">구매확정--%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%--
--%>
-
- - <%-- 공통 Footer --%> - - -
-
- - \ No newline at end of file + + + +
+ " alt=""> +

주문내역이 없습니다.

+
+ + +
+ +
diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListRForm.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListRForm.jsp new file mode 100644 index 00000000..60141ef4 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListRForm.jsp @@ -0,0 +1,1089 @@ +<%@ 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"%> + +<%-- + Class Name : SubsvcOrdrDlvyListRForm.jsp + Description : 마이페이지 구독서비스 주문/배송조회 + Modification Information + + 수정일 수정자 수정내용 + ------- -------- --------------------------- + 2026-01-22 전준석 최초 생성 + 2026-02-05 이대환 내용 수정 +--%> + + + + + <%-- 공통 include --%> + + + + + + + +<%-- 공통 Header --%> + + + +
+
+
+
+ <%-- 마이페이지 Left 영역 --%> + + +
+ <%-- 마이페이지 Right 영역 --%> +
+ +
+ +
+

구독서비스 주문/배송조회

+
+ +
+
+ +
+
+
+
+ + + + + +
+
+ + ~ + +
+
+ +
+
+
+
+
+
+
+
+
+
+ + <%-- 공통 Footer --%> + + +
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListRList.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListRList.jsp deleted file mode 100644 index 0f3227c2..00000000 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListRList.jsp +++ /dev/null @@ -1,122 +0,0 @@ -<%@ 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"%> - - - - - -
-
- " class="orderList__image"> - - " onerror="this.src='/pc/images/image_placeholder.png'" alt=""> - -
-
-
- ', '');" class="orderList__orderNum"> - · - · ${order.ordrTyCdNm} -
- ', '');" class="orderList__productTitle"> - <%----%> - 옵션 - - - -
-
- ${curUnit} -
-
- - 예상적립 점 - -
-
- - - - - - - - - - - - -
- - - () - - - () - - - () - - - () - - - -
-<%--
--%> -<%-- --%> -<%-- --%> -<%-- ', '', '');" class="btn-ordr-sttus btn gray sm full">주문취소--%> -<%-- --%> -<%-- ', '', '', '', '');" class="btn-ordr-sttus btn outline sm full">배송지 변경--%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- ', '', '', '', '');" class="btn-ordr-sttus btn gray sm full">결제취소--%> -<%-- --%> -<%-- ', '', '', '', '');" class="btn-ordr-sttus btn outline sm full">배송지 변경--%> -<%-- --%> -<%-- --%> - -<%-- --%> -<%-- ');" class="btn outline sm full">배송조회--%> -<%-- ', '', '', '', '');" class="btn-ordr-sttus btn gray sm full">결제취소--%> -<%-- --%> -<%-- --%> -<%-- ');" class="btn outline sm full">배송조회--%> -<%-- --%> -<%--<%– ', '','', '', '');" class="btn-ordr-sttus btn gray sm full">반품신청–%>--%> -<%-- ');" class="btn-ordr-sttus btn gray sm full">반품신청--%> -<%-- --%> -<%-- --%> -<%-- " class="btn-ordr-sttus btn theme sm full">리뷰작성--%> -<%-- --%> -<%-- --%> -<%-- ', '');" class="btn-ordr-sttus btn theme sm full">구매확정--%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%--
--%> -
-
-
- - - -
- " alt=""> -

주문내역이 없습니다.

-
- - -
- -