jsshin 5 лет назад
Родитель
Сommit
dff2c179fb

+ 10 - 0
src/main/java/com/style24/front/biz/dao/TsfPointDao.java

@@ -74,4 +74,14 @@ public interface TsfPointDao {
 	 */
 	Collection<Point> getUsePointList(Point point);
 
+	/**
+	 * 마이페이지 > 회원탈퇴 > 고객 포인트 정보
+	 *
+	 * @param point - 고객번호 , 사이트코드
+	 * @return Point - 고객 포인트 정보
+	 * @author jsshin
+	 * @since 2021. 03. 23
+	 */
+	Point getCustomerPoint(Point point);
+
 }

+ 34 - 2
src/main/java/com/style24/front/biz/service/TsfPointService.java

@@ -61,21 +61,53 @@ public class TsfPointService {
 	}
 	
 	/**
-	 * 마이페이지 STYLE24 포인트 전체,적립,사용내역
+	 * 마이페이지 STYLE24 포인트 전체
 	 *
-	 * @param Point
+	 * @param point
+	 * @return Collection<Point>
 	 * @author csh9191
 	 * @since 2021. 03. 03
 	 */	
 	public Collection<Point> getAllPointList(Point point) {
 		return pointDao.getAllPointList(point);
 	}
+
+	/**
+	 * 마이페이지 STYLE24 포인트 적립
+	 *
+	 * @param point
+	 * @return Collection<Point>
+	 * @author csh9191
+	 * @since 2021. 03. 03
+	 */
 	public Collection<Point> getAccumulatePointList(Point point) {
 		return pointDao.getAccumulatePointList(point);
 	}
+
+	/**
+	 * 마이페이지 STYLE24 포인트 사용내역
+	 *
+	 * @param point
+	 * @return Collection<Point>
+	 * @author csh9191
+	 * @since 2021. 03. 03
+	 */
 	public Collection<Point> getUsePointList(Point point) {
 		return pointDao.getUsePointList(point);
 	}
 
 
+	/**
+	 * 마이페이지 STYLE24 포인트 사용내역
+	 *
+	 * @param point - 고객번호
+	 * @return Point
+	 * @author jsshin
+	 * @since 2021. 03. 23
+	 */
+	public Point getCustomerPoint(Point point) {
+		return pointDao.getCustomerPoint(point);
+	}
+
+
 }

+ 8 - 7
src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -983,24 +983,25 @@ public class TsfMypageController extends TsfBaseController {
 	public ModelAndView getCustomerSecedeForm() {
 		ModelAndView mav = new ModelAndView();
 
-		mav.addObject("custId", TsfSession.getInfo().getCustId());
 		Order order = new Order();
 		order.setCustNo(TsfSession.getInfo().getCustNo());
 
 		Point point = new Point();
 		point.setCustNo(TsfSession.getInfo().getCustNo());
 
-		// 쿠폰정보 조회
-		mav.addObject("couponCnt", coreOrderService.getCouponInfo(order));
+		// 주문 상태 별 수량 조회
+		mav.addObject("orderStatInfo", orderService.getOrderStatCount(order));
 
-		// 사용가능 포인트
-		mav.addObject("rmPntAmt", pointService.getUsablePointInfo(point));
+		// 포인트정보
+		mav.addObject("pointInfo", pointService.getCustomerPoint(point));
 
 		// 상품권 정보 조회
 		mav.addObject("rmGfcdAmt", coreOrderService.getGiftcardInfo(order));
 
-		// 주문 상태 별 수량 조회
-		mav.addObject("orderCount", orderService.getOrderStatCount(order));
+		// 쿠폰정보 조회
+		mav.addObject("couponCnt", coreOrderService.getCouponInfo(order));
+
+		mav.addObject("custId", TsfSession.getInfo().getCustId());
 
 		mav.setViewName(super.getDeviceViewName("/mypage/MypageCustSecedeForm"));
 

+ 0 - 97
src/main/webapp/WEB-INF/views/web/common/layout/MypageCustLayoutWeb.html

@@ -1,97 +0,0 @@
-<!DOCTYPE html>
-<html lang="ko"
-	xmlns:th="http://www.thymeleaf.org"
-	xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
-
-<head th:replace="~{web/common/fragments/HeadWeb :: head}"></head>
-
-<body>
-
-<div class="skipComment">
-	<a href="#content">본문 바로가기</a>
-	<a href="#gnb">주메뉴 바로가기</a>
-	<a href="#footer">하단메뉴 바로가기</a>
-</div>
-	
-<th:block th:replace="~{web/common/fragments/VariablesWeb :: variables}"></th:block>
-
-<!-- GNB -->
-<header id="header" th:replace="~{web/common/fragments/GnbWeb :: gnb}"></header>
-<!--// GNB -->
-
-<div id="container" class="container my">
-	<div class="breadcrumb">
-		<ul id="location">
-			<li class="bread_home"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MAIN);">홈</a></li>
-			<li class="bread_2depth"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MYPAGE);">마이페이지</a></li>
-		</ul>
-	</div>
-	<div class="wrap">
-		<div class="content myManage">
-
-			<div class="cont_body">
-				<!-- CONT-BODY -->
-				<div class="lnb">
-					<div class="lnb_tit">
-						<h2>마이페이지</h2>
-					</div>
-					<div class="lnb_list">
-						<ul id="mypageLnbList">
-						</ul>
-					</div>
-				</div>
-				
-				<!-- CONTENT AREA -->
-				<th:block layout:fragment="content"></th:block>
-				<!-- // CONTENT AREA -->
-				
-				<!-- // CONT-BODY -->
-			</div>
-		</div>
-	</div>
-</div>
-
-<!-- Footer -->
-<footer id="footer" th:replace="~{web/common/fragments/FooterWeb :: footer}"></footer>
-
-<th:block th:replace="~{web/common/fragments/ScriptsWeb :: scripts}"></th:block>
-
-<script th:inline="javascript">
-/*<![CDATA[*/
-	var fnSetMypageLnbList = function(lnbLvl) {
-		let tag = '';
-		tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);"' + (lnbLvl == 1 ? ' class="on"' : '') + '>주문확인/배송조회</a></li>\n';
-		tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_CRS_LIST);"' + (lnbLvl == 2 ? ' class="on"' : '') + '>취소/반품/환불내역</a></li>\n';
-		tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_RESTOCK);"' + (lnbLvl == 3 ? ' class="on"' : '') + '>재입고 알림 내역</a></li>\n';
-		tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_COUPON);"' + (lnbLvl == 4 ? ' class="on"' : '') + '>쿠폰</a></li>\n';
-		tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_POINT);"' + (lnbLvl == 5 ? ' class="on"' : '') + '>STYLE24 포인트</a></li>\n';
-		tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_GIFTCARD);"' + (lnbLvl == 6 ? ' class="on"' : '') + '>상품권</a></li>\n';
-		tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_REVIEW);"' + (lnbLvl == 7 ? ' class="on"' : '') + '>리뷰</a></li>\n';
-		tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_DELIVERY_ADDR);"' + (lnbLvl == 8 ? ' class="on"' : '') + '>배송지 관리</a></li>\n';
-		tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_WISHLIST);"' + (lnbLvl == 9 ? ' class="on"' : '') + '>위시리스트</a></li>\n';
-		tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_CUSTOMER);"' + (lnbLvl == 10 ? ' class="on"' : '') + '>내정보 관리</a></li>\n';
-		tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_SECEDE);"' + (lnbLvl == 11 ? ' class="on"' : '') + '>회원 탈퇴</a></li>\n';
-		tag += '</ul>';
-		$('#mypageLnbList').html(tag);
-	}
-
-
-	var fnSetMypageCustLocation = function(depth3, depth3Link, depth4) {
-		let tag = '';
-		if (gagajf.isNull(depth4)) {
-			tag += '<li class="bread_3depth">' + depth3 + '</li>'
-		} else {
-			tag += '<li className="bread_3depth"><a href="javascript:void(0);" onclick="cfnGoToPage(' + depth3Link + ');">' + depth3 + '</a></li>';
-			tag += '<li class="bread_3depth">' + depth4 + '</li>'
-		}
-		$('#location').append(tag);
-	}
-	
-	$(document).ready(function() {
-		
-	});
-/*]]>*/
-</script>
-
-</body>
-</html>

+ 54 - 46
src/main/webapp/WEB-INF/views/web/mypage/MypageCustConfirmFormWeb.html

@@ -2,7 +2,7 @@
 <html lang="ko"
 	  xmlns:th="http://www.thymeleaf.org"
 	  xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-	  layout:decorator="web/common/layout/MypageCustLayoutWeb">
+	  layout:decorator="web/common/layout/MypageLayoutWeb">
 <!--
  *******************************************************************************
  * @source  : MypageCustConfirmFormWeb.html
@@ -19,53 +19,61 @@
 
 <body>
 <th:block layout:fragment="content">
-	<div class="cont">
-		<div class="sec_head">
-			<h3 class="subH1">내 정보 관리</h3>
-			<p class="text">정보를 안전하게 보호하기 위하여 비밀번호를 다시 확인 합니다.</p>
-		</div>
-		<form id="confirmForm" class="form_wrap" role="form" method="post">
-			<div class="sec_body">
-				<div class="tbl type1">
-					<table>
-						<colgroup>
-							<col width="210">
-							<col width="*">
-						</colgroup>
-						<tbody>
-							<tr>
-								<th>아이디</th>
-								<td>
-									<div class="form_field">
-										<div class="input_wrap">
-											<input type="text" id="custId" name="custId" class="form_control" th:value="${custId}" readonly="readonly"/>
-										</div>
-									</div>
-								</td>
-							</tr>
-							<tr>
-								<th>비밀번호</th>
-								<td>
-									<div class="form_field">
-										<div class="input_wrap">
-										<input type="password" id="passwd" name="passwd" class="form_control" placeholder="비밀번호를 입력해주세요."/>
-										</div>
-									</div>
-								</td>
-							</tr>
-						</tbody>
-					</table>
-				</div>
+	<div class="content myManageEntry"> <!-- 페이지특정 클래스 = myManageEntry -->
+		<div class="cont_body">
+			<!-- CONT-BODY -->
+			<div class="lnb">
+				<!-- 마이페이지 lnb 영역 -->
 			</div>
-			<div class="btn_footer_area">
-				<button type="button" class="btn btn_default cancle_btn" onclick="cfnGoToPage(_PAGE_MAIN);">
-					<span>취소</span>
-				</button>
-				<button type="button" id="btnConfirm" class="btn btn_dark submit_btn">
-					<span>확인</span>
-				</button>
+			<div class="cont">
+				<div class="sec_head">
+					<h3 class="subH1">내 정보 관리</h3>
+					<p class="text">정보를 안전하게 보호하기 위하여 비밀번호를 다시 확인 합니다.</p>
+				</div>
+				<form id="confirmForm" class="form_wrap" role="form" method="post">
+					<div class="sec_body">
+						<div class="tbl type1">
+							<table>
+								<colgroup>
+									<col width="210">
+									<col width="*">
+								</colgroup>
+								<tbody>
+									<tr>
+										<th>아이디</th>
+										<td>
+											<div class="form_field">
+												<div class="input_wrap">
+													<input type="text" id="custId" name="custId" class="form_control" th:value="${custId}" readonly="readonly"/>
+												</div>
+											</div>
+										</td>
+									</tr>
+									<tr>
+										<th>비밀번호</th>
+										<td>
+											<div class="form_field">
+												<div class="input_wrap">
+												<input type="password" id="passwd" name="passwd" class="form_control" placeholder="비밀번호를 입력해주세요."/>
+												</div>
+											</div>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+					</div>
+					<div class="btn_footer_area">
+						<button type="button" class="btn btn_default cancle_btn" onclick="cfnGoToPage(_PAGE_MAIN);">
+							<span>취소</span>
+						</button>
+						<button type="button" id="btnConfirm" class="btn btn_dark submit_btn">
+							<span>확인</span>
+						</button>
+					</div>
+				</form>
 			</div>
-		</form>
+		</div>
 	</div>
 <script th:inline="javascript">
 	/*<![CDATA[*/

+ 205 - 197
src/main/webapp/WEB-INF/views/web/mypage/MypageCustModifyFormWeb.html

@@ -2,7 +2,7 @@
 <html lang="ko"
 	  xmlns:th="http://www.thymeleaf.org"
 	  xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-	  layout:decorator="web/common/layout/MypageCustLayoutWeb">
+	  layout:decorator="web/common/layout/MypageLayoutWeb">
 <!--
  *******************************************************************************
  * @source  : MypageCustModifyFormWeb.html
@@ -19,209 +19,217 @@
 <meta http-equiv="Content-Type" content="text/html; charset=EUC-KR">
 <body>
 <th:block layout:fragment="content">
-	<div class="cont">
-		<div class="sec_head">
-			<h3 class="subH1">내 정보 관리</h3>
-		</div>
-		<form id="custModiFyForm" class="form_wrap" role="form" method="post" action="/mypage/account/check" accept-charset="EUC-KR" onsubmit="document.charset='euc-kr';">
-			<div class="sec_body">
-				<div class="modify_box">
-					<h4 class="subH3">회원정보</h4>
-					<button type="button" class="btn btn_default btn_sm" onclick="cfnOpenCellphoneCertify();"><span>개명 본인인증</span></button>
-					<div class="tbl type1">
-						<table>
-							<colgroup>
-								<col width="210">
-								<col width="*">
-							</colgroup>
-							<tr>
-								<th>이름</th>
-								<td id="custNm" name="custNm"></td>
-							</tr>
-							<tr>
-								<th>생년월일</th>
-								<td id="birthYmd" name="birthYmd"></td>
-							</tr>
-						</table>
-					</div>
-					<div class="txt_info">
-						<ul>
-							<li>
-								본인 인증을 통해 자동으로 수집되는 정보 입니다.
-							</li>
-						</ul>
-					</div>
-				</div>
-				<div class="modify_box">
-					<h4 class="sr-only">회원정보 수정</h4>
-					<div class="tbl type1">
-						<table>
-							<colgroup>
-								<col width="210">
-								<col width="*">
-							</colgroup>
-							<tbody>
-								<tr>
-									<th>
-										<span>아이디</span>
-									</th>
-									<td>
-										<div class="form_field">
-											<div class="input_wrap">
-												<input type="text" id="custId" name="custId" class="form_control" placeholder="" readonly="readonly"/>
-											</div>
-										</div>
-									</td>
-								</tr>
-								<tr>
-									<th>
-										<span>비밀번호</span>
-									</th>
-									<td>
-										<button type="button" class="btn btn_primary_line" onclick="cfnGoToPage(_PAGE_CUSTOMER_PWD_CHANGE_TEMP);">
-											<span>변경하기</span>
-										</button>
-									</td>
-								</tr>
-								<tr>
-									<th>이메일</th>
-									<td>
-										<div class="form_field">
-											<div class="input_wrap">
-												<input type="text" id="email" name="email" class="form_control" placeholder=""/>
-											</div>
-										</div>
-									</td>
-								</tr>
-								<tr>
-									<th>휴대폰 번호</th>
-									<td>
-										<div class="form_field">
-											<div class="input_wrap">
-												<input type="text" id="cellPhnno" name="cellPhnno" class="form_control" placeholder="휴대폰 인증을 해주세요" readonly="readonly"/>
-											</div>
-											<button type="button" class="btn btn_dark" onclick="cfnOpenCellphoneCertify();">
-												<span>휴대폰 인증</span>
-											</button>
-										</div>
-									</td>
-								</tr>
-							</tbody>
-						</table>
-					</div>
+	<div class="content myManage"> <!-- 페이지특정 클래스 = myManage -->
+		<div class="cont_body">
+			<!-- CONT-BODY -->
+			<div class="lnb">
+				<!-- 마이페이지 lnb 영역 -->
+			</div>
+			<div class="cont">
+				<div class="sec_head">
+					<h3 class="subH1">내 정보 관리</h3>
 				</div>
-				<div class="modify_box">
-					<h4 class="subH3">환불계좌 정보</h4>
-					<div class="tbl type1">
-						<table>
-							<colgroup>
-								<col width="210">
-								<col width="*">
-							</colgroup>
-							<tbody>
-								<tr>
-									<th class="ver_top">예금주</th>
-									<td>
-										<div class="form_field">
-											<div class="input_wrap">
-												<input type="text" id="accountNm" name="accountNm" class="form_control" placeholder="" readonly="readonly"/>
-											</div>
-										</div>
-										<div class="txt_info">
-											<ul>
-												<li>
-													회원명 본인이 예금주인 통장으로만 환불이 가능합니다.
-												</li>
-											</ul>
-										</div>
-									</td>
-								</tr>
-								<tr>
-									<th>
-										<span>은행명</span>
-									</th>
-									<td>
-										<div class="form_field">
-											<div class="select_custom select_bank">
-												<div class="combo">
-													<div class="select">선택</div>
-													<ul class="list">
-														<li id="bankCd_" class="selected">
-															<div text="선택"></div>
-															<input type="hidden" name="bankCd" value=""/>
-														</li>
-														<th:block th:if="${bankList}" th:each="oneData, status : ${bankList}">
-														<li th:id="|bankCd_${oneData.cd}|" th:with="cd = ${oneData.cd}">
-															<div th:text="${oneData.cdNm}"></div>
-															<input type="hidden" name="bankCd" th:value="${cd}"/>
+				<form id="custModiFyForm" class="form_wrap" role="form" method="post" action="/mypage/account/check" accept-charset="EUC-KR" onsubmit="document.charset='euc-kr';">
+					<div class="sec_body">
+						<div class="modify_box">
+							<h4 class="subH3">회원정보</h4>
+							<button type="button" class="btn btn_default btn_sm" onclick="cfnOpenCellphoneCertify();"><span>개명 본인인증</span></button>
+							<div class="tbl type1">
+								<table>
+									<colgroup>
+										<col width="210">
+										<col width="*">
+									</colgroup>
+									<tr>
+										<th>이름</th>
+										<td id="custNm" name="custNm"></td>
+									</tr>
+									<tr>
+										<th>생년월일</th>
+										<td id="birthYmd" name="birthYmd"></td>
+									</tr>
+								</table>
+							</div>
+							<div class="txt_info">
+								<ul>
+									<li>
+										본인 인증을 통해 자동으로 수집되는 정보 입니다.
+									</li>
+								</ul>
+							</div>
+						</div>
+						<div class="modify_box">
+							<h4 class="sr-only">회원정보 수정</h4>
+							<div class="tbl type1">
+								<table>
+									<colgroup>
+										<col width="210">
+										<col width="*">
+									</colgroup>
+									<tbody>
+										<tr>
+											<th>
+												<span>아이디</span>
+											</th>
+											<td>
+												<div class="form_field">
+													<div class="input_wrap">
+														<input type="text" id="custId" name="custId" class="form_control" placeholder="" readonly="readonly"/>
+													</div>
+												</div>
+											</td>
+										</tr>
+										<tr>
+											<th>
+												<span>비밀번호</span>
+											</th>
+											<td>
+												<button type="button" class="btn btn_primary_line" onclick="cfnGoToPage(_PAGE_CUSTOMER_PWD_CHANGE_TEMP);">
+													<span>변경하기</span>
+												</button>
+											</td>
+										</tr>
+										<tr>
+											<th>이메일</th>
+											<td>
+												<div class="form_field">
+													<div class="input_wrap">
+														<input type="text" id="email" name="email" class="form_control" placeholder=""/>
+													</div>
+												</div>
+											</td>
+										</tr>
+										<tr>
+											<th>휴대폰 번호</th>
+											<td>
+												<div class="form_field">
+													<div class="input_wrap">
+														<input type="text" id="cellPhnno" name="cellPhnno" class="form_control" placeholder="휴대폰 인증을 해주세요" readonly="readonly"/>
+													</div>
+													<button type="button" class="btn btn_dark" onclick="cfnOpenCellphoneCertify();">
+														<span>휴대폰 인증</span>
+													</button>
+												</div>
+											</td>
+										</tr>
+									</tbody>
+								</table>
+							</div>
+						</div>
+						<div class="modify_box">
+							<h4 class="subH3">환불계좌 정보</h4>
+							<div class="tbl type1">
+								<table>
+									<colgroup>
+										<col width="210">
+										<col width="*">
+									</colgroup>
+									<tbody>
+										<tr>
+											<th class="ver_top">예금주</th>
+											<td>
+												<div class="form_field">
+													<div class="input_wrap">
+														<input type="text" id="accountNm" name="accountNm" class="form_control" placeholder="" readonly="readonly"/>
+													</div>
+												</div>
+												<div class="txt_info">
+													<ul>
+														<li>
+															회원명 본인이 예금주인 통장으로만 환불이 가능합니다.
 														</li>
-														</th:block>
 													</ul>
 												</div>
+											</td>
+										</tr>
+										<tr>
+											<th>
+												<span>은행명</span>
+											</th>
+											<td>
+												<div class="form_field">
+													<div class="select_custom select_bank">
+														<div class="combo">
+															<div class="select">선택</div>
+															<ul class="list">
+																<li id="bankCd_" class="selected">
+																	<div text="선택"></div>
+																	<input type="hidden" name="bankCd" value=""/>
+																</li>
+																<th:block th:if="${bankList}" th:each="oneData, status : ${bankList}">
+																<li th:id="|bankCd_${oneData.cd}|" th:with="cd = ${oneData.cd}">
+																	<div th:text="${oneData.cdNm}"></div>
+																	<input type="hidden" name="bankCd" th:value="${cd}"/>
+																</li>
+																</th:block>
+															</ul>
+														</div>
+													</div>
+												</div>
+											</td>
+										</tr>
+										<tr>
+											<th>
+												<span>계좌번호</span>
+											</th>
+											<td>
+												<div class="form_field">
+													<div class="input_wrap">
+														<input type="text" id="accountNo" name="accountNo" class="form_control" maxlength="20" data-valid-type="numeric"  placeholder="계좌번호를 입력해 주세요"/>
+													</div>
+													<button type="button" id="btnAccountCheck" class="btn btn_dark">
+														<span>계좌인증</span>
+													</button>
+												</div>
+											</td>
+										</tr>
+									</tbody>
+								</table>
+							</div>
+						</div>
+						<div class="modify_box">
+							<h4 class="subH3">
+								마케팅 정보 수신설정
+								<span class="tit_info">특가상품, 할인쿠폰, 이벤트 소식 수신 동의</span>
+							</h4>
+							<div class="tbl type1">
+								<table>
+									<colgroup>
+										<col width="210">
+										<col width="*">
+									</colgroup>
+									<tr>
+										<th>수신설정</th>
+										<td>
+											<div class="form_field">
+												<div>
+													<input type="checkbox" id="emailAgreeYn" name="emailAgreeYn" value="Y"/><label for="emailAgreeYn"><span>이메일</span></label>
+												</div>
+												<div>
+													<input type="checkbox" id="smsAgreeYn" name="smsAgreeYn" value="Y"/><label for="smsAgreeYn"><span>SMS</span></label>
+												</div>
 											</div>
-										</div>
-									</td>
-								</tr>
-								<tr>
-									<th>
-										<span>계좌번호</span>
-									</th>
-									<td>
-										<div class="form_field">
-											<div class="input_wrap">
-												<input type="text" id="accountNo" name="accountNo" class="form_control" maxlength="20" data-valid-type="numeric"  placeholder="계좌번호를 입력해 주세요"/>
-											</div>
-											<button type="button" id="btnAccountCheck" class="btn btn_dark">
-												<span>계좌인증</span>
-											</button>
-										</div>
-									</td>
-								</tr>
-							</tbody>
-						</table>
+										</td>
+									</tr>
+								</table>
+							</div>
+							<div class="txt_info">
+								<ul>
+									<li>
+										회원 정보, 구매 정보 및 서비스 주요 정책 관련 내용은 수신 동의 여부와 관계없이 발송됩니다.
+									</li>
+								</ul>
+							</div>
+						</div>
+						<div class="btn_footer_area">
+							<button type="button" id="btnConfirm" class="btn btn_dark btn_md">
+								<span>확인</span>
+							</button>
+						</div>
 					</div>
-				</div>
-				<div class="modify_box">
-					<h4 class="subH3">
-						마케팅 정보 수신설정
-						<span class="tit_info">특가상품, 할인쿠폰, 이벤트 소식 수신 동의</span>
-					</h4>
-					<div class="tbl type1">
-						<table>
-							<colgroup>
-								<col width="210">
-								<col width="*">
-							</colgroup>
-							<tr>
-								<th>수신설정</th>
-								<td>
-									<div class="form_field">
-										<div>
-											<input type="checkbox" id="emailAgreeYn" name="emailAgreeYn" value="Y"/><label for="emailAgreeYn"><span>이메일</span></label>
-										</div>
-										<div>
-											<input type="checkbox" id="smsAgreeYn" name="smsAgreeYn" value="Y"/><label for="smsAgreeYn"><span>SMS</span></label>
-										</div>
-									</div>
-								</td>
-							</tr>
-						</table>
-					</div>
-					<div class="txt_info">
-						<ul>
-							<li>
-								회원 정보, 구매 정보 및 서비스 주요 정책 관련 내용은 수신 동의 여부와 관계없이 발송됩니다.
-							</li>
-						</ul>
-					</div>
-				</div>
-				<div class="btn_footer_area">
-					<button type="button" id="btnConfirm" class="btn btn_dark btn_md">
-						<span>확인</span>
-					</button>
-				</div>
+				</form>
 			</div>
-		</form>
+		</div>
 	</div>
 <script th:inline="javascript">
 	/*<![CDATA[*/

+ 130 - 110
src/main/webapp/WEB-INF/views/web/mypage/MypageCustSecedeFormWeb.html

@@ -2,7 +2,7 @@
 <html lang="ko"
 	  xmlns:th="http://www.thymeleaf.org"
 	  xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-	  layout:decorator="web/common/layout/MypageCustLayoutWeb">
+	  layout:decorator="web/common/layout/MypageLayoutWeb">
 <!--
  *******************************************************************************
  * @source  : MypageCustSecedeFormWeb.html
@@ -20,128 +20,148 @@
 
 <!--  container -->
 <th:block layout:fragment="content">
-<div class="cont">
-	<div class="sec_head">
-		<h3 class="subH1">회원탈퇴</h3>
-	</div>
-	<div class="sec_body">
-		<div class="tbl type5">
-			<table>
-				<colgroup>
-					<col width="25%">
-					<col width="25%">
-					<col width="25%">
-					<col width="25%">
-				</colgroup>
-				<thead>
-				<tr>
-					<th scope="col">진행중(주문/취소/반품/교환)</th>
-					<th scope="col">포인트(보유/적립예정)</th>
-					<th scope="col">상품권 잔여금액</th>
-					<th scope="col">쿠폰</th>
-				</tr>
-				</thead>
-				<tbody>
-				<tr>
-					<td>
-						<span class="hold_order">
-							<em id="ordCnt">0</em>&nbsp;/&nbsp;
-							<em id="cnclCnt">0</em>&nbsp;/&nbsp;
-							<em id="rtnCnt">0</em>&nbsp;/&nbsp;
-							<em id="exCnt">0</em>
-						</span>
-					</td>
-					<td>
-						<span class="hold_point">
-							<em id="pntAmt">0P</em>&nbsp;/&nbsp;
-							<em id="expAmt">0P</em>
-						</span>
-					</td>
-					<td>
-						<span class="hold_voucher">
-							<em id="giftAmt">20,000원</em>
-						</span>
-					</td>
-					<td>
-						<span class="hold_coupon">
-							<em id="cpnCnt">20장</em>
-						</span>
-					</td>
-				</tr>
-				</tbody>
-			</table>
-		</div>
-		<h4 class="subH3">
-			보안을 위해 회원님의 아이디 및 비밀번호를 다시 확인합니다.
-		</h4>
-		<form class="form_wrap">
-			<div class="tbl type1">
-				<table>
-					<colgroup>
-						<col width="210">
-						<col width="*">
-					</colgroup>
-					<tr>
-						<th>
-							아이디
-						</th>
-						<td>
-							<div class="form_field">
-								<div class="input_wrap">
-									<input type="text" id="custId" name="custId" class="form_control" th:value="${custId}" placeholder="" readonly="readonly"/>
-								</div>
-							</div>
-						</td>
-					</tr>
-					<tr>
-						<th>
-							비밀번호
-						</th>
-						<td>
+	<div class="content myMbLeave"> <!-- 페이지특정 클래스 = myMbLeave -->
+		<div class="cont_body">
+			<!-- CONT-BODY -->
+			<div class="lnb">
+				<!-- 마이페이지 lnb 영역 -->
+			</div>
+			<div class="cont">
+				<div class="sec_head">
+					<h3 class="subH1">회원탈퇴</h3>
+				</div>
+				<div class="sec_body">
+					<div class="tbl type5">
+						<table>
+							<colgroup>
+								<col width="25%">
+								<col width="25%">
+								<col width="25%">
+								<col width="25%">
+							</colgroup>
+							<thead>
+							<tr>
+								<th scope="col">진행중(주문/취소/반품/교환)</th>
+								<th scope="col">포인트(보유/적립예정)</th>
+								<th scope="col">상품권 잔여금액</th>
+								<th scope="col">쿠폰</th>
+							</tr>
+							</thead>
+							<tbody>
+							<tr>
+								<td>
+									<span class="hold_order">
+										<em id="ordCnt">0</em>&nbsp;/&nbsp;
+										<em id="cnclCnt">0</em>&nbsp;/&nbsp;
+										<em id="rtnCnt">0</em>&nbsp;/&nbsp;
+										<em id="exCnt">0</em>
+									</span>
+								</td>
+								<td>
+									<span class="hold_point">
+										<em id="pntAmt" th:text="|${#numbers.formatDecimal(pointInfo.rmPntAmt, 0, 'COMMA', 0, 'POINT')}'P'|">0P</em>&nbsp;/&nbsp;
+										<em id="expAmt" th:text="|${#numbers.formatDecimal(pointInfo.expectedPntAmt, 0, 'COMMA', 0, 'POINT')}'P'|">0P</em>
+									</span>
+								</td>
+								<td>
+									<span class="hold_voucher">
+										<em id="giftAmt" th:text="|${#numbers.formatDecimal(rmGfcdAmt, 0, 'COMMA', 0, 'POINT')}'원'|">0원</em>
+									</span>
+								</td>
+								<td>
+									<span class="hold_coupon">
+										<em id="cpnCnt" th:text="|${#numbers.formatDecimal(couponCnt, 0, 'COMMA', 0, 'POINT')}'장'|">0장</em>
+									</span>
+								</td>
+							</tr>
+							</tbody>
+						</table>
+					</div>
+					<h4 class="subH3">
+						보안을 위해 회원님의 아이디 및 비밀번호를 다시 확인합니다.
+					</h4>
+					<form class="form_wrap">
+						<div class="tbl type1">
+							<table>
+								<colgroup>
+									<col width="210">
+									<col width="*">
+								</colgroup>
+								<tr>
+									<th>
+										아이디
+									</th>
+									<td>
+										<div class="form_field">
+											<div class="input_wrap">
+												<input type="text" id="custId" name="custId" class="form_control" th:value="${custId}" placeholder="" readonly="readonly"/>
+											</div>
+										</div>
+									</td>
+								</tr>
+								<tr>
+									<th>
+										비밀번호
+									</th>
+									<td>
+										<div class="form_field">
+											<div class="input_wrap">
+												<input type="password" id="passwd" name="passwd" class="form_control" placeholder="비밀번호를 입력해주세요."/>
+											</div>
+										</div>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</form>
+					<div class="com_info_txt">
+						<p class="tit">회원 탈퇴 안내</p>
+						<ul>
+							<li>탈퇴시 소유하고 있는 포인트, 쿠폰등은 모두 소멸 됩니다.</li>
+							<li>거래정보가 있는 경우, 전자상거래 등에서의 소비자 보호에 관한 법률에 따라 계약 또는 청약철회에 관한 기록, 대금결제 및 재화 등의 공급에 관한 기록은 5년동안 보존됩니다.</li>
+							<li>보유하셨던 상품권 금액은 탈퇴와 함께 삭제되며 환불되지 않습니다.</li>
+							<li>회원 탈퇴 후 STYLE24에 입력하신 상품문의 및 후기,댓글은 삭제되지 않으며,회원정보 삭제로 인해 작성자 본인을 확인 할 수 없어<br>편집 및 삭제처리가 원천적으로 불가능 합니다. 상품문의 및 후기, 댓글 삭제를 원하시는 경우에는 먼저 해당 게시물을 삭제하신 후 탈퇴를 신청하시기 바랍니다.</li>
+							<li>진행중인 주문/취소/반품/교환건이 있을 경우에는 탈퇴가 되지 않습니다.</li>
+						</ul>
+						<div class="check_box">
 							<div class="form_field">
-								<div class="input_wrap">
-									<input type="password" id="passwd" name="passwd" class="form_control" placeholder="비밀번호를 입력해주세요."/>
+								<div>
+									<input type="checkbox" name="pushset" id="checkSecede" value="">
+										<label for="checkSecede"><span>상기 STYLE24 회원탈퇴 시 처리사항 안내를 확인하였음에 동의합니다.</span>
+									</label>
 								</div>
 							</div>
-						</td>
-					</tr>
-				</table>
-			</div>
-		</form>
-		<div class="com_info_txt">
-			<p class="tit">회원 탈퇴 안내</p>
-			<ul>
-				<li>탈퇴시 소유하고 있는 포인트, 쿠폰등은 모두 소멸 됩니다.</li>
-				<li>거래정보가 있는 경우, 전자상거래 등에서의 소비자 보호에 관한 법률에 따라 계약 또는 청약철회에 관한 기록, 대금결제 및 재화 등의 공급에 관한 기록은 5년동안 보존됩니다.</li>
-				<li>보유하셨던 상품권 금액은 탈퇴와 함께 삭제되며 환불되지 않습니다.</li>
-				<li>회원 탈퇴 후 STYLE24에 입력하신 상품문의 및 후기,댓글은 삭제되지 않으며,회원정보 삭제로 인해 작성자 본인을 확인 할 수 없어<br>편집 및 삭제처리가 원천적으로 불가능 합니다. 상품문의 및 후기, 댓글 삭제를 원하시는 경우에는 먼저 해당 게시물을 삭제하신 후 탈퇴를 신청하시기 바랍니다.</li>
-				<li>진행중인 주문/취소/반품/교환건이 있을 경우에는 탈퇴가 되지 않습니다.</li>
-			</ul>
-			<div class="check_box">
-				<div class="form_field">
-					<div>
-						<input type="checkbox" name="pushset" id="checkSecede" value="">
-							<label for="checkSecede"><span>상기 STYLE24 회원탈퇴 시 처리사항 안내를 확인하였음에 동의합니다.</span>
-						</label>
+						</div>
 					</div>
 				</div>
+				<div class="btn_footer_area">
+					<button type="button" id="btnConfirm" class="btn btn_dark btn_md">
+						<span>회원탈퇴</span>
+					</button>
+				</div>
 			</div>
 		</div>
 	</div>
-	<div class="btn_footer_area">
-		<button type="button" id="btnConfirm" class="btn btn_dark btn_md">
-			<span>회원탈퇴</span>
-		</button>
-	</div>
-</div>
-
 <script th:inline="javascript">
 	/*<![CDATA[*/
-
+	const orderStatInfo = [[${orderStatInfo}]];
 
 	$(document).ready( function() {
-
+		fnOrderStatInit();
 	});
+
+	var fnOrderStatInit = function () {
+		// 진행중인 주문건
+		let orderTotal = orderStatInfo.depositWaitingCount + orderStatInfo.waitingAddPayment
+			+ orderStatInfo.paymentComplete + orderStatInfo.goodsPrepare + orderStatInfo.shipPrepare;
+		$('#ordCnt').text(orderTotal.addComma());
+		$('#cnclCnt').text(orderStatInfo.cancelCount.addComma());
+		$('#rtnCnt').text(orderStatInfo.returnCount.addComma());
+		$('#exCnt').text(orderStatInfo.exchangeCount.addComma());
+		// 진행중인 취소건
+
+	}
+
 	/*]]>*/
 </script>
 </th:block>