네이버페이 주문형 검수 대응 임시 커밋

src/main/java/com/style24/admin/biz/web/TsaOrderChangeController.java

@@ -1172,30 +1172,39 @@ public class TsaOrderChangeController extends TsaBaseController {
 	@PostMapping("/nPay/order/exchange/hold")
 	@ResponseBody
 	public GagaResponse nPayExchangeHold(@RequestBody OrderChange orderChange) {
-		Integer userNo = TsaSession.getInfo().getUserNo();
-		orderChange.setPgGb(TscConstants.PgGb.NAVER_ORDER.value());
-		orderChange.setRegNo(userNo);
-		orderChange.setUpdNo(userNo);
-		
+		Integer userNo 				= TsaSession.getInfo().getUserNo();
+		String npayChangeHoldYn 	= orderChange.getNpayChangeHoldYn();
+		Integer ordChgSq 			= orderChange.getOrdChgSq();
+
 		try {
-			Integer ordChgSq = 0;
 			int idx = 0;
 			int cnt = 0;
 
 			for (Order order : orderChange.getCancelReqList()) {
-				ordChgSq = order.getOrdChgSq();
+				order.setPgGb(TscConstants.PgGb.NAVER_ORDER.value());
 				order.setRegNo(userNo);
+				order.setUpdNo(userNo);
+
+				if ("N".equals(npayChangeHoldYn)) {
+					cnt += coreNaverPayService.nPayExchangeHold(order);
+				} else {
+					cnt += coreNaverPayService.nPayReleaseExchangeHold(order);
+				}
 
-				cnt += coreNaverPayService.nPayExchangeHold(order);
-				
 				idx++;
 			}
 
 			if (idx == cnt && ordChgSq > 0) {
 				Order order = new Order();
 				order.setOrdChgSq(ordChgSq);
+				order.setRegNo(userNo);
 				order.setUpdNo(userNo);
 
+				if ("N".equals(npayChangeHoldYn)) {
+					order.setNpayChangeHoldYn("Y");
+				} else {
+					order.setNpayChangeHoldYn("N");
+				}
 				coreNaverPayService.updateNaverPayChangeHold(order);
 
 				return super.ok(message.getMessage("SUCC_0004"));

src/main/webapp/WEB-INF/views/order/ExchangeRequestForm.html

@@ -54,7 +54,8 @@
 					</th:block>
 					<th:block th:if="${ordChgSq > 0 and chgStat != 'G685_40'}">
 						<!-- 네이버페이 주문형 교환보류 버튼 -->
-						<button type="button" class="btn btn-success" id="fnExchangeHold" onclick="fnExchangeHold(this)">교환보류</button>
+						<button type="button" class="btn btn-success" id="fnExchangeHold" npayChangeHoldYn="N" onclick="fnNpayExchangeHold(this)">교환보류</button>
+						<button type="button" class="btn btn-success" id="fnReleaseExchangeHold" npayChangeHoldYn="Y" onclick="fnNpayExchangeHold(this)">교환보류해제</button>
 					</th:block>
 				</div>
 				
@@ -948,6 +949,25 @@ var fnExchangeCancel = function() {
 	});
 }
 
+// 네이버페이 주문형 교환보류 버튼 클릭 이벤트
+var fnNpayExchangeHold = function(param) {
+	let url = '/orderChange/nPay/order/exchange/hold';
+	let npayChangeHoldYn = $(param).attr('npayChangeHoldYn');
+	
+	let data = {};
+	data.cancelReqList = exchangeRequestList;
+	data.npayChangeHoldYn = npayChangeHoldYn;
+	data.ordChgSq = ordChgSq;
+	
+	let jsonData = JSON.stringify(data);
+	
+	gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
+		uifnPopupClose('popupOrderDetail');
+		fnReOpenOrderDetailPopup();
+		uifnPopupClose('popupExchangeRequestForm');
+	});
+}
+
 // 우편번호 DAUM을 이용한 우편번호 팝업 레이어
 var fnOpenDaumAddr = function(loc) {
 	let daumZip = new daum.Postcode({
@@ -1279,23 +1299,6 @@ var fnChangeRecipInfo = function() {
 	});
 }
 
-function fnExchangeHold(param) {
-	let url = '/orderChange/npay/order/exchange/hold';
-	let npayChangeHoldYn = $(param).attr('npayChangeHoldYn');
-	
-	let data = {};
-	data.cancelReqList = exchangeRequestList;
-	data.npayChangeHoldYn = npayChangeHoldYn;
-	
-	let jsonData = JSON.stringify(data);
-	
-	gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-		uifnPopupClose('popupOrderDetail');
-		fnReOpenOrderDetailPopup();
-		uifnPopupClose('popupExchangeRequestForm');
-	});
-}
-
 $(document).ready(function() {
 	// 1. 그리드생성
 	gagaAgGrid.createGrid('gridOrderCancelRequestList'		, gridOptionsExchangeReqList);			// 주문정보
@@ -1390,10 +1393,12 @@ $(document).ready(function() {
 		}
 
 		// 네이버페이 주문형 보류 버튼 처리
-		if (gagajf.isNull(npayChangeHoldYn)) {
-			$('#fnExchangeHold').css('display', 'none');
-		} else {
-			$('#fnExchangeHold').attr('npayChangeHoldYn', npayChangeHoldYn);
+		if (!gagajf.isNull(npayChangeHoldYn)) {
+			if (npayChangeHoldYn == 'Y') {
+				$('#fnExchangeHold').css('display', 'none');
+			} else {
+				$('#fnReleaseExchangeHold').css('display', 'none');
+			}
 		}
 	} else {
 		$('#chgerButton').css('display', 'none');						// 회수지 수정 버튼