Просмотр исходного кода

Merge branch 'card007' into order

card007 5 лет назад
Родитель
Сommit
82fa234e1e

+ 2 - 1
src/main/java/com/style24/front/biz/service/TsfOrderService.java

@@ -85,7 +85,7 @@ public class TsfOrderService {
 				&& !tmpOrder.getOrdDtlStat().equals(TscConstants.OrderDetailStat.DEPOSIT_WAIT.value())
 				&& !tmpOrder.getOrdDtlStat().equals(TscConstants.OrderDetailStat.PAYMENT_COMPLETE.value())
 				&& !tmpOrder.getOrdDtlStat().equals(TscConstants.OrderDetailStat.GOODS_PREPARE.value())) {
-				allCanYn = "Y";
+				allCanYn = "N";
 			}
 
 			ordNo = tmpOrder.getOrdNo();
@@ -108,6 +108,7 @@ public class TsfOrderService {
 		map.set("ordDt", order.getOrdDt());
 		map.set("freeGiftList", orderDao.getOrderFreeGiftListForMypage(order));
 		map.set("allCanYn", allCanYn);
+		map.set("oneData", order);
 		map.set("ordDtlList", ordDtlList);
 
 		return map;

+ 2 - 0
src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -205,6 +205,8 @@ public class TsfMypageController extends TsfBaseController {
 
 		mav.addObject("orderList", orderList);
 
+		mav.addObject("allCanYn", orderList.iterator().next().get("allCanYn"));
+
 		// 주문정보 조회
 		mav.addObject("orderInfo", coreOrderService.getOrderInfoList(order).iterator().next());
 

+ 7 - 2
src/main/java/com/style24/persistence/mybatis/shop/TsfOrder.xml

@@ -237,6 +237,7 @@
 	<select id="getOrderAmtForMypage" parameterType="Order" resultType="Order">
 		/* TsfOrder.getOrderAmtForMypage */
 		SELECT SUM(OD.ORD_AMT)          AS ORD_AMT
+		     , SUM(OD.CNCL_RTN_AMT)     AS CNCL_RTN_AMT
 			 , SUM(OD.CPN1_DC_AMT)      AS CPN1_DC_AMT
 			 , SUM(OD.TMTB1_DC_AMT)     AS TMTB1_DC_AMT
 			 , SUM(OD.TMTB2_DC_AMT)     AS TMTB2_DC_AMT
@@ -248,11 +249,13 @@
 			 , SUM(OD.CPN1_DC_AMT + OD.TMTB1_DC_AMT + OD.TMTB2_DC_AMT + OD.CART_CPN_DC_AMT + OD.GOODS_CPN_DC_AMT + OD.PRE_PNT_DC_AMT + OD.PNT_DC_AMT + OD.GFCD_USE_AMT) AS TOTAL_DC_AMT
 			 , SUM(OD.REAL_ORD_AMT)     AS REAL_ORD_AMT
 			 , SUM(OD.SAVE_PNT_AMT)     AS SAVE_PNT_AMT
-			 , SUM(DF.DELV_FEE)         AS DELV_FEE
+			 , SUM(DF.DELV_CPN_DC_AMT)  AS DELV_CPN_DC_AMT
+			 , SUM(DF.REAL_DELV_AMT)    AS REAL_DELV_AMT
 		  FROM TB_ORDER_DETAIL OD
 		  LEFT OUTER JOIN (
 			  SELECT ORD_NO
-				   , SUM(DELV_FEE) AS DELV_FEE
+			       , SUM(DELV_CPN_DC_AMT) AS DELV_CPN_DC_AMT
+				   , SUM(REAL_DELV_AMT)   AS REAL_DELV_AMT
 				FROM TB_DELIVERY_FEE
 			   WHERE ORD_NO = #{ordNo}
 				 AND DELV_FEE_GB = 'G018_10'
@@ -295,6 +298,8 @@
 		     , DATE_FORMAT(VA_DEADLINE, '%H:%i:%S') AS VA_DEADLINE_HMS
 		     , TELECOM
 		     , ESCROW_YN
+		     , CASH_AUTH_NO
+		     , CASH_TRADE_NO
 		     , ORD_CHG_SQ
 		     , REG_NO
 		     , REG_DT

+ 148 - 131
src/main/webapp/WEB-INF/views/web/mypage/MypageOrderDetailFormWeb.html

@@ -19,7 +19,7 @@
 <body>
 
 <th:block layout:fragment="content">
-	<div class="content myOrderList">
+	<div class="content myOrderView">
 		<div class="cont_body">
 			<!-- CONT-BODY -->
 			<div class="lnb">
@@ -42,7 +42,7 @@
 							<div class="goods_head">
 								<p th:unless="${order.giftPackYn == 'Y'}">주문일 <span th:text="${order.ordDt}"></span></p>
 								<p th:if="${order.giftPackYn == 'Y'}">선물일 <span th:text="${order.ordDt}"></span></p>
-								<a href="javascript:void(0)" th:if="${allCanYn == 'Y'}" th:onclick="fnAllCancel(${order.ordNo})">주문전체취소</a>
+								<a href="javascript:void(0)" th:if="${allCanYn == 'Y'}" th:onclick="fnAllCancel([[${order.ordNo}]])">주문전체취소</a>
 							</div>
 							<div class="goods_cont">
 								<!-- 주문상품 -->
@@ -74,7 +74,7 @@
 												</div>
 												<div class="gd_calc">
 													<p>
-														<span class="count"><em th:text="${ordDtl.ordQty}"></em>개</span>
+														<span class="count"><em th:text="${ordDtl.ordQty - ordDtl.cnclRtnQty}"></em>개</span>
 													</p>
 													<p>
 														<span class="price_org"><em th:text="${#numbers.formatInteger(ordDtl.listPrice * (ordDtl.ordQty - ordDtl.cnclRtnQty), 1, 'COMMA')}"></em>원</span>
@@ -231,39 +231,43 @@
 								</th:block>
 								<!-- //주문상품 -->
 							</div>
-							<div class="goods_foot" th:if="${order.freeGiftList != null and order.freeGiftList.length > 0}">
+							<div class="goods_foot" th:if="${order.freeGiftList.size() > 0}">
 								<div class="order_gift">
 									<span class="title">사은품</span>
 									<ul>
-										
+										<li th:each="freeGift, status : ${order.freeGiftList}" th:text="${freeGift.goodsNm}">
+											<span th:text="|(-${#numbers.formatInteger(freeGift.usePoint, 1, 'COMMA')}P)|"></span>
+										</li> 
 									</ul>
 								</div>
 							</div>
 						</div>
 					</th:block>
-					<h4 class="subH3">무통장 입금 정보</h4>
-					<div class="tbl type1">
-						<table>
-							<colgroup>
-								<col width="210">
-								<col width="*">
-							</colgroup>
-							<tbody><tr>
-								<th>
-									계좌정보/입금기한
-								</th>
-								<td>
-									<div class="single_line">
-										<ul>
-											<li><span>기업은행</span>&nbsp;<span>(홍길동)</span></li>
-											<li><span>123-45678-91234</span></li>
-											<li><span>2020.01.18</span>&nbsp;<span>12:00:00</span>&nbsp;까지</li>
-										</ul>
-									</div>
-								</td>
-							</tr>
-							</tbody></table>
-					</div>
+					<th:block th:if="${paymentInfo.payMeans == 'G014_20'}">
+						<h4 class="subH3">무통장 입금 정보</h4>
+						<div class="tbl type1">
+							<table>
+								<colgroup>
+									<col width="210">
+									<col width="*">
+								</colgroup>
+								<tbody><tr>
+									<th>
+										계좌정보/입금기한
+									</th>
+									<td>
+										<div class="single_line">
+											<ul>
+												<li><span th:text="${paymentInfo.vaBank}"></span>&nbsp;<span th:text="|(${paymentInfo.vaNm})|"></span></li>
+												<li><span th:text="${paymentInfo.vaNo}"></span></li>
+												<li><span th:text="${paymentInfo.vaDeadlineYmd}"></span>&nbsp;<span th:text="${paymentInfo.vaDeadlineHms}"></span>&nbsp;까지</li>
+											</ul>
+										</div>
+									</td>
+								</tr>
+								</tbody></table>
+						</div>
+					</th:block>
 					<h4 class="subH3">주문자/배송지 정보</h4>
 					<div class="tbl type1">
 						<table>
@@ -271,46 +275,48 @@
 								<col width="210">
 								<col width="*">
 							</colgroup>
-							<tbody><tr>
-								<th>
-									주문 고객
-								</th>
-								<td>
-									<div class="single_line">
-										<ul>
-											<li><span>홍길동</span></li>
-											<li><span>abcdefg@naver.com</span></li>
-											<li><span>010-3456-7890</span></li>
-										</ul>
-									</div>
-								</td>
-							</tr>
-							<tr>
-								<th>
-									배송지 정보
-								</th>
-								<td>
-									<div class="block_line">
-										<ul>
-											<li>
-												<span>홍길동</span>
-												<span class="tag">기본 배송지</span>
-												<span class="tag primary_line">총알배송</span>
-											</li>
-											<li>
-												<span>010-3456-7890</span>
-											</li>
-											<li>
-												<span>서울시 영등포구 은행로 11, 8층 (여의도동, 일신빌딩)</span><button type="button" class="btn btn_default btn_sm"><span>배송지 변경</span></button>
-											</li>
-											<li>
-												배송요청 사항&nbsp;:&nbsp;<span>직접 받고 부재 시 문 앞</span><button type="button" class="btn_underline"><span>변경하기</span></button>
-											</li>
-										</ul>
-									</div>
-								</td>
-							</tr>
-							</tbody></table>
+							<tbody>
+								<tr>
+									<th>
+										주문 고객
+									</th>
+									<td>
+										<div class="single_line">
+											<ul>
+												<li><span th:text="${orderInfo.ordNm}"></span></li>
+												<li><span th:text="${orderInfo.ordEmail}"></span></li>
+												<li><span th:text="${orderInfo.ordPhnno}"></span></li>
+											</ul>
+										</div>
+									</td>
+								</tr>
+								<tr>
+									<th>
+										배송지 정보
+									</th>
+									<td>
+										<div class="block_line">
+											<ul>
+												<li>
+													<span th:text="${deliveryAddrInfo.recipNm}"></span>
+												</li>
+												<li>
+													<span th:text="${deliveryAddrInfo.recipPhnno}"></span>
+												</li>
+												<li>
+													<span th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|"></span>
+													<button type="button" class="btn btn_default btn_sm" th:if="${allCanYn == 'Y'}" onclick="fnChangeDeliveryAddr()"><span>배송지 변경</span></button>
+												</li>
+												<li>
+													배송요청 사항&nbsp;:&nbsp;<span th:text="${deliveryAddrInfo.delvMemo}"></span>
+													<button type="button" class="btn_underline"th:if="${allCanYn == 'Y'}" onclick="fnChangeDeliveryMemo()"><span>변경하기</span></button>
+												</li>
+											</ul>
+										</div>
+									</td>
+								</tr>
+							</tbody>
+						</table>
 					</div>
 					<h4 class="subH3">결제정보</h4>
 					<div class="tbl type6">
@@ -326,41 +332,41 @@
 											<dt>총 주문금액 (상품금액+배송비+추가비용)</dt>
 											<dd>
 												<div class="price">
-													<span class="order_total_price"><em>3,546,200</em>원</span>
+													<span class="order_total_price"><em th:text="${#numbers.formatInteger(orderAmtInfo.ordAmt - orderAmtInfo.cnclRtnAmt + orderAmtInfo.realDelvAmt, 1, 'COMMA')}"></em>원</span>
 												</div>
 											</dd>
 										</div>
-										<div class="include_item"> <!-- 할인항목 표기 class명 include_item -->
+										<div class="include_item" th:if="${orderAmtInfo.cpn1DcAmt > 0}"> <!-- 할인항목 표기 class명 include_item -->
 											<dt>상품할인(즉시할인)</dt>
-											<dd><em>-123,456,789</em>원</dd>
+											<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.cpn1DcAmt, 1, 'COMMA')}|"></em>원</dd>
 										</div>
-										<div class="include_item">
+										<div class="include_item" th:if="${orderAmtInfo.tmtb1DcAmt + orderAmtInfo.tmtb2DcAmt > 0}">
 											<dt>다다익선 할인</dt>
-											<dd><em>-123,456,789</em>원</dd>
+											<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.tmtb1DcAmt + orderAmtInfo.tmtb2DcAmt, 1, 'COMMA')}|"></em>원</dd>
 										</div>
-										<div class="include_item">
+										<div class="include_item" th:if="${orderAmtInfo.cartCpnDcAmt + orderAmtInfo.goodsCpnDcAmt + orderAmtInfo.delvCpnDcAmt > 0}">
 											<dt>쿠폰할인</dt>
-											<dd><em>-123,456,789</em>원</dd>
+											<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.cartCpnDcAmt + orderAmtInfo.goodsCpnDcAmt + orderAmtInfo.delvCpnDcAmt, 1, 'COMMA')}|"></em>원</dd>
 										</div>
-										<div class="include_item">
+										<div class="include_item" th:if="${orderAmtInfo.prePntDcAmt > 0}">
 											<dt>선포인트 할인</dt>
-											<dd><em>-123,456,789</em>원</dd>
+											<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.prePntDcAmt, 1, 'COMMA')}|"></em>원</dd>
 										</div>
-										<div class="include_item">
+										<div class="include_item" th:if="${orderAmtInfo.pntDcAmt > 0}">
 											<dt>포인트 사용</dt>
-											<dd><em>-123,456,789</em>원</dd>
+											<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.pntDcAmt, 1, 'COMMA')}|"></em>원</dd>
 										</div>
-										<div class="include_item">
+										<div class="include_item" th:if="${orderAmtInfo.gfcdUseAmt > 0}">
 											<dt>상품권 사용</dt>
-											<dd><em>-123,456,789</em>원</dd>
+											<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.gfcdUseAmt, 1, 'COMMA')}|"></em>원</dd>
 										</div>
-										<div class="include_item">
+										<div class="include_item" th:if="${paymentInfo.npayPntAmt > 0}">
 											<dt>마일리지 사용</dt>
-											<dd><em>-123,456,789</em>원</dd>
+											<dd><em th:text="|- ${#numbers.formatInteger(paymentInfo.npayPntAmt, 1, 'COMMA')}|"></em>원</dd>
 										</div>
-										<div class="include_item">
+										<div class="include_item" th:if="${paymentInfo.pgCpnAmt > 0}">
 											<dt>제휴할인</dt>
-											<dd><em>-123,456,789</em>원</dd>
+											<dd><em th:text="|- ${#numbers.formatInteger(paymentInfo.pgCpnAmt, 1, 'COMMA')}|"></em>원</dd>
 										</div>
 									</dl>
 								</td>
@@ -370,30 +376,36 @@
 											<dt>결제 금액</dt>
 											<dd>
 												<div class="price">
-													<span class="pay_total_price"><em>3,546,200</em>원</span>
+													<span class="pay_total_price"><em th:text="${#numbers.formatInteger(orderAmtInfo.realOrdAmt + orderAmtInfo.realDelvAmt, 1, 'COMMA')}"></em>원</span>
 												</div>
 											</dd>
 										</div>
 										<div>
 											<dt class="sr-only">결제방법</dt>
-											<dd>
-												신용카드(현대카드) / 일시불
-											</dd>
+											<!-- TODO -->
+											<!-- Style24 간편결제 처리 (STYLE24 간편결제 : STYLE24 간편결제명 / 카드사명 / 할부개월(일시불)) -->
+											<dd th:if="${paymentInfo.pgGb == 'NAVER'}">네이버 페이</dd>
+											<dd th:if="${paymentInfo.pgGb == 'KAKAO'}">카카오 페이</dd>
+											<dd th:if="${paymentInfo.pgGb == 'PAYCO'}">PAYCO</dd>
+											<dd th:if="${paymentInfo.pgGb == 'KCP' and paymentInfo.payMeans == 'G014_10'}">실시간계좌이체</dd>
+											<dd th:if="${paymentInfo.pgGb == 'KCP' and paymentInfo.payMeans == 'G014_20'}">무통장입금</dd>
+											<dd th:if="${paymentInfo.pgGb == 'KCP' and paymentInfo.payMeans == 'G014_30'}" th:text="|${paymentInfo.cardNm}/${paymentInfo.cardMips}|"></dd>
+											<dd th:if="${paymentInfo.pgGb == 'KCP' and paymentInfo.payMeans == 'G014_60'}">휴대폰결제</dd>
 										</div>
 										<div>
 											<dt class="sr-only">영수증 확인</dt>
 											<dd>
-												<button type="button" class="btn btn_default btn_sm"><span>신용카드 전표</span>
-												</button><button type="button" class="btn btn_default btn_sm"><span>현금 영수증</span>
-											</button><button type="button" class="btn btn_default btn_sm"><span>상품권 현금 영수증 신청</span>
-											</button></dd>
+												<button type="button" class="btn btn_default btn_sm" th:if="${paymentInfo.pgGb == 'KCP' and paymentInfo.payMeans == 'G014_30'}" onclick="fnReceipt('card')"><span>신용카드 전표</span></button>
+												<button type="button" class="btn btn_default btn_sm" th:if="${paymentInfo.pgGb == 'KCP' and not #strings.isEmpty(paymentInfo.cashAuthNo) and (paymentInfo.payMeans == 'G014_10' or paymentInfo.payMeans == 'G014_20')}" onclick="fnReceipt('cash')"><span>현금 영수증</span></button>
+												<button type="button" class="btn btn_default btn_sm" th:if="${orderAmtInfo.gfcdUseAmt > 0 and #strings.isEmpty(paymentInfo.cashAuthNo)}" th:attr="ordNo=${ordNo}" onclick="fnRequestCashReceipt(this);"><span>상품권 현금 영수증 신청</span></button>
+											</dd>
 										</div>
 									</dl>
 									<dl>
 										<div>
 											<dt>적립 예정 포인트</dt>
 											<dd>
-												<span class="save_point"><em>123,456,789P</em></span>
+												<span class="save_point"><em th:text="|${#numbers.formatInteger(orderAmtInfo.savePntAmt, 1, 'COMMA')}P|"></em></span>
 											</dd>
 										</div>
 									</dl>
@@ -406,8 +418,25 @@
 					</div>
 				</div>
 			</div>
-			
-			<div class="my_cont">
+			<form id="exchangeForm" name="exchangeForm" th:action="@{'/mypage/exchange/form'}" th:method="post">
+				<input type="hidden" name="ordNo"/>
+				<input type="hidden" name="ordDtlNo"/>
+				<input type="hidden" name="supplyCompCd"/>
+			</form>
+			<form id="returnForm" name="returnForm" th:action="@{'/mypage/return/form'}" th:method="post">
+				<input type="hidden" name="ordNo"/>
+				<input type="hidden" name="ordDtlNo"/>
+				<input type="hidden" name="supplyCompCd"/>
+			</form>
+			<form id="cancelForm" name="cancelForm" th:action="@{'/mypage/cancel/form'}" th:method="post">
+				<input type="hidden" name="ordNo"/>
+				<input type="hidden" name="ordDtlNo"/>
+			</form>
+			<form id="reviewForm" name="reviewForm" th:action="@{'/mypage/review/form'}" th:method="post">
+				<input type="hidden" name="ordNo"/>
+				<input type="hidden" name="ordDtlNo"/>
+			</form>
+			<!--<div class="my_cont">
 				<div class="sec_head">
 					<h3>주문상세</h3>
 					<div class="od_detail">
@@ -421,19 +450,19 @@
 							<th:block th:if="${orderList}" th:each="oneData, status : ${orderList}">
 								<div class="part_deliver">
 									<div class="tbl_tit">
-										<!-- 주문일/선물일 설정 -->
+										&lt;!&ndash; 주문일/선물일 설정 &ndash;&gt;
 										<span class="start_t" th:unless="${oneData.giftPackYn == 'Y'}">주문일</span>
 										<span class="gift_t" th:if="${oneData.giftPackYn == 'Y'}">선물일</span>
-										<!-- //주문일/선물일 설정 -->
+										&lt;!&ndash; //주문일/선물일 설정 &ndash;&gt;
 		
 										<span class="order_date" th:text="${oneData.ordDt}"></span>
 		
-										<!-- 배송구분 설정 -->
+										&lt;!&ndash; 배송구분 설정 &ndash;&gt;
 										<span class="order_label02" th:if="${oneData.shotDelv}">총알배송</span>
 										<span class="order_label01" th:if="${oneData.selfMall}">STYLE24 일반배송</span>
 										<span class="order_label01" th:if="${oneData.supplyMall}">업체직배송</span>
-										<!-- //배송구분 설정 -->
-		<!--								<a href="javascript:void(0)" class="detail_btn" th:attr="ordNo=${oneData.ordNo}" onclick="fnGoToOrderDetail(this)">주문상세보기</a>-->
+										&lt;!&ndash; //배송구분 설정 &ndash;&gt;
+		&lt;!&ndash;								<a href="javascript:void(0)" class="detail_btn" th:attr="ordNo=${oneData.ordNo}" onclick="fnGoToOrderDetail(this)">주문상세보기</a>&ndash;&gt;
 									</div>
 									<th:block th:if="${oneData.orderList}" th:each="order, status : ${oneData.orderList}">
 										<div class="tbl type2">
@@ -476,7 +505,7 @@
 																</div>
 															</div>
 														</td>
-														<!-- 주문 -->
+														&lt;!&ndash; 주문 &ndash;&gt;
 														<td class="merge_row" th:unless="${oneData.giftPackYn == 'Y'}">
 															<div class="delivery">
 																<p class="dlvr_staus" th:text="${ordDtl.ordDtlStatNm}"></p>
@@ -485,7 +514,7 @@
 															<div class="tbl_btn_wrap case02">
 																<button type="button" class="btn btn_default btn_sm" onclick="fnCreateExchange(this, 'exchange');"><span>교환</span></button>
 																<button type="button" class="btn btn_default btn_sm" onclick="fnCreateCancel(this, 'cancel');"><span>반품/취소</span></button>
-		<!--														<button type="button" class="btn btn_default btn_sm" th:if="${ordDtl.reviewSq == 0}" th:attr="ordNo=${oneData.ordNo}" onclick="fnCreateReview(this);"><span>리뷰작성</span></button>-->
+		&lt;!&ndash;														<button type="button" class="btn btn_default btn_sm" th:if="${ordDtl.reviewSq == 0}" th:attr="ordNo=${oneData.ordNo}" onclick="fnCreateReview(this);"><span>리뷰작성</span></button>&ndash;&gt;
 																<button type="button" class="btn btn_default btn_sm" th:if="${!order.review}" th:attr="ordNo=${oneData.ordNo}" onclick="fnCreateReview(this);"><span>리뷰작성</span></button>
 															</div>
 														</td>
@@ -512,7 +541,7 @@
 												</tbody>
 											</table>
 										</div>
-										<!-- 주문 -->
+										&lt;!&ndash; 주문 &ndash;&gt;
 										<th:block th:unless="${oneData.giftPackYn == 'Y'}">
 											<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_00' or order.ordDtlStat == 'G013_10' or order.ordDtlStat == 'G013_11'}">
 												<span class="cf_txt">주문 완료 / 결제를 기다리고 있습니다.</span>
@@ -541,7 +570,7 @@
 											</div>
 										</th:block>
 		
-										<!-- 선물 -->
+										&lt;!&ndash; 선물 &ndash;&gt;
 										<th:block th:if="${oneData.giftPackYn == 'Y'}">
 											<div class="order_confirm" th:if="${#strings.isEmpty(order.recipBaseAddr) and order.giftLimitDay >= 0}">
 												<span class="cf_txt" th:text="|${order.recipNm}님이 주소를 입력하기 전입니다. (입력기한 ${order.giftLimitDt})|"></span>
@@ -557,7 +586,7 @@
 								</div>
 							</th:block>
 		
-							<!-- 주문 없을 때 -->
+							&lt;!&ndash; 주문 없을 때 &ndash;&gt;
 							<th:block th:unless="${orderList}" th:each="oneData, status : ${orderList}">
 		
 							</th:block>
@@ -724,7 +753,7 @@
 														<dt>상품권 사용</dt>
 														<dd th:text="|- ${#numbers.formatInteger(orderAmtInfo.gfcdUseAmt, 1, 'COMMA')}원|"></dd>
 													</div>
-													<!-- 
+													&lt;!&ndash; 
 													<div th:if="${}">
 														<dt>마일리지 사용</dt>
 														<dd></dd>
@@ -733,7 +762,7 @@
 														<dt>제휴 할인</dt>
 														<dd></dd>
 													</div>
-													-->
+													&ndash;&gt;
 												</dl>
 											</td>
 											<td>
@@ -745,12 +774,12 @@
 													<div>
 														<dt>결제방법</dt>
 														<dd>
-															<!-- TODO -->
-															<!-- Style24 간편결제 처리 (STYLE24 간편결제 : STYLE24 간편결제명 / 카드사명 / 할부개월(일시불)) -->
-															<!-- 실시간계좌이체, 무통장입금 현금영수증 신청여부 추가 -->
-															<!-- 네이버페이 처리 (네이버 페이 : 네이버 페이) -->
-															<!-- 카카오페이 처리 (카카오 페이 : 카카오 페이) -->
-															<!-- PAYCO 처리 (PAYCO : PAYCO) -->
+															&lt;!&ndash; TODO &ndash;&gt;
+															&lt;!&ndash; Style24 간편결제 처리 (STYLE24 간편결제 : STYLE24 간편결제명 / 카드사명 / 할부개월(일시불)) &ndash;&gt;
+															&lt;!&ndash; 실시간계좌이체, 무통장입금 현금영수증 신청여부 추가 &ndash;&gt;
+															&lt;!&ndash; 네이버페이 처리 (네이버 페이 : 네이버 페이) &ndash;&gt;
+															&lt;!&ndash; 카카오페이 처리 (카카오 페이 : 카카오 페이) &ndash;&gt;
+															&lt;!&ndash; PAYCO 처리 (PAYCO : PAYCO) &ndash;&gt;
 															<span class="paymethod" th:if="${paymentInfo.payMeans == 'G014_10'}" th:text="|실시간계좌이체|"></span>
 															<span class="paymethod" th:if="${paymentInfo.payMeans == 'G014_20'}" th:text="|무통장입금|"></span>
 															<span class="paymethod" th:if="${paymentInfo.payMeans == 'G014_30'}" th:text="|${paymentInfo.cardNm}/${paymentInfo.cardMips}|"></span>
@@ -758,22 +787,22 @@
 														</dd>
 													</div>
 													<th:block th:if="${paymentInfo.pgGb == 'KCP'}">
-														<!-- 신용카드 결제시 -->
+														&lt;!&ndash; 신용카드 결제시 &ndash;&gt;
 														<div th:if="${paymentInfo.payMeans == 'G014_30'}">
 															<dt>&nbsp;</dt>
 															<dd>
 																<button type="button" class="btn btn_default" onclick="fnReceipt('card');"><span>신용카드 전표</span></button>
 															</dd>
 														</div>
-														<!-- //무통장 결제시 -->
-														<!-- 무통장 결제시 -->
+														&lt;!&ndash; //무통장 결제시 &ndash;&gt;
+														&lt;!&ndash; 무통장 결제시 &ndash;&gt;
 														<div th:if="${paymentInfo.payMeans == 'G014_10' or paymentInfo.payMeans == 'G014_20'}">
 															<dt>&nbsp;</dt>
 															<dd>
 																<button type="button" class="btn btn_default" onclick="fnReceipt('cash');"><span>현금영수증</span></button>
 															</dd>
 														</div>
-														<!-- //무통장 결제시 -->
+														&lt;!&ndash; //무통장 결제시 &ndash;&gt;
 													</th:block>
 													<th:block th:unless="${paymentInfo.pgGb == 'KCP'}">
 														<dt></dt>
@@ -789,25 +818,13 @@
 						</section>
 					</div>
 				</div>
-			</div>
+			</div>-->
 			<!-- // CONT-BODY -->
 		</div>
 	</div>
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
 	let ordNo = [[${ordNo}]];
-	
-	// 배송메모 변경 버튼 클릭 이벤트
-	var fnChangeDelvMemo = function() {
-		// TODO
-		// 배송메모 정보 변경 처리
-	}
-	
-	// 신용카드 전표 및 현금영수증 버튼 클릭 이벤트
-	var fnReceipt = function(param) {
-		// TODO
-		// 전표 링크 팝업 처리
-	}
 
 	$(document).ready(function() {
 		// 마이페이지 LNB 설정

+ 29 - 2
src/main/webapp/ux/pc/js/mypage.js

@@ -129,6 +129,12 @@ var fnReSendSms = function(param) {
 	// 선물하기 SMS 재발송 처리
 }
 
+// 주문전체취소 버튼 클릭 이벤트
+var fnAllCancel = function(ordNo) {
+	// TODO
+	// 주문전체취소 처리
+}
+
 // 반품/취소/교환 버튼 클릭 이벤트
 var fnCreateChange = function(param, gubun) {
 	let ordNo = $(param).attr('ordNo');
@@ -165,10 +171,31 @@ var fnDeleteOrder = function() {
 	});
 };
 
-// 회수지, 교환지 설정 팝업
+// 회수지, 교환지, 배송지 설정 팝업
 var fnChangeDeliveryAddr = function(param) {
 	// TODO
-	// 회수지, 교환지 설정
+	// 회수지, 교환지, 배송지 설정 팝업
+}
+
+// 배송메모 설정 팝업
+var fnChangeDeliveryMemo = function() {
+	// TODO
+	// 배송메모 설정 팝업
+}
+
+// 신용카드 전표 및 현금영수증 버튼 클릭 이벤트
+var fnReceipt = function(param) {
+	// TODO
+	// 전표 링크 팝업 처리
+	// param == 'card'  신용카드 전표
+	// param == 'cash'  현금영수증 전표
+	// param == 'cancel' 취소전표
+}
+
+// 상품권 현금영수증 신청 처리
+var fnRequestCashReceipt = function(param) {
+	// TODO
+	// 현금영수증 신청 처리
 }
 
 // 문자열 길이를 체크