마이페이지 부분취소 임시 커밋

src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -582,12 +582,6 @@ public class TsfMypageController extends TsfBaseController {
 		mav.addObject("returnList", map);
 		mav.addObject("oneData", oneData);
 
-		// 사용 상품권 정보 조회
-		mav.addObject("usedGiftCardInfo", orderChangeService.getUsedGiftcardInfo(oneData));
-
-		// 사용 포인트 정보 조회
-		mav.addObject("usedPointInfo", orderChangeService.getUsedPointInfo(oneData));
-
 		// 주문 결제정보 조회
 		mav.addObject("paymentInfo", orderService.getPaymentInfoForMypage(order));
 
@@ -691,12 +685,6 @@ public class TsfMypageController extends TsfBaseController {
 		mav.addObject("cancelList", map);
 		mav.addObject("oneData", oneData);
 
-		// 사용 상품권 정보 조회
-		mav.addObject("usedGiftCardInfo", orderChangeService.getUsedGiftcardInfo(oneData));
-
-		// 사용 포인트 정보 조회
-		mav.addObject("usedPointInfo", orderChangeService.getUsedPointInfo(oneData));
-
 		// 주문 결제정보 조회
 		mav.addObject("paymentInfo", orderService.getPaymentInfoForMypage(order));
 
@@ -736,7 +724,7 @@ public class TsfMypageController extends TsfBaseController {
 		List<Order> cnclReqList = (List<Order>)refundPreInfo.get("cnclReqList");
 		String allCanYn = refundPreInfo.getString("allCanYn");
 		String allLastCanYn = refundPreInfo.getString("allLastCanYn");
-		String allCanYnBeforePayment = refundPreInfo.getString("allCanYnBeforePayment");
+		// String allCanYnBeforePayment = refundPreInfo.getString("allCanYnBeforePayment");
 
 		// 전체취소, 부분취소 구분 처리 진행 
 		if ("Y".equals(allCanYn)) {
@@ -753,7 +741,7 @@ public class TsfMypageController extends TsfBaseController {
 
 			// 4. 주문변경 기본정보 설정
 			result.setInt("ordNo", orderChange.getOrdNo());						// 주문번호
-			result.setInt("ordChgSq", orderChange.getOrdChgSq());				// 주문변경번호
+			// result.setInt("ordChgSq", orderChange.getOrdChgSq());				// 주문변경번호
 			result.setString("chgReason", orderChange.getChgReason());			// 변경사유
 			result.setString("chgMemo", orderChange.getChgMemo());				// 변경메모
 
@@ -761,10 +749,10 @@ public class TsfMypageController extends TsfBaseController {
 			result.setString("accountNm", orderChange.getAccountNm());			// 환불계좌예금주명
 			result.setString("bankCd", orderChange.getBankCd());				// 환불계좌은행코드
 
-			result.setString("allCanYnBeforePayment", allCanYnBeforePayment);	// 무통장입금전 전체취소 여부
-			result.setString("allCanYn", allCanYn);								// 전체취소 여부
+			// result.setString("allCanYnBeforePayment", allCanYnBeforePayment);	// 무통장입금전 전체취소 여부
+			// result.setString("allCanYn", allCanYn);								// 전체취소 여부
 			result.setString("allLastCanYn", allLastCanYn);						// 전체 마지막 취소 여부
-			result.setString("isCustomer", orderChange.getIsCustomer());		// 변경사유 (고객, 회사)
+			// result.setString("isCustomer", orderChange.getIsCustomer());		// 변경사유 (고객, 회사)
 
 			// 5. 주문변경 회수지정보 추가
 			// result.setString("chgerNm", orderChange.getChgerNm());				// 변경자명
@@ -772,7 +760,7 @@ public class TsfMypageController extends TsfBaseController {
 			// result.setString("chgerPhnno", orderChange.getChgerPhnno());			// 변경자핸드폰번호
 			// result.setString("chgerTelno", orderChange.getChgerTelno());			// 변경자전화번호
 
-			result.setString("reqGbn", orderChange.getReqGbn());				// 신청구분
+			// result.setString("reqGbn", orderChange.getReqGbn());				// 신청구분
 			result.setString("ipAddress", TsfSession.getIpAddress());			// IP주소
 			result.setInt("custNo", custNo);									// 고객번호
 			result.setString("pgTid", refundPreInfo.getString("pgTid"));		// PG거래ID
@@ -780,7 +768,8 @@ public class TsfMypageController extends TsfBaseController {
 			result.setString("pgGb", refundPreInfo.getString("pgGb"));			// PG구분
 
 			// 6. 주문변경 DB 등록 (TB_ORDER_CHANGE, TB_ORDER_CHANGE_DETAIL)
-			coreOrderChangeService.cnclComplete(result, custNo);
+			// coreOrderChangeService.cnclComplete(result, custNo);
+			coreOrderChangeService.partialCancel(result);
 		}
 
 		result.set("status", GagaResponseStatus.SUCCESS.getCode());

src/main/java/com/style24/persistence/mybatis/shop/TsfOrderChange.xml

@@ -136,6 +136,9 @@
 		           AND O.ORD_NM = #{orderNm}
 			</otherwise>
 		</choose>
+		<if test="supplyCompCd != null and supplyCompCd != ''">
+		           AND OD.DELV_FEE_CD = #{delvFeeCd}
+		</if>
 		           AND O.DISP_YN = 'Y'
 		           AND OD.ORD_QTY - OD.CNCL_RTN_QTY > 0
 		       ) Z
@@ -280,7 +283,7 @@
 		           AND O.ORD_NO = #{ordNo}
 		</if>
 		<if test="supplyCompCd != null and supplyCompCd != ''">
-		           AND OD.SUPPLY_COMP_CD = #{supplyCompCd}
+		           AND OD.DELV_FEE_CD = #{delvFeeCd}
 		</if>
 		       ) Z
 		 GROUP BY Z.ORD_NO, Z.ORD_DT, Z.GIFT_ADDR_INP_YN, Z.ORD_DTL_NO, Z.ORD_EXCH_GB, Z.GOODS_CD, Z.GOODS_NM, Z.LIST_PRICE, Z.SYS_IMG_NM
@@ -330,6 +333,7 @@
 		     , 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.PG_GB
 		     , P.PG_TID
 		     , P.PAY_MEANS
 		     , P.PAY_STAT
@@ -835,8 +839,8 @@
 		             , ODI.ORD_DTL_ITEM_SQ
 		             , ODI.OPT_CD1
 		             , ODI.OPT_CD2
-		             , ((ODH.ORD_AMT - ODH.CPN1_DC_AMT) * (OCD.CHG_QTY / ODH.ORD_QTY)) AS PRICE_ORG
-		             , ((ODH.REAL_ORD_AMT + ODH.PNT_DC_AMT + ODH.GFCD_USE_AMT) * (OCD.CHG_QTY / OD.ORD_QTY)) AS PRICE_SALE
+		             , ROUND((ODH.ORD_AMT - ODH.CPN1_DC_AMT) * (OCD.CHG_QTY / ODH.ORD_QTY)) AS PRICE_ORG
+		             , ROUND((ODH.REAL_ORD_AMT + ODH.PNT_DC_AMT + ODH.GFCD_USE_AMT) * (OCD.CHG_QTY / OD.ORD_QTY)) AS PRICE_SALE
 		             , OC.ADD_PAY_COST
 		             , CASE WHEN G1.GOODS_TYPE != 'G056_S' AND G1.SELF_GOODS_YN = 'Y' THEN (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G1.GOODS_CD AND COLOR_CD = ODI.OPT_CD1 AND DEFAULT_IMG_YN = 'Y')
 		                    ELSE (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G1.GOODS_CD AND COLOR_CD = IFNULL(G1.MAIN_COLOR_CD,'XX') AND DEFAULT_IMG_YN = 'Y') END AS SYS_IMG_NM

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

@@ -214,8 +214,6 @@
 	let cancelList = [[${cancelList}]];
 	let oneData = [[${oneData}]];
 	let paymentInfo = [[${paymentInfo}]];
-	let usedGiftCardInfo = [[${usedGiftCardInfo}]];
-	let usedPointInfo = [[${usedPointInfo}]];
 	let addPayCost = 0;
 
 	$(document).ready(function() {
@@ -348,8 +346,8 @@
 
 		gagajf.ajaxJsonSubmit(url, jsonData, function (result) {
 			// 환불포인트, 환불상품권 금액 계산
-			let refundPoint = fnCalculatePoint(cnclRtnReqQtyArr, ordDtlNoArr, ordCanChgQtyArr);
-			let refundGiftCard = fnCalculateGiftCard(cnclRtnReqQtyArr, ordDtlNoArr, ordCanChgQtyArr);
+			let refundPoint = Number(result.spanPntDcAmt);
+			let refundGiftCard = Number(result.spanGfcdUseAmt);
 
 			let spanCnclRtnAmt = Number(result.spanCnclRtnAmt);
 			let sumDeliveryFee = Number(result.sumDeliveryFee);
@@ -386,48 +384,6 @@
 		});
 	}
 
-	// 환불 포인트 계산
-	var fnCalculatePoint = function(chgQtyArr, ordDtlNoArr, ordCanChgQtyArr) {
-		let refundPoint = 0;
-
-		$.each(usedPointInfo, function(idx, item) {
-			let index = ordDtlNoArr.indexOf(item.ordDtlNo);
-			let chgQty = chgQtyArr[index];
-			let ordCanChgQty = ordCanChgQtyArr[index];
-
-			if (chgQty > 0) {
-				if (chgQty == ordCanChgQty) {
-					refundPoint += item.pntAmt;
-				} else {
-					refundPoint += item.pntAmt * (chgQty / ordCanChgQty);
-				}
-			}
-		});
-
-		return refundPoint;
-	}
-	
-	// 환불 상품권 계산
-	var fnCalculateGiftCard = function(chgQtyArr, ordDtlNoArr, ordCanChgQtyArr) {
-		let refundGiftCard = 0;
-
-		$.each(usedGiftCardInfo, function(idx, item) {
-			let index = ordDtlNoArr.indexOf(item.ordDtlNo);
-			let chgQty = chgQtyArr[index];
-			let ordCanChgQty = ordCanChgQtyArr[index];
-
-			if (chgQty > 0) {
-				if (chgQty == ordCanChgQty) {
-					refundGiftCard += item.gfcdAmt;
-				} else {
-					refundGiftCard += item.pntAmt * (chgQty / ordCanChgQty);
-				}
-			}
-		});
-
-		return refundGiftCard;
-	}
-
 	// 환불계좌 등록 콜백 처리
 	var fnRegisterAccountCallback = function(result) {
 		// 환불계좌 정보 설정

src/main/webapp/WEB-INF/views/web/mypage/MypageCreListFormWeb.html

@@ -39,7 +39,7 @@
 								<li>
 									<div>
 										<p class="txt">주문접수</p>
-										<p class="count"><span id="orderReceiptCount" th:text="${orderCount.orderReceiptCount}">0</span></p>
+										<p class="count"><span id="orderReceiptCount" th:text="${orderCount.depositWaitingCount}">0</span></p>
 									</div>
 								</li>
 								<li>
@@ -76,7 +76,7 @@
 						</div>
 						<div class="invalid">
 							<p class="txt">취소/교환/반품</p>
-							<p class="count"><span id="orderCreCount" th:text="${orderCount.cancelCount + orderCount.returnCount + orderCount.exchangeCount}">0</span></p>
+							<p class="count"><span id="orderCreCount" th:text="${orderCount.cancelCount + orderCount.returnCount + orderCount.exchangeCount + orderCount.confirmCount}">0</span></p>
 						</div>
 					</div>
 					<!-- //주문 현황 -->

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

@@ -116,7 +116,7 @@
 
 														<!-- 주문취소 버튼(입금대기, 결제완료, 상품준비중, 출고처지정, 배송준비중) -->
 														<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>
+															<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'cancel');"><span>주문 취소</span></button></p>
 														</th:block>
 														
 														<!-- 리뷰 쓰기 버튼 -->
@@ -133,26 +133,26 @@
 													<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>
+															<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'cancel');"><span>주문 취소</span></button></p>
 														</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>
+																<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}" 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}, delvFeeCd=${ordDtl.delvFeeCd}" 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>
+																<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}" 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" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}" 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>
 	
@@ -468,16 +468,17 @@
 			<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"/>
+				<input type="hidden" name="delvFeeCd"/>
 			</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"/>
+				<input type="hidden" name="delvFeeCd"/>
 			</form>
 			<form id="cancelForm" name="cancelForm" th:action="@{'/mypage/cancel/form'}" th:method="post">
 				<input type="hidden" name="ordNo"/>
 				<input type="hidden" name="ordDtlNo"/>
+				<input type="hidden" name="delvFeeCd"/>
 			</form>
 			<!-- // CONT-BODY -->
 		</div>

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

@@ -74,7 +74,7 @@
 								<li>
 									<div>
 										<p class="txt">주문접수</p>
-										<p class="count"><span id="orderReceiptCount" th:text="${orderCount.orderReceiptCount}">0</span></p>
+										<p class="count"><span id="orderReceiptCount" th:text="${orderCount.depositWaitingCount}">0</span></p>
 									</div>
 								</li>
 								<li>
@@ -111,7 +111,7 @@
 						</div>
 						<div class="invalid">
 							<p class="txt">취소/교환/반품</p>
-							<p class="count"><span id="orderCreCount" th:text="${orderCount.cancelCount + orderCount.returnCount + orderCount.exchangeCount}">0</span></p>
+							<p class="count"><span id="orderCreCount" th:text="${orderCount.cancelCount + orderCount.returnCount + orderCount.exchangeCount + orderCount.confirmCount}">0</span></p>
 						</div>
 					</div>
 				</div>
@@ -189,16 +189,17 @@
 				<form id="exchangeForm" name="exchangeForm" action="#" th:action="@{'/mypage/exchange/form'}" th:method="post">
 					<input type="hidden" name="ordNo"/>
 					<input type="hidden" name="ordDtlNo"/>
-					<input type="hidden" name="supplyCompCd"/>
+					<input type="hidden" name="delvFeeCd"/>
 				</form>
 				<form id="returnForm" name="returnForm" action="#" th:action="@{'/mypage/return/form'}" th:method="post">
 					<input type="hidden" name="ordNo"/>
 					<input type="hidden" name="ordDtlNo"/>
-					<input type="hidden" name="supplyCompCd"/>
+					<input type="hidden" name="delvFeeCd"/>
 				</form>
 				<form id="cancelForm" name="cancelForm" th:action="@{'/mypage/cancel/form'}" th:method="post">
 					<input type="hidden" name="ordNo"/>
 					<input type="hidden" name="ordDtlNo"/>
+					<input type="hidden" name="delvFeeCd"/>
 				</form>
 			</div>
 			<!-- // CONT-BODY -->
@@ -447,7 +448,7 @@
 
 						// 주문취소 버튼(입금대기, 결제완료, 상품준비중, 출고처지정, 배송준비중)
 						if (ordDtl.ordDtlStat == 'G013_10' || ordDtl.ordDtlStat == 'G013_20' || ordDtl.ordDtlStat == 'G013_30' || ordDtl.ordDtlStat == 'G013_35' || ordDtl.ordDtlStat == 'G013_40') {
-							tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" onclick="fnCreateChange(this, \'cancel\');"><span>주문 취소</span></button></p>\n';
+							tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" delvFeeCd="' + ordDtl.delvFeeCd + '" onclick="fnCreateChange(this, \'cancel\');"><span>주문 취소</span></button></p>\n';
 						}
 
 						// 리뷰 쓰기 버튼
@@ -462,24 +463,24 @@
 					} else {
 						// 주문취소 버튼(입금대기, 결제완료, 상품준비중, 출고처지정, 배송준비중)
 						if (ordDtl.ordDtlStat == 'G013_10' || ordDtl.ordDtlStat == 'G013_20' || ordDtl.ordDtlStat == 'G013_30' || ordDtl.ordDtlStat == 'G013_35' || ordDtl.ordDtlStat == 'G013_40') {
-							tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" onclick="fnCreateChange(this, \'cancel\');"><span>주문 취소</span></button></p>\n';
+							tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" delvFeeCd="' + ordDtl.delvFeeCd + '" onclick="fnCreateChange(this, \'cancel\');"><span>주문 취소</span></button></p>\n';
 						}
 
 						// 교환신청 버튼(배송중, 출고완료, 배송완료)
 						if (ordDtl.ordDtlStat == 'G013_50' || ordDtl.ordDtlStat == 'G013_55' || ordDtl.ordDtlStat == 'G013_60') {
 							// 교환/반품 가능한 상품
 							if (ordDtl.changeableYn == 'Y' && ordDtl.returnableYn == 'Y') {
-								tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" supplyCompCd="' + ordDtl.supplyCompCd + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" onclick="fnCreateChange(this, \'exchange\');"><span>교환 신청</span></button></p>\n';
-								tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" supplyCompCd="' + ordDtl.supplyCompCd + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" onclick="fnCreateChange(this, \'return\');"><span>반품 신청</span></button></p>\n';
+								tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" delvFeeCd="' + ordDtl.delvFeeCd + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" onclick="fnCreateChange(this, \'exchange\');"><span>교환 신청</span></button></p>\n';
+								tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" delvFeeCd="' + ordDtl.delvFeeCd + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" onclick="fnCreateChange(this, \'return\');"><span>반품 신청</span></button></p>\n';
 							}
 							// 교환 신청 불가 상품
 							else if (ordDtl.changeableYn == 'N' && ordDtl.returnableYn == 'Y') {
 								tag += '											<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></p>\n';
-								tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" supplyCompCd="' + ordDtl.supplyCompCd + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" onclick="fnCreateChange(this, \'return\');"><span>반품 신청</span></button></p>\n';
+								tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" delvFeeCd="' + ordDtl.delvFeeCd + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" onclick="fnCreateChange(this, \'return\');"><span>반품 신청</span></button></p>\n';
 							}
 							// 반품 신청 불가 상품
 							else if (ordDtl.changeableYn == 'Y' && ordDtl.returnableYn == 'N') {
-								tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" supplyCompCd="' + ordDtl.supplyCompCd + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" onclick="fnCreateChange(this, \'exchange\');"><span>교환 신청</span></button></p>\n';
+								tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" delvFeeCd="' + ordDtl.delvFeeCd + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" onclick="fnCreateChange(this, \'exchange\');"><span>교환 신청</span></button></p>\n';
 								tag += '											<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></p>\n';
 							}
 							// 교환/반품 신청 불가 상품

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

@@ -344,8 +344,6 @@
 	let returnList = [[${returnList.returnList}]];
 	let oneData = [[${oneData}]];
 	let paymentInfo = [[${paymentInfo}]];
-	let usedGiftCardInfo = [[${usedGiftCardInfo}]];
-	let usedPointInfo = [[${usedPointInfo}]];
 	let isCustomer = true;
 	let jsonObj = {};
 	//let addPayCost = 0;
@@ -500,8 +498,8 @@
 
 			gagajf.ajaxJsonSubmit(url, jsonData, function (result) {
 				// 환불포인트, 환불상품권 금액 계산
-				let refundPoint = fnCalculatePoint(cnclRtnReqQtyArr, ordDtlNoArr, ordCanChgQtyArr);
-				let refundGiftCard = fnCalculateGiftCard(cnclRtnReqQtyArr, ordDtlNoArr, ordCanChgQtyArr);
+				let refundPoint = Number(result.spanPntDcAmt);
+				let refundGiftCard = Number(result.spanGfcdUseAmt);
 
 				let spanCnclRtnAmt = Number(result.spanCnclRtnAmt);
 				let sumDeliveryFee = Number(result.sumDeliveryFee);
@@ -589,48 +587,6 @@
 		fnChangeReturnQty();
 	}
 
-	// 환불 포인트 계산
-	var fnCalculatePoint = function(chgQtyArr, ordDtlNoArr, ordCanChgQtyArr) {
-		let refundPoint = 0;
-
-		$.each(usedPointInfo, function(idx, item) {
-			let index = ordDtlNoArr.indexOf(item.ordDtlNo);
-			let chgQty = chgQtyArr[index];
-			let ordCanChgQty = ordCanChgQtyArr[index];
-			
-			if (chgQty > 0) {
-				if (chgQty == ordCanChgQty) {
-					refundPoint += item.pntAmt;
-				} else {
-					refundPoint += item.pntAmt * (chgQty / ordCanChgQty);
-				}
-			}
-		});
-
-		return refundPoint;
-	}
-
-	// 환불 상품권 계산
-	var fnCalculateGiftCard = function(chgQtyArr, ordDtlNoArr, ordCanChgQtyArr) {
-		let refundGiftCard = 0;
-
-		$.each(usedGiftCardInfo, function(idx, item) {
-			let index = ordDtlNoArr.indexOf(item.ordDtlNo);
-			let chgQty = chgQtyArr[index];
-			let ordCanChgQty = ordCanChgQtyArr[index];
-
-			if (chgQty > 0) {
-				if (chgQty == ordCanChgQty) {
-					refundGiftCard += item.gfcdAmt;
-				} else {
-					refundGiftCard += item.pntAmt * (chgQty / ordCanChgQty);
-				}
-			}
-		});
-
-		return refundGiftCard;
-	}
-
 	// 회수지 정보 설정
 	var delvAddrSet = function(delvObj) {
 		let chgerNm = delvObj.recipNm;

src/main/webapp/biz/mypage.js

@@ -163,9 +163,11 @@ var fnCreateChange = function(param, gubun) {
 	// 반품/취소/교환 페이지 이동
 	let ordNo = $(param).attr('ordNo');
 	let ordDtlNo = $(param).attr('ordDtlNo');
+	let delvFeeCd = $(param).attr('delvFeeCd');
 
 	$('#' + gubun + 'Form input[name=ordNo]').val(ordNo);
 	$('#' + gubun + 'Form input[name=ordDtlNo]').val(ordDtlNo);
+	$('#' + gubun + 'Form input[name=delvFeeCd]').val(delvFeeCd);
 
 	if (gubun == 'cancel') {
 		document.cancelForm.submit();