From e9b53f049efc9767f29c11f309b9da087075e0db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=8C=80=ED=99=98?= Date: Mon, 9 Feb 2026 10:19:49 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=EA=B5=AC=EB=8F=85=EC=84=9C=EB=B9=84?= =?UTF-8?q?=EC=8A=A4=20=EC=A3=BC=EB=AC=B8/=EB=B0=B0=EC=86=A1=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=EC=A1=B0=ED=9A=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ordr/controller/MyOrdrController.java | 39 + .../mapper/gcone/ordr/ordr/BOOrdrMapper.xml | 4 +- .../sopmal/mpage/ordr/SubsvcOrdrDlvyListR.jsp | 4 +- .../mpage/ordr/SubsvcOrdrDlvyListRForm.jsp | 4 +- .../sopmal/mpage/ordr/SubsvcOrdrDtlR.jsp | 1670 +++++++++++++++++ 5 files changed, 1715 insertions(+), 6 deletions(-) create mode 100644 src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDtlR.jsp 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 4a43b9a0..f9040971 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 @@ -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 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 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쇼핑 > 주문/배송조회 > 주문/배송 목록 조회 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 07d4ece0..c3f1babf 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 @@ -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} 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 981f3149..799977aa 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 @@ -19,11 +19,11 @@
- ', '');" class="orderList__orderNum"> + ', '');" class="orderList__orderNum"> · · ${order.ordrTyCdNm}
- ', '');" class="orderList__productTitle"> + ', '');" class="orderList__productTitle"> <%----%> 옵션 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 index 60141ef4..0de484b2 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListRForm.jsp +++ b/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($('', {type: 'hidden', name: 'ordrInnb', id: 'ordrInnb', value: ordrInnb})); $(form).attr('method', 'get'); - $(form).attr('action', ''); + $(form).attr('action', ''); $(form).submit(); } diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDtlR.jsp new file mode 100644 index 00000000..0950622e --- /dev/null +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDtlR.jsp @@ -0,0 +1,1670 @@ +<%@ 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 : OrdrDtlR.jsp + Description : 구독서비스 주문/배송 상세조회 + Modification Information + + 수정일 수정자 수정내용 + ------- -------- --------------------------- + 2026-02-06 이대환 최초 생성 +--%> + + + + + + <%-- 공통 include --%> + + + + + + + + <%-- 공통 Header --%> + + + +
+
+
+
+ <%-- 마이페이지 Left 영역 --%> + + +
+ <%-- 마이페이지 Right 영역 --%> + + + +
+ + +
+ + + + + + +
+

구독서비스 주문상세내역

+
+

총 곳의 배송지로 주문하셨습니다.

+ + + ', '', '', '', '', '');" class="btn gray2">전체결제취소 + + + ');">반품신청 + + +
+ +

주문번호

+ + + +
+
+
. 배송지 정보
+
+ + + + + + + +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
상품정보
상품명수량상품금액할인금액할인적용금액적립금처리상태
+
+
+ "> + " onerror="this.src='/pc/images/image_placeholder.png'" alt=""> + +
+
+ " class="cartItem__productTitle"> + 옵션 +
+
+ 		+ + + ${curUnit} + + + + (-) + + ${curUnit} + + + + + ${curUnit} + + + + + 점 + + + + + + + + +
(구매확정) + + + +
+ + + ', '', '', '', '');" + class="btn outline sm" + style="margin-left: 10px !important;">배송지 변경 + + + ', '', '', '', '');" + class="btn outline sm" + style="margin-left: 10px !important;">배송지 변경 + + + ');" id="inqireDlvy" class="btn-ordr-sttus btn outline sm full">배송조회 + ');">반품신청 + + + ');" id="inqireDlvy" class="btn-ordr-sttus btn outline sm full">배송조회 + ');">반품신청 + + + ', + '', + '', + '', + '', + '',);" class="btn-ordr-sttus btn theme sm full" disabled>구매확정 + + + 리뷰작성 + + + + +
+
+
+
+
+ + + +
+ " alt=""> +

주문내역이 없습니다.

+
+ + +
+ +
+

주문자 정보

+
+ + + + + + + + + + + + + + + + + + + + + +
주문자 정보
이름
휴대폰번호
이메일
+

개인정보 보호법에 의하여 6개월이 지난 주문의 개인정보는 삭제처리됩니다.


+

주문자 정보로 주문 관련 정보가 문자와 이메일로 발송됩니다.

+
+
+ +
+

주문 결제 정보

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--주문취소시 미노출--%> + + + + + + + + + + + + + + + + + + + + +
주문 결제 정보
주문번호 ()
주문상태 + +
결제방식
입금계좌 ()
결제금액${curUnit}
결제일시 + + + + +
GC 머니 + ${setle.cashSetleAmt} +
현금영수증 + + + + + + + 미신청 + + + + + + + <%-- 현:현금영수증 --%> + + + + +
+ + + +
+ " alt="!"> +

결제내역이 없습니다.

+
+ + + + +
+
    +
  • + 총 주문금액 + ${curUnit} +
    • +
  • + 할인금액 + (-)${curUnit} +
    • + + +
  • + + ${curUnit} +
    • +     +     +
  • + 배송비 + ${curUnit} +
    • + + +
  • + + ${curUnit} +
    • +     +     +
+
+ 결제금액 + ${curUnit} +
+
+
+
+ + + + + + + + +<%-- --%> + +
+

무효/취소/반품 내역

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
구독서비스 주문상세내역
무효/취소/반품접수일시처리일시처리수량처리금액처리상태보기
+ + + + + +
+
+
+
+ + +
+ 주문 목록 +
+
+
+
+
+ + +
+ + <%-- 공통 Footer --%> + + +
+
+ + \ No newline at end of file