From a1a107cfe196769f7ae29524d85cf8df1aa18054 Mon Sep 17 00:00:00 2001
From: jazz
Date: Thu, 22 Jan 2026 14:58:33 +0900
Subject: [PATCH] =?UTF-8?q?fix=20:=20=EB=A7=88=EC=9D=B4=ED=8E=98=EC=9D=B4?=
=?UTF-8?q?=EC=A7=80=20=EA=B5=AC=EB=8F=85=EC=84=9C=EB=B9=84=EC=8A=A4=20?=
=?UTF-8?q?=EC=A3=BC=EB=AC=B8/=EB=B0=B0=EC=86=A1=20=EB=AA=A9=EB=A1=9D?=
=?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=ED=99=94=EB=A9=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../gcone/ordr/ordr/mapper/BOOrdrMapper.java | 8 +
.../ordr/ordr/service/BOOrdrService.java | 19 +
.../ordr/controller/MyOrdrController.java | 81 ++
.../mapper/gcone/ordr/ordr/BOOrdrMapper.xml | 159 +++
.../WEB-INF/views/comm/mpage/MypageRight.jsp | 2 +
.../views/sopmal/mpage/main/MpageMainR.jsp | 4 +-
.../sopmal/mpage/ordr/SubsvcOrdrDlvyListR.jsp | 1088 +++++++++++++++++
.../mpage/ordr/SubsvcOrdrDlvyListRList.jsp | 122 ++
.../views/sopmal_m/mpage/main/MpageMainR.jsp | 2 +
.../mpage/ordr/SubsvcOrdrDlvyListR.jsp | 877 +++++++++++++
10 files changed, 2360 insertions(+), 2 deletions(-)
create mode 100644 src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListR.jsp
create mode 100644 src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListRList.jsp
create mode 100644 src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDlvyListR.jsp
diff --git a/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/mapper/BOOrdrMapper.java b/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/mapper/BOOrdrMapper.java
index 2067ff79..3d774aae 100644
--- a/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/mapper/BOOrdrMapper.java
+++ b/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/mapper/BOOrdrMapper.java
@@ -972,6 +972,14 @@ public interface BOOrdrMapper {
* @return
*/
public String commonOrderSttusCdCheckCurrent(DataMap vo);
+
+
+ /**
+ * 사용자 > 마이페이지 > 구독서비스 주문/배송 목록 조회
+ * @param ordrDlvyVO
+ * @return List
+ */
+ public List selectMbrSubsvcOrdrList(BOOrdrDlvyVO ordrDlvyVO);
}
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 2bf7daed..2f13ef77 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
@@ -1810,6 +1810,25 @@ public class BOOrdrService{
return resultList;
}
+ /**
+ * 사용자 > 마이페이지 > MY쇼핑 > 구독서비스 주문/배송조회 > 구독서비스 주문/배송 목록 조회
+ * @param ordrDlvyVO
+ * @return List
+ */
+ public List selectMbrSubsvcOrdrListInqireAjax(BOOrdrDlvyVO ordrDlvyVO) {
+ List resultList = null;
+
+ resultList = mapper.selectMbrSubsvcOrdrList(ordrDlvyVO);
+
+ if(resultList == null || resultList.size() == 0){
+ ordrDlvyVO.getPaginationInfo().setTotalRecordCount(0);
+ }else{
+ ordrDlvyVO.getPaginationInfo().setTotalRecordCount(Integer.parseInt((String)resultList.get(0).get("totCnt")));
+ }
+
+ return resultList;
+ }
+
/**
* 사용자 > 마이페이지 > MY쇼핑 > 주문/배송조회 > 주문 취소 상태 수정
* @param ordrDlvyVO
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 37d580f3..febb8f02 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
@@ -155,6 +155,54 @@ public class MyOrdrController {
}
+ /**
+ * 마이 페이지 > MY쇼핑 > 구독서비스 주문/배송 > 구독서비스 목록 조회 화면 이동
+ * @return SubsvcOrdrDlvyListR.jsp
+ */
+ @Policy(AuthPolicy.RESTRICTED)
+ @RequestMapping(value="/selectMbrSubsvcOrdrListInqire")
+ public String selectMbrSubsvcOrdrListInqire(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";
+ }
+
+ /**
+ * 마이 페이지 > MY쇼핑 > 구독서비스 주문/배송 > 구독서비스 주문/배송 목록 조회
+ * @param ordrDlvyVO
+ * @return ResponseEntity
+ */
+ @Policy(AuthPolicy.RESTRICTED)
+ @RequestMapping(value="/selectMbrSubsvcOrdrListInqireAjax")
+ public String selectMbrSubsvcOrdrListInqireAjax(ModelMap model, BOOrdrDlvyVO ordrDlvyVO) {
+
+ Map content = selectBOMbrSubsvcOrdrListInqireAjax(ordrDlvyVO);
+ model.addAttribute("data", content);
+ return "sopmal/mpage/ordr/SubsvcOrdrDlvyListRList";
+ }
+
+ /**
+ * 마이 페이지 > MY쇼핑 > 구독서비스 주문/배송조회 > 구독서비스 주문/배송 목록 조회 (스크롤)
+ * @param ordrDlvyVO
+ * @return ResponseEntity
+ */
+ @Policy(AuthPolicy.RESTRICTED)
+ @RequestMapping(value="/selectMbrSubsvcOrdrListInqireScrollAjax", produces = MediaType.APPLICATION_JSON_VALUE)
+ public ResponseEntity selectMbrSubsvcOrdrListInqireScrollAjax(ModelMap model, BOOrdrDlvyVO ordrDlvyVO) {
+
+ Map content = selectBOMbrSubsvcOrdrListInqireAjax(ordrDlvyVO);
+ return ResponseEntity.ok(
+ WnbtResponse.builder()
+ .resBody(new WnbtResponseBody(content))
+ .build()
+ );
+ }
+
+
/**
* 마이 페이지 > MY쇼핑 > 주문/배송조회 > 주문/배송 목록 조회
* @param ordrDlvyVO
@@ -1466,6 +1514,39 @@ public class MyOrdrController {
return content;
}
+
+ /**
+ * 사용자 > 마이페이지 > 구독서비스 주문/배송 조회
+ */
+ public Map selectBOMbrSubsvcOrdrListInqireAjax(BOOrdrDlvyVO ordrDlvyVO) {
+ AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+ if ("01".equals(user.getSysDvCd())) {
+ ordrDlvyVO.setSopmalCd(user.getSopmalCd());
+ }
+ ordrDlvyVO.setMbrInnb(BigInteger.valueOf(user.getUserInnb()));
+ ordrDlvyVO.setMbrDvCd(user.getMbrDvCd());
+
+ PaginationInfo paginationInfo = new PaginationInfo();
+ paginationInfo.setCurrentPageNo(ordrDlvyVO.getPageIndex());
+ paginationInfo.setRecordCountPerPage(ordrDlvyVO.getPageUnit());
+ paginationInfo.setPageSize(paginationProperties.getPageSize());
+
+ ordrDlvyVO.setPaginationInfo(paginationInfo);
+ ordrDlvyVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+ ordrDlvyVO.setLastIndex(paginationInfo.getLastRecordIndex());
+ ordrDlvyVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+ ordrDlvyVO.setMbrInnb(BigInteger.valueOf(MemberJwtContextHolder.getMemberInfo().getUserInnb()));
+
+ List resultList = boOrdrService.selectMbrSubsvcOrdrListInqireAjax(ordrDlvyVO);
+
+ Map content = new HashMap<>();
+
+ content.put("resultList", resultList);
+ content.put("paginationInfo", ordrDlvyVO.getPaginationInfo());
+
+ return content;
+ }
+
/**
* bo로직 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문상세 조회 > 결제취소/환불신청 정보 조회
*/
diff --git a/src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml b/src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml
index 09b98c5a..625277e3 100644
--- a/src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml
+++ b/src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml
@@ -3939,6 +3939,7 @@
AND GOR.SOPMAL_CD = #{sopmalCd}
AND GOR.MBR_DV_CD = #{mbrDvCd}
AND GOR.MBR_INNB = #{mbrInnb}
+ AND GOR.SUBSVC_INNB IS NULL /*구독서비스 제외*/
)
GROUP BY FOI.ORDR_INNB
) ITEM ON ITEM.SOPMAL_CD = FO.SOPMAL_CD
@@ -3946,6 +3947,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 NULL /*구독서비스 제외*/
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}
@@ -5247,6 +5249,163 @@
]]>
+
+
+
+
+
+ AND (
+ TB.ORDR_INNB LIKE CONCAT('%', #{srchwrd}, '%') OR
+ TB.GOODS_NM LIKE CONCAT('%', #{srchwrd}, '%')
+ )
+
+
+ AND TB.ORDR_RCEPT_DT BETWEEN DATE(#{bgnDt}) AND DATE(#{endDt}) + 1
+
+
diff --git a/src/main/webapp/WEB-INF/views/comm/mpage/MypageRight.jsp b/src/main/webapp/WEB-INF/views/comm/mpage/MypageRight.jsp
index 1d9a415b..29f16414 100644
--- a/src/main/webapp/WEB-INF/views/comm/mpage/MypageRight.jsp
+++ b/src/main/webapp/WEB-INF/views/comm/mpage/MypageRight.jsp
@@ -79,6 +79,7 @@
+<%--
@@ -89,6 +90,7 @@
+--%>
<%--충전형마일리지 사용야부에 따라 화면 위치 다름--%>
diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/main/MpageMainR.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/main/MpageMainR.jsp
index e3176de7..1af3df85 100644
--- a/src/main/webapp/WEB-INF/views/sopmal/mpage/main/MpageMainR.jsp
+++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/main/MpageMainR.jsp
@@ -899,7 +899,7 @@
-
+<%--
주문/배송 조회 (최근 1개월)
@@ -921,7 +921,7 @@
전체보기
-
+--%>
최근 주문
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
new file mode 100644
index 00000000..570df89d
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListR.jsp
@@ -0,0 +1,1088 @@
+<%@ 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 : SubsvcOrdrDlvyListR.jsp
+ Description : 마이페이지 구독서비스 주문/배송조회
+ Modification Information
+
+ 수정일 수정자 수정내용
+ ------- -------- ---------------------------
+ 2026-01-22 ㅇㅇㅇ 최초 생성
+--%>
+
+
+
+
+ <%-- 공통 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
new file mode 100644
index 00000000..0f3227c2
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListRList.jsp
@@ -0,0 +1,122 @@
+<%@ 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="">
+
주문내역이 없습니다.
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/main/MpageMainR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/main/MpageMainR.jsp
index 402db26e..924cad8a 100644
--- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/main/MpageMainR.jsp
+++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/main/MpageMainR.jsp
@@ -156,6 +156,7 @@
+<%--
주문/배송 조회
+--%>
diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDlvyListR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDlvyListR.jsp
new file mode 100644
index 00000000..525ef6d8
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDlvyListR.jsp
@@ -0,0 +1,877 @@
+<%@ 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"%>
+
+
+
+
+
+
+
+
+ <%-- 공통 include --%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
총 0건
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<%-- 마이크로 모달 DIV 시작--%>
+
+
+
+
+
+
+<%-- 마이크로 모달 DIV 종료--%>
+
+
\ No newline at end of file