Procházet zdrojové kódy

마이페이지 교환 화면 임시 커밋

card007 před 5 roky
rodič
revize
138a85c280

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

@@ -872,6 +872,9 @@ public class TsfMypageController extends TsfBaseController {
 		try {
 			commonService.updateDeliverAddr(order);
 			commonService.updateDeliverAddrDelvMemo(order);
+
+			// TODO
+			// WMS IF TABLE 내 정보 업데이트 처리 필요
 		} catch (Exception e) {
 			result.set("status", GagaResponseStatus.FAIL.getCode());
 			result.set("message", "배송지 수정에 실패했습니다.");

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

@@ -118,10 +118,10 @@
 					 , TIMESTAMPDIFF(DAY, NOW(), OD.DELV_EDDT + INTERVAL 2 WEEK)		AS PURCHASE_CONFIRM_DAY
 					 , DATE_FORMAT(GRS.DELV_RES_DT, '%Y.%m.%d') AS DELV_RES_DT
 					 , IFNULL(OCD.ORD_REQ_CHG_QTY, 0) AS ORD_REQ_CHG_QTY
-					 , OD.ORD_QTY - OD.CNCL_RTN_QTY - IFNULL(OCD.ORD_REQ_CHG_QTY, 0) AS ORD_CAN_CHG_QTY
+					 , OD.ORD_QTY - OD.CNCL_RTN_QTY - IFNULL(OCD.ORD_REQ_CHG_QTY, 0)    AS ORD_CAN_CHG_QTY
 					 , CA.BANK_CD
 					 , CA.ACCOUNT_NO
-					 , CA.ACCOUNT_NM
+					 , IFNULL(CA.ACCOUNT_NM, O.ORD_NM)                                  AS ACCOUNT_NM
 					 , DA.DELV_ADDR_SQ
 				  FROM TB_ORDER O
 				 INNER JOIN TB_ORDER_DETAIL OD

+ 15 - 7
src/main/java/com/style24/persistence/mybatis/shop/TsfOrderChange.xml

@@ -191,6 +191,8 @@
 		     , Z.BANK_CD
 		     , Z.ACCOUNT_NO
 		     , Z.ACCOUNT_NM
+		     , Z.RTN_DELV_FEE
+		     , Z.DELV_FEE
 		  FROM (SELECT O.ORD_NO
 		             , DATE_FORMAT(O.ORD_DT, '%Y.%m.%d')                                      AS ORD_DT
 		             , OD.ORD_DTL_NO
@@ -235,7 +237,9 @@
 		             , OD.ORD_QTY - OD.CNCL_RTN_QTY - IF(OCD.ORD_REQ_CHG_QTY IS NULL, 0, OCD.ORD_REQ_CHG_QTY * ODI.ITEM_QTY) AS ORD_CAN_CHG_QTY
 		             , CA.BANK_CD
 		             , CA.ACCOUNT_NO
-		             , IFNULL(CA.ACCOUNT_NM, O.ORD_NM)                                  AS ACCOUNT_NM
+		             , IFNULL(CA.ACCOUNT_NM, O.ORD_NM)                                        AS ACCOUNT_NM
+		             , DFP.RTN_DELV_FEE
+		             , DFP.DELV_FEE
 		          FROM TB_ORDER O
 		         INNER JOIN TB_ORDER_DETAIL OD
 		            ON O.ORD_NO = OD.ORD_NO
@@ -248,6 +252,10 @@
 		            ON OD.GOODS_CD = G.GOODS_CD
 		         INNER JOIN TB_BRAND B
 		            ON B.BRAND_CD = G.BRAND_CD
+		          LEFT OUTER JOIN TB_DELV_FEE_POLICY DFP
+		            ON OD.DELV_FEE_CD = DFP.DELV_FEE_CD
+		           AND OD.SUPPLY_COMP_CD = DFP.SUPPLY_COMP_CD
+		           AND DFP.USE_YN = 'Y'
 		          LEFT OUTER JOIN (SELECT OD.ORD_DTL_NO
 		                                , SUM(OCD.CHG_QTY) AS ORD_REQ_CHG_QTY
 		                             FROM TB_ORDER_CHANGE_DETAIL OCD
@@ -283,7 +291,7 @@
 		        , Z.ORD_DTL_STAT, Z.ORD_QTY, Z.CNCL_RTN_QTY, Z.ORD_AMT, Z.REAL_ORD_AMT, Z.SAVE_PNT_AMT, Z.CNCL_RTN_AMT, Z.PNT_DC_AMT
 		        , Z.GFCD_USE_AMT, Z.SHIP_COMP_CD, Z.GIFT_PACK_YN, Z.SHIP_COMP_NM, Z.INVOICE_NO, Z.SUPPLY_COMP_CD, Z.DELV_FEE_CD
 		        , Z.SHOT_DELV_YN, Z.CHANGEABLE_YN, Z.SELF_GOODS_YN, Z.BRAND_NM, Z.ORD_REQ_CHG_QTY, Z.ORD_CAN_CHG_QTY, Z.BANK_CD
-		        , Z.ACCOUNT_NO, Z.ACCOUNT_NM
+		        , Z.ACCOUNT_NO, Z.ACCOUNT_NM, Z.RTN_DELV_FEE, Z.DELV_FEE
 		ORDER BY Z.ORD_DTL_NO
 	</select>
 	
@@ -296,7 +304,7 @@
 		     , G1.GOODS_NM
 		     , ODI.ORD_DTL_ITEM_SQ
 		     , ODI.ITEM_CD
-		     , G2.GOODS_NM AS ITEM_NM
+		     , G2.GOODS_NM                                        AS ITEM_NM
 		     , ODI.ITEM_QTY
 		     , OD.ORD_QTY
 		     , OD.CNCL_RTN_QTY
@@ -316,14 +324,14 @@
 		     , ODI.SAVE_PNT_AMT
 		     , ODI.GFCD_USE_AMT
 		     , ODI.CNCL_RTN_AMT
-		     , FN_GET_CODE_NM('G056', OD.GOODS_TYPE) AS GOODS_TYPE_NM
+		     , FN_GET_CODE_NM('G056', OD.GOODS_TYPE)              AS GOODS_TYPE_NM
 		     , ODI.ORD_DTL_STAT
-		     , FN_GET_CODE_NM('G013', ODI.ORD_DTL_STAT) AS ORD_DTL_STAT_NM
+		     , FN_GET_CODE_NM('G013', ODI.ORD_DTL_STAT)           AS ORD_DTL_STAT_NM
 		     , DF.DELV_FEE
 		     , DFP.MIN_ORD_AMT
-		     , DFP.DELV_FEE AS ORG_DELV_FEE
+		     , DFP.DELV_FEE                                       AS ORG_DELV_FEE
 		     , DFP.RTN_DELV_FEE
-		     , DFP.DELV_FEE + DFP.RTN_DELV_FEE AS EXC_DELV_FEE
+		     , DFP.DELV_FEE + DFP.RTN_DELV_FEE                    AS EXC_DELV_FEE
 		     , DFP.SUPPLY_COMP_CD
 		     , IF(G1.SELF_GOODS_YN = 'Y', 'WMS', DFP.DELV_FEE_CD) AS DELV_FEE_CD
 		     , P.PAY_STAT

+ 5 - 5
src/main/webapp/WEB-INF/views/web/mypage/MypageCancelFormWeb.html

@@ -240,7 +240,7 @@
 		let ordDtlNoArr = [];
 		let cnclRtnReqQtyArr = [];
 		let chkQty = 0;
-		$.each($('input[name=chgQty]'), function(idx, item) {
+		$.each($('#cancelForm input[name=chgQty]'), function(idx, item) {
 			let chgQty = $(item).val();
 			let ordDtlNo = $(item).attr('ordDtlNo');
 			
@@ -256,9 +256,9 @@
 		}
 
 		// 환불계좌 체크
-		let accountNo = $('input[name=accountNo]').val();
-		let accountNm = $('input[name=accountNm]').val();
-		let bankCd = $('input[name=bankCd]').val();
+		let accountNo = $('#cancelForm input[name=accountNo]').val();
+		let accountNm = $('#cancelForm input[name=accountNm]').val();
+		let bankCd = $('#cancelForm input[name=bankCd]').val();
 
 		if (paymentInfo.payMeans == 'G014_20' && paymentInfo.payStat == 'G016_30' && (gagajf.isNull(accountNo) || gagajf.isNull(accountNm) || gagajf.isNull(bankCd))) {
 			let data = {};
@@ -327,7 +327,7 @@
 		let cnclRtnReqQtyArr = [];
 		let ordDtlNoArr = [];
 		let ordCanChgQtyArr = [];
-		$.each($('input[name=chgQty]'), function(idx, item) {
+		$.each($('#cancelForm input[name=chgQty]'), function(idx, item) {
 			let chgQty = $(item).val();
 			let ordDtlNo = $(item).attr('ordDtlNo');
 			let ordCanChgQty = $(item).attr('ordCanChgQty');

+ 309 - 263
src/main/webapp/WEB-INF/views/web/mypage/MypageExchangeFormWeb.html

@@ -31,180 +31,212 @@
 				</div>
 			</div>
 			<div class="cont">
-				<div class="sec_head">
-					<h3 class="subH1">교환 신청</h3>
-					<span class="order_number">주문번호&nbsp;:&nbsp;<em th:text="${oneData.ordNo}"></em></span>
-				</div>
-				<div class="sec_body">
-					<div class="part_goods">
-						<div class="goods_head">
-							<p th:unless="${oneData.giftPackYn == 'Y'}">주문일 <span th:text="${oneData.ordDt}"></span></p>
-							<p th:if="${oneData.giftPackYn == 'Y'}">선물일 <span th:text="${oneData.ordDt}"></span></p>
-						</div>
-						<div class="goods_cont">
-							<th:block th:if="${exchangeList.returnList}" th:each="exchange, status : ${exchangeList.returnList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
-							<!-- 주문상품 -->
-							<div class="goods_info">
-								<div class="order_desc">
-									<div class="goods_box">
-										<div class="gd_item">
-											<a href="javascript:void(0)" th:attr="goodsCd=${exchange.goodsCd}" onclick="fnGoToGoodsDetail(this)">
-												<span class="thumb">
-													<img th:src="${imageUrl + '/' + exchange.sysImgNm}" width="100%" alt="">
-												</span>
+				<form id="exchangeForm">
+					<div class="sec_head">
+						<h3 class="subH1">교환 신청</h3>
+						<span class="order_number">주문번호&nbsp;:&nbsp;<em th:text="${oneData.ordNo}"></em></span>
+					</div>
+					<div class="sec_body">
+						<div class="part_goods">
+							<div class="goods_head">
+								<p th:unless="${oneData.giftPackYn == 'Y'}">주문일 <span th:text="${oneData.ordDt}"></span></p>
+								<p th:if="${oneData.giftPackYn == 'Y'}">선물일 <span th:text="${oneData.ordDt}"></span></p>
+							</div>
+							<div class="goods_cont">
+								<th:block th:if="${exchangeList.returnList}" th:each="exchange, status : ${exchangeList.returnList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
+								<!-- 주문상품 -->
+								<div class="goods_info">
+									<div class="order_desc">
+										<div class="goods_box">
+											<div class="gd_item">
+												<a href="javascript:void(0)" th:attr="goodsCd=${exchange.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+													<span class="thumb">
+														<img th:src="${imageUrl + '/' + exchange.sysImgNm}" width="100%" alt="">
+													</span>
+													<p>
+														<span class="brand" th:text="${exchange.brandNm}"></span>
+														<span class="tag primary" th:if="${exchange.shotDelvYn == 'Y'}">총알배송</span>
+														<span class="tag" th:if="${exchange.shotDelvYn == 'N' and exchange.selfGoodsYn == 'Y'}">STYLE24 일반배송</span>
+														<span class="tag" th:if="${exchange.selfGoodsYn == 'N'}">업체직배송</span>
+													</p>
+													<p>
+														<span class="name" th:text="${exchange.goodsNm}"></span>
+													</p>
+												</a>
+											</div>
+											<div class="gd_opt">
+												<div class="option_wrap">
+													<span class="title sr-only">주문 옵션</span>
+													<span class="option" th:if="${exchange.goodsType == 'G056_S'}" th:each="option, status : ${exchange.colorNmArr}" th:text="|${exchange.itemNmArr[status.index]} / ${option} / ${exchange.optCd2Arr[status.index]}|"></span>
+													<span class="option" th:unless="${exchange.goodsType == 'G056_S'}" th:text="|${exchange.colorNm} / ${exchange.optCd2}|"></span>
+												</div>
+												<div class="option_wrap exchangeOption" style="display:none" th:attr="ordDtlNo=${exchange.ordDtlNo}"></div>
+											</div>
+											<div class="gd_calc">
 												<p>
-													<span class="brand" th:text="${exchange.brandNm}"></span>
-													<span class="tag primary" th:if="${exchange.shotDelvYn == 'Y'}">총알배송</span>
-													<span class="tag" th:if="${exchange.shotDelvYn == 'N' and exchange.selfGoodsYn == 'Y'}">STYLE24 일반배송</span>
-													<span class="tag" th:if="${exchange.selfGoodsYn == 'N'}">업체직배송</span>
+													<span class="count"><em th:text="${exchange.ordQty - exchange.cnclRtnQty}"></em>개</span>
 												</p>
 												<p>
-													<span class="name" th:text="${exchange.goodsNm}"></span>
+													<span class="price_org" th:if="${(exchange.ordAmt - exchange.cnclRtnAmt - exchange.cpn1DcAmt) > (exchange.realOrdAmt + exchange.pntDcAmt + exchange.gfcdUseAmt)}"><em th:text="${#numbers.formatInteger(exchange.ordAmt - exchange.cnclRtnAmt - exchange.cpn1DcAmt, 1, 'COMMA')}"></em>원</span>
+													<span class="price_sale"><em th:text="${#numbers.formatInteger(exchange.realOrdAmt + exchange.pntDcAmt + exchange.gfcdUseAmt, 1, 'COMMA')}"></em>원</span>
 												</p>
-											</a>
-										</div>
-										<div class="gd_opt">
-											<div class="option_wrap">
-												<span class="title sr-only">주문 옵션</span>
-												<span class="option" th:if="${exchange.goodsType == 'G056_S'}" th:each="option, status : ${exchange.colorNmArr}" th:text="|${exchange.itemNmArr[status.index]} / ${option} / ${exchange.optCd2Arr[status.index]}|"></span>
-												<span class="option" th:unless="${exchange.goodsType == 'G056_S'}" th:text="|${exchange.colorNm} / ${exchange.optCd2}|"></span>
 											</div>
-											<div class="option_wrap exchangeOption" style="display:none" th:attr="ordDtlNo=${exchange.ordDtlNo}"></div>
-										</div>
-										<div class="gd_calc">
-											<p>
-												<span class="count"><em th:text="${exchange.ordQty - exchange.cnclRtnQty}"></em>개</span>
-											</p>
-											<p>
-												<span class="price_org" th:if="${(exchange.ordAmt - exchange.cnclRtnAmt - exchange.cpn1DcAmt) > (exchange.realOrdAmt + exchange.pntDcAmt + exchange.gfcdUseAmt)}"><em th:text="${#numbers.formatInteger(exchange.ordAmt - exchange.cnclRtnAmt - exchange.cpn1DcAmt, 1, 'COMMA')}"></em>원</span>
-												<span class="price_sale"><em th:text="${#numbers.formatInteger(exchange.realOrdAmt + exchange.pntDcAmt + exchange.gfcdUseAmt, 1, 'COMMA')}"></em>원</span>
-											</p>
 										</div>
-									</div>
-									<div class="button_box">
-										<div class="count_modify">
-											<span class="txt">수량</span>
-											<form class="form_wrap">
-												<div class="form_field">
-													<div class="select_custom select_count">
-														<div class="combo">
-															<input type="hidden" name="chgQty" value="0" th:attr="ordDtlNo=${exchange.ordDtlNo}, ordCanChgQty=${exchange.ordCanChgQty}"/>
-															<input type="hidden" name="chgOptionList" th:attr="ordDtlNo=${exchange.ordDtlNo}"/>
-															<div class="select">선택</div>
-															<ul class="list">
-																<!-- 선택처리 class="selected" / 선택불가 aria-disabled="true" 추가  -->
-																<li class="selected" qty="0" onclick="fnChangeExchangeQty(this);">선택</li>
-																<li th:if="${exchange.ordCanChgQty > 0}" th:each="num : ${#numbers.sequence(1,exchange.ordCanChgQty)}" th:attr="qty=${num}" th:text="${num}" onclick="fnChangeExchangeQty(this);"></li>
-															</ul>
+										<div class="button_box">
+											<div class="count_modify">
+												<span class="txt">수량</span>
+												<form class="form_wrap">
+													<div class="form_field">
+														<div class="select_custom select_count">
+															<div class="combo">
+																<input type="hidden" name="chgQty" value="0" th:attr="ordDtlNo=${exchange.ordDtlNo}, ordCanChgQty=${exchange.ordCanChgQty}"/>
+																<input type="hidden" name="chgOptionList" th:attr="ordDtlNo=${exchange.ordDtlNo}"/>
+																<div class="select">선택</div>
+																<ul class="list">
+																	<!-- 선택처리 class="selected" / 선택불가 aria-disabled="true" 추가  -->
+																	<li class="selected" qty="0" onclick="fnChangeExchangeQty(this);">선택</li>
+																	<li th:if="${exchange.ordCanChgQty > 0}" th:each="num : ${#numbers.sequence(1,exchange.ordCanChgQty)}" th:attr="qty=${num}" th:text="${num}" onclick="fnChangeExchangeQty(this);"></li>
+																</ul>
+															</div>
 														</div>
 													</div>
-												</div>
-											</form>
-											<button type="button" id="btn_exchange_pop" class="btn btn_dark btn_sm" th:attr="ordNo=${exchange.ordNo}, ordDtlNo=${exchange.ordDtlNo}" onclick="fnChangeOption(this)"><span>교환 옵션 변경</span></button>
+												</form>
+												<button type="button" id="btn_exchange_pop" class="btn btn_dark btn_sm" th:attr="ordNo=${exchange.ordNo}, ordDtlNo=${exchange.ordDtlNo}" onclick="fnChangeOption(this)"><span>교환 옵션 변경</span></button>
+											</div>
 										</div>
 									</div>
+									<div class="order_text">
+										<p>교환하실 상품의 수량 및 옵션을 선택하신 후 교환 신청을 하실 수 있습니다.</p>
+									</div>
 								</div>
-								<div class="order_text">
-									<p>교환하실 상품의 수량 및 옵션을 선택하신 후 교환 신청을 하실 수 있습니다.</p>
-								</div>
+								<!-- //주문상품 -->
+								</th:block>
 							</div>
-							<!-- //주문상품 -->
-							</th:block>
 						</div>
-					</div>
-					<h4 class="subH3">교환 사유</h4>
-					<div class="tbl type1">
-						<table>
-							<tbody>
-								<tr>
-									<td>
-										<div class="form_field">
-											<div class="select_custom select_reason">
-												<div class="combo">
-													<input type="hidden" name="chgReason"/>
-													<div class="select">교환 사유를 선택하세요.</div>
-													<ul class="list">
-														<!-- 선택처리 class="selected" / 선택불가 aria-disabled="true" 추가  -->
-														<li class="selected">교환 사유를 선택하세요.</li>
-														<li th:if="${exchangeReason}" th:each="oneData, status : ${exchangeReason}" th:attr="chgReason=${oneData.cd}" th:text="${oneData.cdNm}" onclick="fnChangeExchangeReason(this);"></li>
-													</ul>
+						<h4 class="subH3">교환 사유</h4>
+						<div class="tbl type1">
+							<table>
+								<tbody>
+									<tr>
+										<td>
+											<div class="form_field">
+												<div class="select_custom select_reason">
+													<div class="combo">
+														<input type="hidden" name="chgReason"/>
+														<div class="select">교환 사유를 선택하세요.</div>
+														<ul class="list">
+															<li class="selected">교환 사유를 선택하세요.</li>
+															<li th:if="${exchangeReason}" th:each="oneData, status : ${exchangeReason}" th:attr="chgReason=${oneData.cd}" th:text="${oneData.cdNm}" onclick="fnChangeExchangeReason(this);"></li>
+														</ul>
+													</div>
 												</div>
 											</div>
-										</div>
-									</td>
-								</tr>
+										</td>
+									</tr>
+									<tr>
+										<td>
+											<div class="form_field">
+												<div class="input_wrap">
+													<textarea class="doc_reason" name="chgMemo" id="chgMemo" cols="30" rows="10" placeholder="자세한 사유를 입력해주세요." style="resize: none;"></textarea>
+													<p class="txt_cnt"><span id="reason_cnt" class="c_primary">0</span>/200</p>
+												</div>
+											</div>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+						<h4 class="subH3">반품 방식 선택</h4>
+						<div class="tbl type1">
+							<table>
+								<tbody>
 								<tr>
 									<td>
-										<div class="form_field">
-											<div class="input_wrap">
-												<textarea class="doc_reason" name="chgMemo" id="chgMemo" cols="30" rows="10" placeholder="자세한 사유를 입력해주세요." style="resize: none;"></textarea>
-												<p class="txt_cnt"><span id="reason_cnt" class="c_primary">0</span>/200</p>
+										<div class="retrieve_method">
+											<div class="form_field">
+												<div>
+													<input type="radio" name="wdGb" id="withdraw" value="W" checked>
+													<label for="withdraw"><span>방문회수<em>택배사에서 고객에게 방문하여 회수</em></span></label>
+												</div>
+												<div>
+													<input type="radio" name="wdGb" id="direct" value="D">
+													<label for="direct"><span>직접배송<em>고객이 반품지로 직접 반송</em></span></label>
+												</div>
 											</div>
 										</div>
 									</td>
 								</tr>
-							</tbody>
-						</table>
-					</div>
-					<h4 class="subH3">반품 방식 선택</h4>
-					<div class="tbl type1">
-						<table>
-							<tbody>
-							<tr>
-								<td>
-									<div class="retrieve_method">
-										<div class="form_field">
-											<div>
-												<input type="radio" name="wdGb" id="withdraw" value="W" checked>
-												<label for="withdraw"><span>방문회수<em>택배사에서 고객에게 방문하여 회수</em></span></label>
-											</div>
-											<div>
-												<input type="radio" name="wdGb" id="direct" value="D">
-												<label for="direct"><span>직접배송<em>고객이 반품지로 직접 반송</em></span></label>
-											</div>
-										</div>
-									</div>
-								</td>
-							</tr>
-							</tbody>
-						</table>
-					</div>
-					<div class="retrieve_box visit" style="display:block;" id="chgerLocation">
-						<h4 class="subH3">교환 회수지 주소 <span class="tit_info">택배사에서 교환 상품을 직접 회수할 장소 선택</span></h4>
-						<div class="tbl type1">
-							<table>
-								<colgroup>
-									<col width="210">
-									<col width="*">
-								</colgroup>
-								<tbody>
-									<tr>
-										<th>성명</th>
-										<td id="chgerNm" th:text="${deliveryAddrInfo.recipNm}"></td>
-										<input type="hidden" name="chgerNm" th:value="${deliveryAddrInfo.recipNm}">
-									</tr>
+								</tbody>
+							</table>
+						</div>
+						<div class="retrieve_box visit" style="display:block;" id="chgerLocation">
+							<h4 class="subH3">교환 회수지 주소 <span class="tit_info">택배사에서 교환 상품을 직접 회수할 장소 선택</span></h4>
+							<div class="tbl type1">
+								<table>
+									<colgroup>
+										<col width="210">
+										<col width="*">
+									</colgroup>
+									<tbody>
+										<tr>
+											<th>성명</th>
+											<td id="chgerNm" th:text="${deliveryAddrInfo.recipNm}"></td>
+											<input type="hidden" name="chgerNm" th:value="${deliveryAddrInfo.recipNm}">
+										</tr>
+										<tr>
+											<th>연락처</th>
+											<td id="chgerPhnno" th:text="${deliveryAddrInfo.recipPhnno}"></td>
+											<input type="hidden" name="chgerPhnno" th:value="${deliveryAddrInfo.recipPhnno}">
+										</tr>
+										<tr>
+											<th>주소</th>
+											<td id="chgerAddr">
+												<th:block th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|"></th:block>
+												<button type="button" class="btn btn_default btn_sm" onclick="fnChangeAddr('chger');"><span>회수지 변경</span></button>
+											</td>
+											<input type="hidden" name="chgerZipcode" th:value="${deliveryAddrInfo.recipZipcode}">
+											<input type="hidden" name="chgerBaseAddr" th:value="${deliveryAddrInfo.recipBaseAddr}">
+											<input type="hidden" name="chgerDtlAddr" th:value="${deliveryAddrInfo.recipDtlAddr}">
+											<input type="hidden" name="chgerRtnMemo" th:value="${deliveryAddrInfo.delvMemo}">
+										</tr>
+									</tbody>
+								</table>
+							</div>
+						</div>
+						<div class="retrieve_box direct" style="display:none;" id="returnLocation">
+							<h4 class="subH3">반송 정보</h4>
+							<div class="tbl type1">
+								<table>
+									<colgroup>
+										<col width="210">
+										<col width="*">
+									</colgroup>
+									<tbody>
 									<tr>
-										<th>연락처</th>
-										<td id="chgerPhnno" th:text="${deliveryAddrInfo.recipPhnno}"></td>
-										<input type="hidden" name="chgerPhnno" th:value="${deliveryAddrInfo.recipPhnno}">
+										<th>
+											반송주소
+										</th>
+										<td th:text="|${deliveryAddrInfo.rtnLocBaseAddr} ${deliveryAddrInfo.rtnLocDtlAddr}|"></td>
 									</tr>
 									<tr>
-										<th>주소</th>
-										<td id="chgerAddr">
-											<th:block th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|"></th:block>
-											<button type="button" class="btn btn_default btn_sm" onclick="fnChangeDeliveryAddr('chger');"><span>회수지 변경</span></button>
+										<th>
+											반송 송장번호
+										</th>
+										<td>
+											<form class="form_wrap">
+												<div class="form_field">
+													<div class="input_wrap">
+														<input type="text" class="form_control" name="wdInvoiceNo" placeholder="송장번호를 입력해주세요.">
+													</div>
+												</div>
+											</form>
 										</td>
-										<input type="hidden" name="chgerZipcode" th:value="${deliveryAddrInfo.recipZipcode}">
-										<input type="hidden" name="chgerBaseAddr" th:value="${deliveryAddrInfo.recipBaseAddr}">
-										<input type="hidden" name="chgerDtlAddr" th:value="${deliveryAddrInfo.recipDtlAddr}">
-										<input type="hidden" name="chgerRtnMemo" th:value="${deliveryAddrInfo.delvMemo}">
 									</tr>
-								</tbody>
-							</table>
+									</tbody>
+								</table>
+							</div>
 						</div>
-					</div>
-					<div class="retrieve_box direct" style="display:none;" id="returnLocation">
-						<h4 class="subH3">반송 정보</h4>
+						<h4 class="subH3">교환 상품 배송지</h4>
 						<div class="tbl type1">
 							<table>
 								<colgroup>
@@ -212,83 +244,52 @@
 									<col width="*">
 								</colgroup>
 								<tbody>
-								<tr>
-									<th>
-										반송주소
-									</th>
-									<td th:text="|${deliveryAddrInfo.rtnLocBaseAddr} ${deliveryAddrInfo.rtnLocDtlAddr}|"></td>
-								</tr>
-								<tr>
-									<th>
-										반송 송장번호
-									</th>
-									<td>
-										<form class="form_wrap">
-											<div class="form_field">
-												<div class="input_wrap">
-													<input type="text" class="form_control" name="wdInvoiceNo" placeholder="송장번호를 입력해주세요.">
-												</div>
+									<tr>
+										<th>
+											배송지 정보
+										</th>
+										<td>
+											<div class="block_line">
+												<ul>
+													<li>
+														<span id="recipNm" th:text="${deliveryAddrInfo.recipNm}"></span>
+													</li>
+													<li>
+														<span id="recipPhnno" th:text="${deliveryAddrInfo.recipPhnno}"></span>
+													</li>
+													<li>
+														<span id="recipAddr" th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|"></span>
+														<button type="button" class="btn btn_default btn_sm" onclick="fnChangeAddr('recip')"><span>배송지 변경</span></button>
+													</li>
+													<li>
+														배송요청 사항&nbsp;:&nbsp;<span id="delvMemo" th:text="${deliveryAddrInfo.delvMemo}"></span>
+														<button type="button" class="btn_underline" onclick="fnChangeDeliveryMemo()"><span>변경하기</span></button>
+													</li>
+												</ul>
 											</div>
-										</form>
-									</td>
-								</tr>
+										</td>
+										<input type="hidden" name="recipNm" th:value="${deliveryAddrInfo.recipNm}">
+										<input type="hidden" name="recipPhnno" th:value="${deliveryAddrInfo.recipPhnno}">
+										<input type="hidden" name="recipZipcode" th:value="${deliveryAddrInfo.recipZipcode}">
+										<input type="hidden" name="recipBaseAddr" th:value="${deliveryAddrInfo.recipBaseAddr}">
+										<input type="hidden" name="recipDtlAddr" th:value="${deliveryAddrInfo.recipDtlAddr}">
+										<input type="hidden" name="delvMemo" th:value="${deliveryAddrInfo.delvMemo}">
+									</tr>
 								</tbody>
 							</table>
 						</div>
+						<div class="info_footer_area" id="addDeliveryFee" style="display:none">
+							<p>
+								<span id="addPayCost">2,500원</span> 배송비 추가 결제가 필요합니다.
+								<input type="hidden" name="addPayCost"/>
+							</p>
+						</div>
+						<div class="btn_footer_area">
+							<button type="button" class="btn btn_default btn_md" onclick="cfnGoToPage(_PAGE_MYPAGE_CRS_LIST)"><span>취소</span></button>
+							<button type="button" id="btn_confirm_exchange" class="btn btn_dark btn_md" onclick="fnExchange()"><span>교환 신청</span></button>
+						</div>
 					</div>
-					<h4 class="subH3">교환 상품 배송지</h4>
-					<div class="tbl type1">
-						<table>
-							<colgroup>
-								<col width="210">
-								<col width="*">
-							</colgroup>
-							<tbody>
-								<tr>
-									<th>
-										배송지 정보
-									</th>
-									<td>
-										<div class="block_line">
-											<ul>
-												<li>
-													<span id="recipNm" th:text="${deliveryAddrInfo.recipNm}"></span>
-												</li>
-												<li>
-													<span id="recipPhnno" th:text="${deliveryAddrInfo.recipPhnno}"></span>
-												</li>
-												<li>
-													<span id="recipAddr" th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|"></span>
-													<button type="button" class="btn btn_default btn_sm" onclick="fnChangeDeliveryAddr('recip')"><span>배송지 변경</span></button>
-												</li>
-												<li>
-													배송요청 사항&nbsp;:&nbsp;<span id="delvMemo" th:text="${deliveryAddrInfo.delvMemo}"></span>
-													<button type="button" class="btn_underline" onclick="fnChangeDeliveryMemo()"><span>변경하기</span></button>
-												</li>
-											</ul>
-										</div>
-									</td>
-									<input type="hidden" name="recipNm" th:value="${deliveryAddrInfo.recipNm}">
-									<input type="hidden" name="recipPhnno" th:value="${deliveryAddrInfo.recipPhnno}">
-									<input type="hidden" name="recipZipcode" th:value="${deliveryAddrInfo.recipZipcode}">
-									<input type="hidden" name="recipBaseAddr" th:value="${deliveryAddrInfo.recipBaseAddr}">
-									<input type="hidden" name="recipDtlAddr" th:value="${deliveryAddrInfo.recipDtlAddr}">
-									<input type="hidden" name="delvMemo" th:value="${deliveryAddrInfo.delvMemo}">
-								</tr>
-							</tbody>
-						</table>
-					</div>
-					<div class="info_footer_area" id="addDeliveryFee" style="display:none">
-						<p>
-							<span id="addPayCost">2,500원</span> 배송비 추가 결제가 필요합니다.
-							<input type="hidden" name="addPayCost"/>
-						</p>
-					</div>
-					<div class="btn_footer_area">
-						<button type="button" class="btn btn_default btn_md" onclick="cfnGoToPage(_PAGE_MYPAGE_CRS_LIST)"><span>취소</span></button>
-						<button type="button" id="btn_confirm_exchange" class="btn btn_dark btn_md" onclick="fnExchange()"><span>교환 신청</span></button>
-					</div>
-				</div>
+				</form>
 			</div>
 			<!-- // CONT-BODY -->
 		</div>
@@ -296,6 +297,9 @@
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
 	var isLogin = [[${isLogin}]];
+	let ordNo = [[${oneData.ordNo}]];
+	let oneData = [[${oneData}]];
+	let isCustomer = true;
 	let addrGb = '';
 
 	$(document).ready(function() {
@@ -309,12 +313,16 @@
 		$('.select_custom').each(function() {
 			new sCombo($(this));
 		});
+
+		// 입점업체의 경우 회수방식 직접배송 처리
+		if (oneData.selfGoodsYn == 'Y') {
+			$('#direct').click();
+			$('#wdGb').css('display','none');
+		}
 	});
 
 	// 교환 옵션 변경 팝업
 	var fnChangeOption = function(param) {
-		// TODO
-		// 옵션변경 처리
 		let ordNo = $(param).attr('ordNo');
 		let ordDtlNo = $(param).attr('ordDtlNo');
 
@@ -322,7 +330,7 @@
 		let chgQtyArr = [];
 		let chgOrdDtlNoArr = [];
 
-		$.each($('input[name=chgQty]'), function(idx, item) {
+		$.each($('#exchangeForm input[name=chgQty]'), function(idx, item) {
 			chgQtyArr.push($(item).val());
 			chgOrdDtlNoArr.push($(item).attr('ordDtlNo'));
 		});
@@ -390,32 +398,19 @@
 			}
 		});
 
-		$.each($('input[name=chgOptionList]'), function(index, option) {
-			if (ordDtlNo == $(option).attr('ordDtlNo')) {
-				$(option).val(JSON.stringify(chgOptionList));
+		// 교환옵션 값 JSON 형태로 설정
+		$.each($('#exchangeForm input[name=chgOptionList]'), function(idx, item) {
+			if (ordDtlNo == $(item).attr('ordDtlNo')) {
+				$(item).val(JSON.stringify(chgOptionList));
 			}
 		});
-		
-		$.each($('input[name=chgOptionList]'), function(index, item) {
+
+		// 교환옵션 값 파싱 처리 예제
+		$.each($('#exchangeForm input[name=chgOptionList]'), function(idx, item) {
 			let json = $(item).val();
 			let jsonData = JSON.parse(json);
 		});
 	}
-	
-	// 변경 옵션별 수량 처리
-	var fnOptionCount = function(param) {
-		var result = [];
-		param.reduce(function(res, value) {
-			if (!res[value.chgOptCd2]) {
-				res[value.chgOptCd2] = { chgOptCd2: value.chgOptCd2, qty: 0 };
-				result.push(res[value.chgOptCd2])
-			}
-			res[value.chgOptCd2].qty += value.qty;
-			return res;
-		}, {});
-		
-		return result;
-	}
 
 	// 교환 처리
 	var fnExchange = function() {
@@ -424,9 +419,9 @@
 	}
 
 	// 반품 방식 변경 이벤트
-	$('input[name=wdGb]').on('change', function() {
-		let wdGb = $('input[name=wdGb]:radio:checked').val();
-		
+	$('#exchangeForm input[name=wdGb]').on('change', function() {
+		let wdGb = $('#exchangeForm input[name=wdGb]:radio:checked').val();
+
 		if (wdGb == 'W') {
 			$('#chgerLocation').css('display', '');
 			$('#returnLocation').css('display', 'none');
@@ -434,23 +429,68 @@
 			$('#chgerLocation').css('display', 'none');
 			$('#returnLocation').css('display', '');
 		}
-		
-		// 환불금액 계산
-		fnChangeReturnQty();
+
+		// 추가 배송비 계산
+		fnAddCost();
 	});
 
-	// 교환 사유 변경 이벤트
-	var fnChangeExchangeReason = function(param) {
-		let chgReason = $(param).val();
-		// TODO
-		// 사유 변경 처리
-	}
-	
 	// 교환 수량 변경 이벤트
 	var fnChangeExchangeQty = function(param) {
 		if (param != null) {
 			$(param).parent().parent().find('input[name=chgQty]').val($(param).attr('qty'));
 		}
+		
+		// 추가 배송비 계산
+		fnAddCost();
+	}
+
+	// 교환 사유 변경 이벤트
+	var fnChangeExchangeReason = function(param) {
+		var customerReasonArr = ['G689_10', 'G689_30'];
+		let chgReason = $(param).attr('chgReason');
+
+		// 귀책사유체크(취소,반품,교환)
+		isCustomer = customerReasonArr.includes(chgReason);
+
+		// 교환 사유 설정
+		$(param).parent().parent().find('input[name=chgReason]').val(chgReason);
+
+		// 추가 배송비 계산
+		fnAddCost();
+	}
+
+	// 추가 배송비 계산
+	var fnAddCost = function() {
+		// 자사상품만 처리, 입점업체는 SCM에서 별도 처리
+		if (oneData.selfGoodsYn == 'Y') {
+			let addPayCost = 0;
+			let delvFee = oneData.delvFee;
+			let rtnDelvFee = oneData.rtnDelvFee;
+
+			// 교환 수량 체크
+			let qty = 0;
+			$.each($('#exchangeForm input[name=chgQty]'), function (idx, item) {
+				qty += Number($(item).val());
+			});
+
+			// 교환 수량이 있고 고객 귀책 사유 시 추가 배송비 계산
+			if (isCustomer && qty > 0) {
+				addPayCost = delvFee;
+
+				// 회수 요청 시 반품배송비 추가
+				if ($('#exchangeForm input[name=wdGb]:radio:checked').val() == 'W') {
+					addPayCost += rtnDelvFee;
+				}
+
+				// 추가배송비 영역 설정
+				$('#addDeliveryFee').css('display', '');
+				$('#addPayCost').text(addPayCost.addComma() + '원');
+				$('#exchangeForm input[name=addPayCost]').val(addPayCost);
+			} else {
+				$('#addDeliveryFee').css('display', 'none');
+				$('#exchangeForm input[name=addPayCost]').val(0);
+			}
+		}
 	}
 
 	// 배송지 정보 설정
@@ -461,13 +501,13 @@
 		let recipBaseAddr = delvObj.recipBaseAddr;
 		let recipDtlAddr = delvObj.recipDtlAddr;
 		let delvMemo = delvObj.delvMemo;
-		
+
 		if (addrGb == 'recip') {
 			$('#recipNm').text(recipNm);
 			$('#recipPhnno').text(recipPhnno);
 			$('#recipAddr').text(recipBaseAddr + ' ' + recipDtlAddr);
 			$('#delvMemo').text(delvMemo);
-			
+
 			$('input[name=recipNm]').val(recipNm);
 			$('input[name=recipPhnno]').val(recipPhnno);
 			$('input[name=recipZipcode]').val(recipZipcode);
@@ -475,18 +515,18 @@
 			$('input[name=recipDtlAddr]').val(recipDtlAddr);
 			$('input[name=delvMemo]').val(delvMemo);
 		} else {
-			let chgerAddr = chgerBaseAddr + ' ' + chgerDtlAddr + '\n';
-			chgerAddr += '<button type="button" class="btn btn_default btn_sm" onclick="fnChangeDeliveryAddr(\'chger\');"><span>회수지 변경</span></button>';
-			
+			let chgerAddr = recipBaseAddr + ' ' + recipDtlAddr + '\n';
+			chgerAddr += '<button type="button" class="btn btn_default btn_sm" onclick="fnChangeAddr(\'chger\');"><span>회수지 변경</span></button>';
+
 			$('input[name=chgerNm]').val(recipNm);
 			$('input[name=chgerPhnno]').val(recipPhnno);
 			$('input[name=chgerZipcode]').val(recipZipcode);
 			$('input[name=chgerBaseAddr]').val(recipBaseAddr);
 			$('input[name=chgerDtlAddr]').val(recipDtlAddr);
 			$('input[name=chgerRtnMemo]').val(delvMemo);
-			
-			$('#chgerNm').text(chgerNm);
-			$('#chgerPhnno').text(chgerPhnno);
+
+			$('#chgerNm').text(recipNm);
+			$('#chgerPhnno').text(recipPhnno);
 			$('#chgerAddr').html(chgerAddr);
 		}
 	}
@@ -497,6 +537,12 @@
 		$('input[name=delvMemo]').val(delvMemo);
 		$("#delvMemo").text(delvMemo);
 	}
+
+	// 배송지 및 교환지 변경 처리
+	var fnChangeAddr = function(param) {
+		addrGb = param;
+		fnChangeDeliveryAddr();
+	}
 </script>
 
 </th:block>

+ 411 - 368
src/main/webapp/WEB-INF/views/web/mypage/MypageOrderDetailFormWeb.html

@@ -32,399 +32,401 @@
 				</div>
 			</div>
 			<div class="cont">
-				<div class="sec_head">
-					<h3 class="subH1">주문상세</h3>
-					<span class="order_number">주문번호&nbsp;:&nbsp;<em th:text="${ordNo}"></em></span>
-					<button type="button" id="btn_order_cancel" class="btn_underline" onclick="fnDeleteOrder()"><span>삭제하기</span></button>
-				</div>
-				<div class="sec_body">
-					<th:block th:if="${orderList}" th:each="order, status : ${orderList}">
-						<input type="hidden" name="accountNo" th:value="${order.oneData.accountNo}"/>
-						<input type="hidden" name="accountNm" th:value="${order.oneData.accountNm}"/>
-						<input type="hidden" name="bankCd" th:value="${order.oneData.bankCd}"/>
-						<input type="hidden" name="delvMemo" th:value="${deliveryAddrInfo.delvMemo}"/>
-						<div class="part_goods">
-							<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>
-								<li><a href="javascript:void(0)" th:if="${order.allCanYn == 'Y' and order.ordReqChgQty == 0}" onclick="fnAllCancel();">주문전체취소</a></li>
-							</div>
-							<div class="goods_cont">
-								<!-- 주문상품 -->
-								<th:block th:if="${order.ordDtlList}" th:each="ordDtl, status : ${order.ordDtlList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
-									<div class="goods_info">
-										<div class="order_desc">
-											<div class="goods_box">
-												<input type="hidden" name="ordDtlNoArr" th:value="${ordDtl.ordDtlNo}"/>
-												<input type="hidden" name="cnclRtnReqQtyArr" th:value="${ordDtl.ordQty - ordDtl.cnclRtnQty}"/>
-												<div class="gd_item">
-													<a href="javascript:void(0)" th:attr="goodsCd=${ordDtl.goodsCd}" onclick="fnGoToGoodsDetail(this)">
-														<span class="thumb">
-															<img th:src="${imageUrl + '/' + ordDtl.sysImgNm}" width="100%" alt="">
-														</span>
+				<form id="orderDetailForm">
+					<div class="sec_head">
+						<h3 class="subH1">주문상세</h3>
+						<span class="order_number">주문번호&nbsp;:&nbsp;<em th:text="${ordNo}"></em></span>
+						<button type="button" id="btn_order_cancel" class="btn_underline" onclick="fnDeleteOrder()"><span>삭제하기</span></button>
+					</div>
+					<div class="sec_body">
+						<th:block th:if="${orderList}" th:each="order, status : ${orderList}">
+							<input type="hidden" name="accountNo" th:value="${order.oneData.accountNo}"/>
+							<input type="hidden" name="accountNm" th:value="${order.oneData.accountNm}"/>
+							<input type="hidden" name="bankCd" th:value="${order.oneData.bankCd}"/>
+							<input type="hidden" name="delvMemo" th:value="${deliveryAddrInfo.delvMemo}"/>
+							<div class="part_goods">
+								<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>
+									<li><a href="javascript:void(0)" th:if="${order.allCanYn == 'Y' and order.ordReqChgQty == 0}" onclick="fnAllCancel();">주문전체취소</a></li>
+								</div>
+								<div class="goods_cont">
+									<!-- 주문상품 -->
+									<th:block th:if="${order.ordDtlList}" th:each="ordDtl, status : ${order.ordDtlList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
+										<div class="goods_info">
+											<div class="order_desc">
+												<div class="goods_box">
+													<input type="hidden" name="ordDtlNoArr" th:value="${ordDtl.ordDtlNo}"/>
+													<input type="hidden" name="cnclRtnReqQtyArr" th:value="${ordDtl.ordQty - ordDtl.cnclRtnQty}"/>
+													<div class="gd_item">
+														<a href="javascript:void(0)" th:attr="goodsCd=${ordDtl.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+															<span class="thumb">
+																<img th:src="${imageUrl + '/' + ordDtl.sysImgNm}" width="100%" alt="">
+															</span>
+															<p>
+																<span class="brand" th:text="${ordDtl.brandNm}"></span>
+																<span class="tag primary" th:if="${ordDtl.shotDelvYn == 'Y'}">총알배송</span>
+																<span class="tag" th:if="${ordDtl.shotDelvYn == 'N' and ordDtl.selfGoodsYn == 'Y'}">STYLE24 일반배송</span>
+																<span class="tag" th:if="${ordDtl.selfGoodsYn == 'N'}">업체직배송</span>
+															</p>
+															<p>
+																<span class="name" th:text="${ordDtl.goodsNm}"></span>
+															</p>
+														</a>
+													</div>
+													<div class="gd_opt">
+														<div class="option_wrap">
+															<span class="title sr-only">주문 옵션</span>
+															<span class="option" th:if="${ordDtl.goodsType == 'G056_S'}" th:each="option, status : ${ordDtl.colorNmArr}" th:text="|${ordDtl.itemNmArr[status.index]} / ${option} / ${ordDtl.optCd2Arr[status.index]}|"></span>
+															<span class="option" th:unless="${ordDtl.goodsType == 'G056_S'}" th:text="|${ordDtl.colorNm} / ${ordDtl.optCd2}|"></span>
+														</div>
+													</div>
+													<div class="gd_calc">
 														<p>
-															<span class="brand" th:text="${ordDtl.brandNm}"></span>
-															<span class="tag primary" th:if="${ordDtl.shotDelvYn == 'Y'}">총알배송</span>
-															<span class="tag" th:if="${ordDtl.shotDelvYn == 'N' and ordDtl.selfGoodsYn == 'Y'}">STYLE24 일반배송</span>
-															<span class="tag" th:if="${ordDtl.selfGoodsYn == 'N'}">업체직배송</span>
+															<span class="count"><em th:text="${ordDtl.ordQty - ordDtl.cnclRtnQty}"></em>개</span>
 														</p>
 														<p>
-															<span class="name" th:text="${ordDtl.goodsNm}"></span>
+															<span class="price_org" th:if="${(ordDtl.ordAmt - ordDtl.cnclRtnAmt - ordDtl.cpn1DcAmt) > (ordDtl.realOrdAmt + ordDtl.pntDcAmt + ordDtl.gfcdUseAmt)}"><em th:text="${#numbers.formatInteger(ordDtl.ordAmt - ordDtl.cnclRtnAmt - ordDtl.cpn1DcAmt, 1, 'COMMA')}"></em>원</span>
+															<span class="price_sale"><em th:text="${#numbers.formatInteger(ordDtl.realOrdAmt + ordDtl.pntDcAmt + ordDtl.gfcdUseAmt, 1, 'COMMA')}"></em>원</span>
+														</p>
+														<p>
+															<span class="point"><em th:text="${#numbers.formatInteger(ordDtl.savePntAmt, 1, 'COMMA')}"></em><stong>P</stong>&nbsp;적립예정</span>
 														</p>
-													</a>
-												</div>
-												<div class="gd_opt">
-													<div class="option_wrap">
-														<span class="title sr-only">주문 옵션</span>
-														<span class="option" th:if="${ordDtl.goodsType == 'G056_S'}" th:each="option, status : ${ordDtl.colorNmArr}" th:text="|${ordDtl.itemNmArr[status.index]} / ${option} / ${ordDtl.optCd2Arr[status.index]}|"></span>
-														<span class="option" th:unless="${ordDtl.goodsType == 'G056_S'}" th:text="|${ordDtl.colorNm} / ${ordDtl.optCd2}|"></span>
 													</div>
 												</div>
-												<div class="gd_calc">
-													<p>
-														<span class="count"><em th:text="${ordDtl.ordQty - ordDtl.cnclRtnQty}"></em>개</span>
-													</p>
-													<p>
-														<span class="price_org" th:if="${(ordDtl.ordAmt - ordDtl.cnclRtnAmt - ordDtl.cpn1DcAmt) > (ordDtl.realOrdAmt + ordDtl.pntDcAmt + ordDtl.gfcdUseAmt)}"><em th:text="${#numbers.formatInteger(ordDtl.ordAmt - ordDtl.cnclRtnAmt - ordDtl.cpn1DcAmt, 1, 'COMMA')}"></em>원</span>
-														<span class="price_sale"><em th:text="${#numbers.formatInteger(ordDtl.realOrdAmt + ordDtl.pntDcAmt + ordDtl.gfcdUseAmt, 1, 'COMMA')}"></em>원</span>
-													</p>
-													<p>
-														<span class="point"><em th:text="${#numbers.formatInteger(ordDtl.savePntAmt, 1, 'COMMA')}"></em><stong>P</stong>&nbsp;적립예정</span>
-													</p>
-												</div>
-											</div>
-											<div class="status_box">
-												<!-- 선물 -->
-												<th:block th:if="${order.giftPackYn == 'Y'}">
-													<p th:if="${#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.giftLimitDay >= 0}">주소 입력 대기중</p>
-													<p th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">선물 완료</p>
-													<p th:if="${ordDtl.ordDtlStat == 'G013_98' or ordDtl.ordDtlStat == 'G013_99'}">선물 취소</p>
-												</th:block>
-												<!-- 주문 -->
-												<th:block th:unless="${order.giftPackYn == 'Y'}">
-													<p th:text="${ordDtl.ordDtlStatNm}"></p>
-												</th:block>
-											</div>
-											<div class="button_box">
-												<!-- 선물 -->
-												<th:block th:if="${order.giftPackYn == 'Y'}">
-													<!-- SMS 재발송 버튼 -->
-													<th:block th:if="${#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.giftLimitDay >= 0}">
-														<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}" onclick="fnReSendSms(this);"><span>SMS 재발송</span></button></p>
+												<div class="status_box">
+													<!-- 선물 -->
+													<th:block th:if="${order.giftPackYn == 'Y'}">
+														<p th:if="${#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.giftLimitDay >= 0}">주소 입력 대기중</p>
+														<p th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">선물 완료</p>
+														<p th:if="${ordDtl.ordDtlStat == 'G013_98' or ordDtl.ordDtlStat == 'G013_99'}">선물 취소</p>
 													</th:block>
-													
-													<!-- 리뷰 쓰기 버튼 -->
-													<th:block th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99' and ordDtl.reviewableYn == 'Y' and ordDtl.reviewSq == null}">
-														<p><button type="button" class="btn btn_primary_line btn_sm" th:attr="ordNo=${ordDtl.ordNo}" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></p>
+													<!-- 주문 -->
+													<th:block th:unless="${order.giftPackYn == 'Y'}">
+														<p th:text="${ordDtl.ordDtlStatNm}"></p>
 													</th:block>
-												</th:block>
-												<!-- 주문 -->
-												<th:block th:unless="${order.giftPackYn == 'Y'}">
-													<!-- 주문취소 버튼(입금대기, 결제완료, 상품준비중, 출고처지정, 배송준비중) -->
-													<th:block th:if="${ordDtl.ordDtlStat == 'G013_10' or ordDtl.ordDtlStat == 'G013_20' or ordDtl.ordDtlStat == 'G013_30' or ordDtl.ordDtlStat == 'G013_35' or ordDtl.ordDtlStat == 'G013_40'}">
-														<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateChange(this, 'cancel');"><span>주문 취소</span></button></p>
+												</div>
+												<div class="button_box">
+													<!-- 선물 -->
+													<th:block th:if="${order.giftPackYn == 'Y'}">
+														<!-- SMS 재발송 버튼 -->
+														<th:block th:if="${#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.giftLimitDay >= 0}">
+															<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}" onclick="fnReSendSms(this);"><span>SMS 재발송</span></button></p>
+														</th:block>
+														
+														<!-- 리뷰 쓰기 버튼 -->
+														<th:block th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99' and ordDtl.reviewableYn == 'Y' and ordDtl.reviewSq == null}">
+															<p><button type="button" class="btn btn_primary_line btn_sm" th:attr="ordNo=${ordDtl.ordNo}" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></p>
+														</th:block>
 													</th:block>
-													
-													<!-- 교환/반품 신청 버튼(배송중, 출고완료, 배송완료) -->
-													<th:block th:if="${ordDtl.ordDtlStat == 'G013_50' or ordDtl.ordDtlStat == 'G013_55' or ordDtl.ordDtlStat == 'G013_60'}">
-														<!-- 교환/반품 가능한 상품 -->
-														<th:block th:if="${ordDtl.changeableYn == 'Y' and ordDtl.returnableYn == 'Y'}">
-															<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, supplyCompCd=${ordDtl.supplyCompCd}" onclick="fnCreateChange(this, 'exchange');"><span>교환 신청</span></button></p>
-															<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, supplyCompCd=${ordDtl.supplyCompCd}" onclick="fnCreateChange(this, 'return');"><span>반품 신청</span></button></p>
+													<!-- 주문 -->
+													<th:block th:unless="${order.giftPackYn == 'Y'}">
+														<!-- 주문취소 버튼(입금대기, 결제완료, 상품준비중, 출고처지정, 배송준비중) -->
+														<th:block th:if="${ordDtl.ordDtlStat == 'G013_10' or ordDtl.ordDtlStat == 'G013_20' or ordDtl.ordDtlStat == 'G013_30' or ordDtl.ordDtlStat == 'G013_35' or ordDtl.ordDtlStat == 'G013_40'}">
+															<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateChange(this, 'cancel');"><span>주문 취소</span></button></p>
 														</th:block>
 														
-														<!-- 교환 신청 불가 상품 -->
-														<th:block th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'Y'}">
-															<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></p>
-															<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, supplyCompCd=${ordDtl.supplyCompCd}" onclick="fnCreateChange(this, 'return');"><span>반품 신청</span></button></p>
+														<!-- 교환/반품 신청 버튼(배송중, 출고완료, 배송완료) -->
+														<th:block th:if="${ordDtl.ordDtlStat == 'G013_50' or ordDtl.ordDtlStat == 'G013_55' or ordDtl.ordDtlStat == 'G013_60'}">
+															<!-- 교환/반품 가능한 상품 -->
+															<th:block th:if="${ordDtl.changeableYn == 'Y' and ordDtl.returnableYn == 'Y'}">
+																<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, supplyCompCd=${ordDtl.supplyCompCd}" onclick="fnCreateChange(this, 'exchange');"><span>교환 신청</span></button></p>
+																<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, supplyCompCd=${ordDtl.supplyCompCd}" onclick="fnCreateChange(this, 'return');"><span>반품 신청</span></button></p>
+															</th:block>
+															
+															<!-- 교환 신청 불가 상품 -->
+															<th:block th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'Y'}">
+																<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></p>
+																<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, supplyCompCd=${ordDtl.supplyCompCd}" onclick="fnCreateChange(this, 'return');"><span>반품 신청</span></button></p>
+															</th:block>
+	
+															<!-- 반품 신청 불가 상품 -->
+															<th:block th:if="${ordDtl.changeableYn == 'Y' and ordDtl.returnableYn == 'N'}">
+																<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, supplyCompCd=${ordDtl.supplyCompCd}" onclick="fnCreateChange(this, 'exchange');"><span>교환 신청</span></button></p>
+																<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></p>
+															</th:block>
+	
+															<!-- 교환/반품 신청 불가 상품 -->
+															<th:block th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'N'}">
+																<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></p>
+															</th:block>
 														</th:block>
-
-														<!-- 반품 신청 불가 상품 -->
-														<th:block th:if="${ordDtl.changeableYn == 'Y' and ordDtl.returnableYn == 'N'}">
-															<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, supplyCompCd=${ordDtl.supplyCompCd}" onclick="fnCreateChange(this, 'exchange');"><span>교환 신청</span></button></p>
-															<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></p>
+														
+														<!-- 배송조회 버튼(배송중) -->
+														<th:block th:if="${ordDtl.ordDtlStat == 'G013_50' or ordDtl.ordDtlStat == 'G013_55'}">
+															<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnGoToDelivery(this);"><span>배송 조회</span></button></p>
 														</th:block>
-
-														<!-- 교환/반품 신청 불가 상품 -->
-														<th:block th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'N'}">
+	
+														<!-- 구매확정 버튼(배송완료) -->
+														<th:block th:if="${ordDtl.ordDtlStat == 'G013_60'}">
+															<p><button type="button" class="btn btn_primary_line btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnDecideOrder(this);"><span>구매 확정</span></button></p>
+														</th:block>
+	
+														<!-- 리뷰작성 버튼(구매확정) -->
+														<th:block th:if="${(ordDtl.ordDtlStat == 'G013_50' or ordDtl.ordDtlStat == 'G013_55' or ordDtl.ordDtlStat == 'G013_60' or ordDtl.ordDtlStat == 'G013_70') and ordDtl.reviewableYn == 'Y' and ordDtl.reviewSq == null}">
+															<p><button type="button" class="btn btn_primary_line btn_sm" th:attr="ordNo=${ordDtl.ordNo}" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></p>
+														</th:block>
+	
+														<!-- 쇼핑백담기 버튼(구매확정) -->
+														<th:block th:if="${ordDtl.ordDtlStat == 'G013_70'}">
+															<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></p>
+														</th:block>
+	
+														<!-- 1:1문의 버튼(구매확정) -->
+														<th:block th:if="${ordDtl.ordDtlStat == 'G013_70' and (ordDtl.reviewableYn == 'N' or ordDtl.reviewSq > 0)}">
 															<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></p>
 														</th:block>
 													</th:block>
-													
-													<!-- 배송조회 버튼(배송중) -->
-													<th:block th:if="${ordDtl.ordDtlStat == 'G013_50' or ordDtl.ordDtlStat == 'G013_55'}">
-														<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnGoToDelivery(this);"><span>배송 조회</span></button></p>
-													</th:block>
-
-													<!-- 구매확정 버튼(배송완료) -->
-													<th:block th:if="${ordDtl.ordDtlStat == 'G013_60'}">
-														<p><button type="button" class="btn btn_primary_line btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnDecideOrder(this);"><span>구매 확정</span></button></p>
-													</th:block>
-
-													<!-- 리뷰작성 버튼(구매확정) -->
-													<th:block th:if="${(ordDtl.ordDtlStat == 'G013_50' or ordDtl.ordDtlStat == 'G013_55' or ordDtl.ordDtlStat == 'G013_60' or ordDtl.ordDtlStat == 'G013_70') and ordDtl.reviewableYn == 'Y' and ordDtl.reviewSq == null}">
-														<p><button type="button" class="btn btn_primary_line btn_sm" th:attr="ordNo=${ordDtl.ordNo}" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></p>
-													</th:block>
-
-													<!-- 쇼핑백담기 버튼(구매확정) -->
-													<th:block th:if="${ordDtl.ordDtlStat == 'G013_70'}">
-														<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></p>
-													</th:block>
-
-													<!-- 1:1문의 버튼(구매확정) -->
-													<th:block th:if="${ordDtl.ordDtlStat == 'G013_70' and (ordDtl.reviewableYn == 'N' or ordDtl.reviewSq > 0)}">
-														<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></p>
-													</th:block>
-												</th:block>
-											</div>
-										</div>
-										<!-- 선물 -->
-										<th:block th:if="${order.giftPackYn == 'Y'}">
-											<!-- 주소 입력 대기중 -->
-											<div class="order_text" th:if="${#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.giftLimitDay >= 0}">
-												<p th:text="|${ordDtl.recipNm}님이 주소를 입력하기 전입니다. (입력기한 ${ordDtl.giftLimitDt})|"></p>
-											</div>
-
-											<!-- 선물 완료 -->
-											<div class="order_text" th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">
-												<p th:text="|${ordDtl.recipNm}님께 선물이 발송되었습니다.|"></p>
-											</div>
-
-											<!-- 선물 취소 -->
-											<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_98' and ordDtl.ordDtlStat == 'G013_99'}">
-												<p th:text="|주소 입력 기한이 경과되어 선물이 취소 되었습니다.|"></p>
-											</div>
-										</th:block>
-										
-										<!-- 주문 -->
-										<th:block th:unless="${order.giftPackYn == 'Y'}">
-											<!-- 주문 접수 -->
-											<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_10'}">
-												<p>주문이 완료되어 결제를 기다리고 있습니다.</p>
-
-												<!-- 예약 상품 -->
-												<p th:if="${!#strings.isEmpty(ordDtl.delvResDt)}" th:text="|예약판매 상품으로${ordDtl.delvResDt} 출고 예정입니다.|"></p>
-											</div>
-											
-											<!-- 상품준비중 -->
-											<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_30'}">
-												<p>배송할 상품을 준비 중입니다.</p>
-
-												<!-- 예약 상품 -->
-												<p th:if="${!#strings.isEmpty(ordDtl.delvResDt)}" th:text="|예약판매 상품으로${ordDtl.delvResDt} 출고 예정입니다.|"></p>
-											</div>
-											
-											<!-- 배송준비중 -->
-											<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_40'}">
-												<p>상품 준비가 완료되어 곧 배송될 예정입니다.</p>
-
-												<!-- 예약 상품 -->
-												<p th:if="${!#strings.isEmpty(ordDtl.delvResDt)}" th:text="|예약판매 상품으로${ordDtl.delvResDt} 출고 예정입니다.|"></p>
-											</div>
-											
-											<!-- 배송중, 배송완료 -->
-											<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_50' or ordDtl.ordDtlStat == 'G013_55' or ordDtl.ordDtlStat == 'G013_60'}">
-												<p th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'Y'}">해당 상품은 교환이 불가능한 상품입니다. 문의사항은 1:1문의를 이용해주세요.</p>
-												<p th:if="${ordDtl.changeableYn == 'Y' and ordDtl.returnableYn == 'N'}">해당 상품은 반품이 불가능한 상품입니다. 문의사항은 1:1문의를 이용해주세요.</p>
-												<p th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'N'}">해당 상품은 교환/반품이 불가능한 상품입니다. 문의사항은 1:1문의를 이용해주세요.</p>
-												<p th:if="${ordDtl.ordDtlStat == 'G013_60'}">15일 후 자동으로 구매확정됩니다.</p>
+												</div>
 											</div>
+											<!-- 선물 -->
+											<th:block th:if="${order.giftPackYn == 'Y'}">
+												<!-- 주소 입력 대기중 -->
+												<div class="order_text" th:if="${#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.giftLimitDay >= 0}">
+													<p th:text="|${ordDtl.recipNm}님이 주소를 입력하기 전입니다. (입력기한 ${ordDtl.giftLimitDt})|"></p>
+												</div>
+	
+												<!-- 선물 완료 -->
+												<div class="order_text" th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">
+													<p th:text="|${ordDtl.recipNm}님께 선물이 발송되었습니다.|"></p>
+												</div>
+	
+												<!-- 선물 취소 -->
+												<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_98' and ordDtl.ordDtlStat == 'G013_99'}">
+													<p th:text="|주소 입력 기한이 경과되어 선물이 취소 되었습니다.|"></p>
+												</div>
+											</th:block>
 											
-											<!-- 구매확정 -->
-											<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_70' and ordDtl.reviewableYn == 'Y' and ordDtl.reviewSq == null}">
-												<p>리뷰를 작성하면 다른 구매자에게 도움이 될 수 있습니다.</p>
-											</div>
-										</th:block>
+											<!-- 주문 -->
+											<th:block th:unless="${order.giftPackYn == 'Y'}">
+												<!-- 주문 접수 -->
+												<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_10'}">
+													<p>주문이 완료되어 결제를 기다리고 있습니다.</p>
+	
+													<!-- 예약 상품 -->
+													<p th:if="${!#strings.isEmpty(ordDtl.delvResDt)}" th:text="|예약판매 상품으로${ordDtl.delvResDt} 출고 예정입니다.|"></p>
+												</div>
+												
+												<!-- 상품준비중 -->
+												<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_30'}">
+													<p>배송할 상품을 준비 중입니다.</p>
+	
+													<!-- 예약 상품 -->
+													<p th:if="${!#strings.isEmpty(ordDtl.delvResDt)}" th:text="|예약판매 상품으로${ordDtl.delvResDt} 출고 예정입니다.|"></p>
+												</div>
+												
+												<!-- 배송준비중 -->
+												<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_40'}">
+													<p>상품 준비가 완료되어 곧 배송될 예정입니다.</p>
+	
+													<!-- 예약 상품 -->
+													<p th:if="${!#strings.isEmpty(ordDtl.delvResDt)}" th:text="|예약판매 상품으로${ordDtl.delvResDt} 출고 예정입니다.|"></p>
+												</div>
+												
+												<!-- 배송중, 배송완료 -->
+												<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_50' or ordDtl.ordDtlStat == 'G013_55' or ordDtl.ordDtlStat == 'G013_60'}">
+													<p th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'Y'}">해당 상품은 교환이 불가능한 상품입니다. 문의사항은 1:1문의를 이용해주세요.</p>
+													<p th:if="${ordDtl.changeableYn == 'Y' and ordDtl.returnableYn == 'N'}">해당 상품은 반품이 불가능한 상품입니다. 문의사항은 1:1문의를 이용해주세요.</p>
+													<p th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'N'}">해당 상품은 교환/반품이 불가능한 상품입니다. 문의사항은 1:1문의를 이용해주세요.</p>
+													<p th:if="${ordDtl.ordDtlStat == 'G013_60'}">15일 후 자동으로 구매확정됩니다.</p>
+												</div>
+												
+												<!-- 구매확정 -->
+												<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_70' and ordDtl.reviewableYn == 'Y' and ordDtl.reviewSq == null}">
+													<p>리뷰를 작성하면 다른 구매자에게 도움이 될 수 있습니다.</p>
+												</div>
+											</th:block>
+										</div>
+									</th:block>
+									<!-- //주문상품 -->
+								</div>
+								<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>
-								</th:block>
-								<!-- //주문상품 -->
-							</div>
-							<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>
-					<th:block th:if="${paymentInfo.payMeans == 'G014_20'}">
-						<h4 class="subH3">무통장 입금 정보</h4>
+						</th:block>
+						<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>
 								<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>
+								<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}" id="recipNm"></span>
+													</li>
+													<li>
+														<span th:text="${deliveryAddrInfo.recipPhnno}" id="recipPhnno"></span>
+													</li>
+													<li>
+														<span th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|" id="recipAddr"></span>
+														<button type="button" class="btn btn_default btn_sm" th:if="${allCanYn == 'Y'}" onclick="fnChangeDeliveryAddr()"><span>배송지 변경</span></button>
+													</li>
+													<li>
+														배송요청 사항&nbsp;:&nbsp;<span id="delvMemo" 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>
-					</th:block>
-					<h4 class="subH3">주문자/배송지 정보</h4>
-					<div class="tbl type1">
-						<table>
-							<colgroup>
-								<col width="210">
-								<col width="*">
-							</colgroup>
-							<tbody>
-								<tr>
-									<th>
-										주문 고객
-									</th>
+						<h4 class="subH3">결제정보</h4>
+						<div class="tbl type6">
+							<table>
+								<colgroup>
+									<col width="50%">
+									<col width="50%">
+								</colgroup>
+								<tbody><tr>
 									<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>
+										<dl>
+											<div>
+												<dt>총 주문금액 (상품금액+배송비+추가비용)</dt>
+												<dd>
+													<div class="price">
+														<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" th:if="${orderAmtInfo.cpn1DcAmt > 0}"> <!-- 할인항목 표기 class명 include_item -->
+												<dt>상품할인(즉시할인)</dt>
+												<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.cpn1DcAmt, 1, 'COMMA')}|"></em>원</dd>
+											</div>
+											<div class="include_item" th:if="${orderAmtInfo.tmtb1DcAmt + orderAmtInfo.tmtb2DcAmt > 0}">
+												<dt>다다익선 할인</dt>
+												<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.tmtb1DcAmt + orderAmtInfo.tmtb2DcAmt, 1, 'COMMA')}|"></em>원</dd>
+											</div>
+											<div class="include_item" th:if="${orderAmtInfo.cartCpnDcAmt + orderAmtInfo.goodsCpnDcAmt + orderAmtInfo.delvCpnDcAmt > 0}">
+												<dt>쿠폰할인</dt>
+												<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.cartCpnDcAmt + orderAmtInfo.goodsCpnDcAmt + orderAmtInfo.delvCpnDcAmt, 1, 'COMMA')}|"></em>원</dd>
+											</div>
+											<div class="include_item" th:if="${orderAmtInfo.prePntDcAmt > 0}">
+												<dt>선포인트 할인</dt>
+												<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.prePntDcAmt, 1, 'COMMA')}|"></em>원</dd>
+											</div>
+											<div class="include_item" th:if="${orderAmtInfo.pntDcAmt > 0}">
+												<dt>포인트 사용</dt>
+												<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.pntDcAmt, 1, 'COMMA')}|"></em>원</dd>
+											</div>
+											<div class="include_item" th:if="${orderAmtInfo.gfcdUseAmt > 0}">
+												<dt>상품권 사용</dt>
+												<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.gfcdUseAmt, 1, 'COMMA')}|"></em>원</dd>
+											</div>
+											<div class="include_item" th:if="${paymentInfo.npayPntAmt > 0}">
+												<dt>마일리지 사용</dt>
+												<dd><em th:text="|- ${#numbers.formatInteger(paymentInfo.npayPntAmt, 1, 'COMMA')}|"></em>원</dd>
+											</div>
+											<div class="include_item" th:if="${paymentInfo.pgCpnAmt > 0}">
+												<dt>제휴할인</dt>
+												<dd><em th:text="|- ${#numbers.formatInteger(paymentInfo.pgCpnAmt, 1, 'COMMA')}|"></em>원</dd>
+											</div>
+										</dl>
 									</td>
-								</tr>
-								<tr>
-									<th>
-										배송지 정보
-									</th>
 									<td>
-										<div class="block_line">
-											<ul>
-												<li>
-													<span th:text="${deliveryAddrInfo.recipNm}" id="recipNm"></span>
-												</li>
-												<li>
-													<span th:text="${deliveryAddrInfo.recipPhnno}" id="recipPhnno"></span>
-												</li>
-												<li>
-													<span th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|" id="recipAddr"></span>
-													<button type="button" class="btn btn_default btn_sm" th:if="${allCanYn == 'Y'}" onclick="fnChangeDeliveryAddr()"><span>배송지 변경</span></button>
-												</li>
-												<li>
-													배송요청 사항&nbsp;:&nbsp;<span id="delvMemo" th:text="${deliveryAddrInfo.delvMemo}"></span>
-													<button type="button" class="btn_underline" th:if="${allCanYn == 'Y'}" onclick="fnChangeDeliveryMemo()"><span>변경하기</span></button>
-												</li>
-											</ul>
-										</div>
+										<dl>
+											<div>
+												<dt>결제 금액</dt>
+												<dd>
+													<div class="price">
+														<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>
+												<!-- 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" 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 th:text="|${#numbers.formatInteger(orderAmtInfo.savePntAmt, 1, 'COMMA')}P|"></em></span>
+												</dd>
+											</div>
+										</dl>
 									</td>
 								</tr>
-							</tbody>
-						</table>
-					</div>
-					<h4 class="subH3">결제정보</h4>
-					<div class="tbl type6">
-						<table>
-							<colgroup>
-								<col width="50%">
-								<col width="50%">
-							</colgroup>
-							<tbody><tr>
-								<td>
-									<dl>
-										<div>
-											<dt>총 주문금액 (상품금액+배송비+추가비용)</dt>
-											<dd>
-												<div class="price">
-													<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" th:if="${orderAmtInfo.cpn1DcAmt > 0}"> <!-- 할인항목 표기 class명 include_item -->
-											<dt>상품할인(즉시할인)</dt>
-											<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.cpn1DcAmt, 1, 'COMMA')}|"></em>원</dd>
-										</div>
-										<div class="include_item" th:if="${orderAmtInfo.tmtb1DcAmt + orderAmtInfo.tmtb2DcAmt > 0}">
-											<dt>다다익선 할인</dt>
-											<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.tmtb1DcAmt + orderAmtInfo.tmtb2DcAmt, 1, 'COMMA')}|"></em>원</dd>
-										</div>
-										<div class="include_item" th:if="${orderAmtInfo.cartCpnDcAmt + orderAmtInfo.goodsCpnDcAmt + orderAmtInfo.delvCpnDcAmt > 0}">
-											<dt>쿠폰할인</dt>
-											<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.cartCpnDcAmt + orderAmtInfo.goodsCpnDcAmt + orderAmtInfo.delvCpnDcAmt, 1, 'COMMA')}|"></em>원</dd>
-										</div>
-										<div class="include_item" th:if="${orderAmtInfo.prePntDcAmt > 0}">
-											<dt>선포인트 할인</dt>
-											<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.prePntDcAmt, 1, 'COMMA')}|"></em>원</dd>
-										</div>
-										<div class="include_item" th:if="${orderAmtInfo.pntDcAmt > 0}">
-											<dt>포인트 사용</dt>
-											<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.pntDcAmt, 1, 'COMMA')}|"></em>원</dd>
-										</div>
-										<div class="include_item" th:if="${orderAmtInfo.gfcdUseAmt > 0}">
-											<dt>상품권 사용</dt>
-											<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.gfcdUseAmt, 1, 'COMMA')}|"></em>원</dd>
-										</div>
-										<div class="include_item" th:if="${paymentInfo.npayPntAmt > 0}">
-											<dt>마일리지 사용</dt>
-											<dd><em th:text="|- ${#numbers.formatInteger(paymentInfo.npayPntAmt, 1, 'COMMA')}|"></em>원</dd>
-										</div>
-										<div class="include_item" th:if="${paymentInfo.pgCpnAmt > 0}">
-											<dt>제휴할인</dt>
-											<dd><em th:text="|- ${#numbers.formatInteger(paymentInfo.pgCpnAmt, 1, 'COMMA')}|"></em>원</dd>
-										</div>
-									</dl>
-								</td>
-								<td>
-									<dl>
-										<div>
-											<dt>결제 금액</dt>
-											<dd>
-												<div class="price">
-													<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>
-											<!-- 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" 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 th:text="|${#numbers.formatInteger(orderAmtInfo.savePntAmt, 1, 'COMMA')}P|"></em></span>
-											</dd>
-										</div>
-									</dl>
-								</td>
-							</tr>
-							</tbody></table>
-					</div>
-					<div class="btn_footer_area">
-						<button type="button" class="btn btn_dark btn_md"><span>확인</span></button>
+								</tbody></table>
+						</div>
+						<div class="btn_footer_area">
+							<button type="button" class="btn btn_dark btn_md"><span>확인</span></button>
+						</div>
 					</div>
-				</div>
+				</form>
 			</div>
 			<form id="exchangeForm" name="exchangeForm" th:action="@{'/mypage/exchange/form'}" th:method="post">
 				<input type="hidden" name="ordNo"/>
@@ -442,6 +444,16 @@
 			</form>
 			<!-- // CONT-BODY -->
 		</div>
+
+		<!-- 환불계좌 등록 팝업 -->
+		<div class="modal fade refund_pop" id="refundPop" tabindex="-1" role="dialog" aria-labelledby="refundLabel" aria-hidden="true">
+			<div class="modal-dialog" role="document">
+				<div class="modal-content"></div>
+			</div>
+			<a href="#close-modal" rel="modal:close" id="refundPop_close" class="close-modal">Close</a>
+			<a href="#close-modal" rel="modal:close" class="close-modal ">Close</a>
+		</div>
+		<!-- //환불계좌 등록 팝업 -->
 	</div>
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
@@ -465,17 +477,37 @@
 	// 전체취소 버튼 클릭 이벤트
 	var fnAllCancel = function() {
 		// 환불계좌 체크
-		let accountNo = $('input[name=accountNo]').val();
-		let accountNm = $('input[name=accountNm]').val();
-		let bankCd = $('input[name=bankCd]').val();
+		let accountNo = $('#orderDetailForm input[name=accountNo]').val();
+		let accountNm = $('#orderDetailForm input[name=accountNm]').val();
+		let bankCd = $('#orderDetailForm input[name=bankCd]').val();
 
-		if (paymentInfo.payMeans == 'G014_20' && paymentInfo.payStat == 'G016_00' && (gagajf.isNull(accountNo) || gagajf.isNull(accountNm) || gagajf.isNull(bankCd))) {
-			// TODO
-			// 환불계좌 등록 팝업
+		if (paymentInfo.payMeans == 'G014_20' && paymentInfo.payStat == 'G016_30' && (gagajf.isNull(accountNo) || gagajf.isNull(accountNm) || gagajf.isNull(bankCd))) {
+			let data = {};
+			data.ordNo = oneData.ordNo;
+			data.accountNm = oneData.accountNm;
+			
+			let jsonData = JSON.stringify(data);
+			
+			$.ajax( {
+				type		: "POST",
+				url 		: '/mypage/refund/account/register/popup/form',
+				data		: jsonData,
+				dataType 	: 'html',
+				beforeSend : function(xhr, settings) {
+					xhr.setRequestHeader("AJAX"			, "true");
+					xhr.setRequestHeader('Accept'		, 'application/json');
+					xhr.setRequestHeader('Content-Type'	, 'application/json');
+					gagajf.showProgressbar(true);
+				},
+				success 	: function(result) {
+					$("#refundPop .modal-dialog .modal-content").html(result);
+					$("#refundPop").modal("show");
+				}
+			});
 			
 			return false;
 		}
-		
+
 		mcxDialog.confirm('전체취소 처리하시겠습니까?', {
 			cancelBtnText: "취소",
 			sureBtnText: "확인",
@@ -485,13 +517,13 @@
 				
 				// 주문상세번호 설정
 				let ordDtlNoArr = [];
-				$.each($('input[name=ordDtlNoArr]'), function(idx, item) {
+				$.each($('#orderDetailForm input[name=ordDtlNoArr]'), function(idx, item) {
 					ordDtlNoArr.push($(item).val());
 				});
 				
 				// 취소 수량 설정
 				let cnclRtnReqQtyArr = [];
-				$.each($('input[name=cnclRtnReqQtyArr]'), function(idx, item) {
+				$.each($('#orderDetailForm input[name=cnclRtnReqQtyArr]'), function(idx, item) {
 					cnclRtnReqQtyArr.push($(item).val());
 				});
 				
@@ -563,6 +595,17 @@
 
 		$("#delvMemo").text(delvMemo);
 	}
+
+	// 환불계좌 등록 콜백 처리
+	var fnRegisterAccountCallback = function(result) {
+		// 환불계좌 정보 설정
+		$('#orderDetailForm input[name=accountNo]').val(result.accountNo);
+		$('#orderDetailForm input[name=accountNm]').val(result.accountNm);
+		$('#orderDetailForm input[name=bankCd]').val(result.bankCd);
+		
+		// 반품처리
+		fnReturn();
+	}
 </script>
 
 </th:block>

+ 1 - 1
src/main/webapp/WEB-INF/views/web/mypage/MypageOrderListFormWeb.html

@@ -227,7 +227,7 @@
 
 		// 셀렉트박스 활성화
 		$('.select_custom.order_status').each(function(index) {
-			var selecter01 = new sCombo($(this));
+			new sCombo($(this));
 		});
 
 		// 주문 검색 기간 설정

+ 32 - 28
src/main/webapp/WEB-INF/views/web/mypage/MypageReturnFormWeb.html

@@ -194,7 +194,7 @@
 											<th>주소</th>
 											<td id="chgerAddr">
 												<th:block th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|"></th:block>
-												<button type="button" class="btn btn_default btn_sm" onclick="fnChangeDeliveryAddr('chger');"><span>회수지 변경</span></button>
+												<button type="button" class="btn btn_default btn_sm" onclick="fnChangeDeliveryAddr();"><span>회수지 변경</span></button>
 											</td>
 											<input type="hidden" name="chgerZipcode" th:value="${deliveryAddrInfo.chgerZipcode}">
 											<input type="hidden" name="chgerBaseAddr" th:value="${deliveryAddrInfo.recipBaseAddr}">
@@ -348,7 +348,7 @@
 	let usedPointInfo = [[${usedPointInfo}]];
 	let isCustomer = true;
 	let jsonObj = {};
-	let addPayCost = 0;
+	//let addPayCost = 0;
 
 	$(document).ready(function() {
 		// 마이페이지 LNB 설정
@@ -375,15 +375,15 @@
 		let url = '/mypage/return';
 
 		// 반품 사유 체크
-		let chgReason = $('input[name=chgReason]').val();
+		let chgReason = $('#returnForm input[name=chgReason]').val();
 		if (gagajf.isNull(chgReason)) {
 			mcxDialog.alert('반품사유를 선택해주세요.');
 			return false;
 		}
 
 		// 반송 송장번호 체크
-		let wdGb = $('input[name=wdGb]:radio:checked').val();
-		let wdInvoiceNo = $('input[name=chgReason]').val();
+		let wdGb = $('#returnForm input[name=wdGb]:radio:checked').val();
+		let wdInvoiceNo = $('#returnForm input[name=chgReason]').val();
 		if (wdGb == 'D' && gagajf.isNull(wdInvoiceNo)) {
 			mcxDialog.alert('직접 반송하신 송장번호를 입력해주세요.');
 			return false;
@@ -393,7 +393,7 @@
 		let ordDtlNoArr = [];
 		let cnclRtnReqQtyArr = [];
 		let chkQty = 0;
-		$.each($('input[name=chgQty]'), function(idx, item) {
+		$.each($('#returnForm input[name=chgQty]'), function(idx, item) {
 			let chgQty = $(item).val();
 			let ordDtlNo = $(item).attr('ordDtlNo');
 			
@@ -441,6 +441,7 @@
 		}
 
 		// 추가배송비 PG 처리
+		let addPayCost = $('#returnForm input[name=addPayCost]').val();
 		if (addPayCost > 0) {
 			// TODO
 			// 추가배송비 PG 처리
@@ -450,18 +451,18 @@
 		data.ordNo = oneData.ordNo;
 		data.ordChgSq = 0;
 		data.chgReason = chgReason;
-		data.chgMemo = $('input[name=chgMemo]').val();
-		data.accountNo = $('input[name=accountNo]').val();
-		data.accountNm = $('input[name=accountNm]').val();
-		data.bankCd = $('input[name=bankCd]').val();
+		data.chgMemo = $('#returnForm input[name=chgMemo]').val();
+		data.accountNo = $('#returnForm input[name=accountNo]').val();
+		data.accountNm = $('#returnForm input[name=accountNm]').val();
+		data.bankCd = $('#returnForm input[name=bankCd]').val();
 		data.isCustomer = isCustomer;
 		data.wdGb = wdGb;
 		data.chgerNm = $('#chgerNm').text();
-		data.chgerZipcode = $('input[name=chgerZipcode]').val();
-		data.chgerBaseAddr = $('input[name=chgerBaseAddr]').val();
-		data.chgerDtlAddr = $('input[name=chgerDtlAddr]').val();
-		data.chgerPhnno = $('input[name=chgerPhnno]').val();
-		data.chgerRtnMemo = $('input[name=chgerRtnMemo]').val();
+		data.chgerZipcode = $('#returnForm input[name=chgerZipcode]').val();
+		data.chgerBaseAddr = $('#returnForm input[name=chgerBaseAddr]').val();
+		data.chgerDtlAddr = $('#returnForm input[name=chgerDtlAddr]').val();
+		data.chgerPhnno = $('#returnForm input[name=chgerPhnno]').val();
+		data.chgerRtnMemo = $('#returnForm input[name=chgerRtnMemo]').val();
 		data.ordDtlNoArr = ordDtlNoArr;
 		data.cnclRtnReqQtyArr = cnclRtnReqQtyArr;
 
@@ -480,14 +481,14 @@
 			$(param).parent().parent().find('input[name=chgQty]').val($(param).attr('qty'));
 		}
 
-		let chgReason = $('input[name=chgReason]').val();
+		let chgReason = $('#returnForm input[name=chgReason]').val();
 
 		if (!gagajf.isNull(chgReason)) {
 			// 반품 수량 설정
 			let cnclRtnReqQtyArr = [];
 			let ordDtlNoArr = [];
 			let ordCanChgQtyArr = [];
-			$.each($('input[name=chgQty]'), function(idx, item) {
+			$.each($('#returnForm input[name=chgQty]'), function(idx, item) {
 				let chgQty = $(item).val();
 				let ordDtlNo = $(item).attr('ordDtlNo');
 				let ordCanChgQty = $(item).attr('ordCanChgQty');
@@ -520,7 +521,7 @@
 
 				// 반품 사유 및 반품 방식 배송비 계산
 				if (result.spanRealCnclRtnAmt > 0) {
-					let wdGb = $('input[name=wdGb]:radio:checked').val();
+					let wdGb = $('#returnForm input[name=wdGb]:radio:checked').val();
 
 					// 회사사유 : 추가배송비 0, 반품배송비 0
 					if (!isCustomer) {
@@ -546,9 +547,12 @@
 					refundPayAmt = spanRefundAmt;
 					$('#addDeliveryFee').css('display', '');
 					$('#addPayCost').text(addDelvFee.addComma() + '원');
-					addPayCost = addDelvFee;
+					$('#returnForm input[name=addPayCost]').val(addDelvFee);
+					//addPayCost = addDelvFee;
 				} else {
-					addPayCost = 0;
+					$('#addDeliveryFee').css('display', 'none');
+					$('#returnForm input[name=addPayCost]').val(0);
+					//addPayCost = 0;
 				}
 
 				// 금액 설정
@@ -564,8 +568,8 @@
 	}
 
 	// 반품 방식 변경 이벤트
-	$('input[name=wdGb]').on('change', function() {
-		let wdGb = $('input[name=wdGb]:radio:checked').val();
+	$('#returnForm input[name=wdGb]').on('change', function() {
+		let wdGb = $('i#returnForm nput[name=wdGb]:radio:checked').val();
 
 		if (wdGb == 'W') {
 			$('#chgerLocation').css('display', '');
@@ -645,13 +649,13 @@
 		let chgerDtlAddr = delvObj.recipDtlAddr;
 		let delvMemo = delvObj.delvMemo;
 		let chgerAddr = chgerBaseAddr + ' ' + chgerDtlAddr + '\n';
-		chgerAddr += '<button type="button" class="btn btn_default btn_sm" onclick="fnChangeDeliveryAddr(\'chger\');"><span>회수지 변경</span></button>';
+		chgerAddr += '<button type="button" class="btn btn_default btn_sm" onclick="fnChangeDeliveryAddr();"><span>회수지 변경</span></button>';
 
-		$('input[name=chgerNm]').val(chgerNm);
-		$('input[name=chgerPhnno]').val(chgerPhnno);
-		$('input[name=chgerZipcode]').val(chgerZipcode);
-		$('input[name=chgerBaseAddr]').val(chgerBaseAddr);
-		$('input[name=chgerDtlAddr]').val(chgerDtlAddr);
+		$('#returnForm input[name=chgerNm]').val(chgerNm);
+		$('#returnForm input[name=chgerPhnno]').val(chgerPhnno);
+		$('#returnForm input[name=chgerZipcode]').val(chgerZipcode);
+		$('#returnForm input[name=chgerBaseAddr]').val(chgerBaseAddr);
+		$('#returnForm input[name=chgerDtlAddr]').val(chgerDtlAddr);
 		
 		$('#chgerNm').text(chgerNm);
 		$('#chgerPhnno').text(chgerPhnno);