반품신청, 반품신처철회

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

@@ -217,6 +217,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 		ModelAndView mav = new ModelAndView();
 		
 		order.setOrdNo(ordNo);
+		order.setOrdChgSq(ordChgSq);
 		
 		// 반품가능 주문상세상탭값 설정
 		String[] ordDtlStatArr = new String[3];
@@ -305,6 +306,34 @@ public class TsaOrderChangeController extends TsaBaseController {
 		return super.ok("성공");
 	}
 	
+	/**
+	 * 취소요청철회 (관리자)
+	 * @param OrderChange - 주문취소신청정보
+	 * @return
+	 * @author jsh77b
+	 * @since 2021. 01. 20
+	 */
+	@PostMapping("/rtnReqCancel")
+	@ResponseBody
+	public GagaResponse rtnReqCancel(@RequestBody OrderChange cnclReq) {
+		
+		if (cnclReq== null) {
+			throw new IllegalStateException(message.getMessage("FAIL_1001"));
+		}
+		
+		// 1. 세션회원조회
+		int userNo = TsaSession.getInfo().getUserNo();
+		
+		GagaMap mav = new GagaMap();
+		mav.set("ordNo"			, cnclReq.getOrdNo());
+		mav.set("ordChgSq"		, cnclReq.getOrdChgSq());
+		
+		// 2.취소요청철회 
+		mav = coreOrderChangeService.rtnReqCancel(mav, userNo);
+		
+		return super.ok("성공");
+	}
+	
 	/**
 	 * 주문 취소/반품 신청환불금액 계산
 	 * @param Collection<Order>- 주문취소신청목록

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

@@ -152,7 +152,7 @@ if (ordChgSq > 0) {
 }
 
 var temp1 = true;
-var temp2 = false;
+var temp2 = true;
 
 // 1. 주문정보(변경요청가능대상)
 var columnCancelReqList = [
@@ -1098,10 +1098,12 @@ $(document).ready(function() {
 	}
 	
 	// debug mode 해제
-	$("#h4OrderCancelRequestToBeList").css("display", "none");
-	$("#gridOrderCancelRequestToBeList").css("display", "none");
-	$("#h4DelvCdList").css("display", "none");
-	$("#gridDelvCdList").css("display", "none");
+	if (temp2) {
+		$("#h4OrderCancelRequestToBeList").css("display", "none");
+		$("#gridOrderCancelRequestToBeList").css("display", "none");
+		$("#h4DelvCdList").css("display", "none");
+		$("#gridDelvCdList").css("display", "none");
+	}
 });
 </script>
 </html>

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

@@ -192,7 +192,7 @@ var addDelvFeeList			= [];											// 추가배송비정보
 var exchangeRequestList		= [];											// 교환요청목록
 
 var temp1 = true;
-var temp2 = false;
+var temp2 = true;
 
 // 1. 주문정보(교환대상)
 var columnExchangeReqList = [

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

@@ -614,8 +614,12 @@ var columnDefsOrderChangeInfo = [
 			var rtnStr = "";
 			
 			// 취소요청, 교환요청, 반품요청 일때는 요청 정보 확인 팝업 정보
-			if (params.data.chgStat == 'G685_20' || params.data.chgStat == 'G685_30' || params.data.chgStat == 'G685_40') {
+			if (params.data.chgStat == 'G685_20') {
 				rtnStr = '<a href="javascript:void(0);" onclick="fnCancelRequest(\'' + params.value + '\');">' + params.value + '</a>';
+			} else if (params.data.chgStat == 'G685_40') {
+				rtnStr = '<a href="javascript:void(0);" onclick="fnReturnRequest(\'' + params.value + '\');">' + params.value + '</a>';
+			} else if (params.data.chgStat == 'G685_30') {
+				rtnStr = '<a href="javascript:void(0);" onclick="fnExchangeRequest(\'' + params.value + '\');">' + params.value + '</a>';
 			} else {
 				rtnStr = params.value;
 			}
@@ -1015,6 +1019,7 @@ var fnCancelRequest = function (ordChgSq) {
 	cfnOpenModalPopup(actionUrl, 'popupCancelRequestForm');
 };
 
+//2021.01.25 추가
 // 반품요청
 var fnReturnRequest = function (ordChgSq) {
 	
@@ -1029,12 +1034,65 @@ var fnReturnRequest = function (ordChgSq) {
 };
 
 // 교환요청
-var fnExchangeRequest = function () {
-	var actionUrl = "/orderChange/exchange/request/form?ordNo=" + ordNo;
+var fnExchangeRequest = function (ordChgSq) {
+	
+	// 취소요청 구분 (orChgSq null 이면 취소요청화면 있으면 취소요청정보화면)
+	if (ordChgSq == null) {
+		ordChgSq = 0;
+	}
+	
+	var actionUrl = "/orderChange/exchange/request/form?ordNo=" + ordNo + "&ordChgSq=" + ordChgSq;
 	cfnOpenModalPopup(actionUrl, 'popupExchangeRequestForm');
 };
 
 
+// 반품요청 철회
+var fnReturnReqeustCancel = function (ordChgSq, ordDtlNo, rowIdx) {
+	mcxDialog.confirm('반품요청을 철회하시겠습니까?', {
+		cancelBtnText	: "취소",
+		sureBtnText		: "확인",
+		sureBtnClick	: function () {
+			var data = new Object();
+			data.ordChgSq = ordChgSq;
+			data.ordDtlNo = ordDtlNo;
+			
+			var jsonData = JSON.stringify(data);
+			gagajf.ajaxJsonSubmit(
+				'/order/return/request/cancel'
+				, jsonData
+				, function (result) {
+					if (result.message != '회수컨펌 된 내역이 있습니다.') {
+						var selectedRow = gridOptionsOrderChangeInfo.api.getRowNode(rowIdx).data;
+						gridOptionsOrderChangeInfo.api.updateRowData({remove: [selectedRow]});
+					}
+				}
+			);
+		}
+	});
+};
+
+// 교환요청 철회
+var fnExchangeReqeustCancel = function (ordChgSq, ordNo, ordDtlNo, rowIdx) {
+	mcxDialog.confirm('교환요청을 취소하시겠습니까?', {
+		cancelBtnText	: "취소",
+		sureBtnText		: "확인",
+		sureBtnClick	: function () {
+			var data = new Object();
+			data.ordNo 		= ordNo;
+			data.ordDtlNo 	= ordDtlNo;
+			data.ordChgSq 	= ordChgSq;
+			
+			var jsonData = JSON.stringify(data);
+			gagajf.ajaxJsonSubmit(
+				'/order/exchange/request/cancel'
+				, jsonData, function () {
+					uifnPopupClose('popupOrderDetail');
+					fnReOpenOrderDetailPopup();
+				}
+			);
+		}
+	});
+};
 
 // 주문상품 상세 변경 이력 팝업
 var fnOrderDetailChangeHst = function (ordDtlNo) {
@@ -1170,54 +1228,6 @@ var fnSaveChgerAddr = function (rowIdx) {
 	});
 }
 
-// 반품요청 철회
-var fnReturnReqeustCancel = function (ordChgSq, ordDtlNo, rowIdx) {
-	mcxDialog.confirm('반품요청을 철회하시겠습니까?', {
-		cancelBtnText	: "취소",
-		sureBtnText		: "확인",
-		sureBtnClick	: function () {
-			var data = new Object();
-			data.ordChgSq = ordChgSq;
-			data.ordDtlNo = ordDtlNo;
-			
-			var jsonData = JSON.stringify(data);
-			gagajf.ajaxJsonSubmit(
-				'/order/return/request/cancel'
-				, jsonData
-				, function (result) {
-					if (result.message != '회수컨펌 된 내역이 있습니다.') {
-						var selectedRow = gridOptionsOrderChangeInfo.api.getRowNode(rowIdx).data;
-						gridOptionsOrderChangeInfo.api.updateRowData({remove: [selectedRow]});
-					}
-				}
-			);
-		}
-	});
-};
-
-// 교환요청 철회
-var fnExchangeReqeustCancel = function (ordChgSq, ordNo, ordDtlNo, rowIdx) {
-	mcxDialog.confirm('교환요청을 취소하시겠습니까?', {
-		cancelBtnText	: "취소",
-		sureBtnText		: "확인",
-		sureBtnClick	: function () {
-			var data = new Object();
-			data.ordNo 		= ordNo;
-			data.ordDtlNo 	= ordDtlNo;
-			data.ordChgSq 	= ordChgSq;
-			
-			var jsonData = JSON.stringify(data);
-			gagajf.ajaxJsonSubmit(
-				'/order/exchange/request/cancel'
-				, jsonData, function () {
-					uifnPopupClose('popupOrderDetail');
-					fnReOpenOrderDetailPopup();
-				}
-			);
-		}
-	});
-};
-
 // LMS 전송
 var fnOpenLmsForm = function (orderPhnno, custNo) {
 	if (gagajf.isNull(custNo) && gagajf.isNull(orderPhnno)) {
@@ -1264,28 +1274,6 @@ var fnReceiptPage = function (tid) {
 	window.open(fullUrl, '_blank');
 };
 
-// 수동 회수 지시 
-var fnWdinvocieSend = function (ordChgSq) {
-	mcxDialog.confirm("요청번호 [" + ordChgSq + "] 회수지시 처리 하시겠습니까? <br> 시스템에서 회수지시를 보내지는않습니다.", {
-		cancelBtnText	: "취소",
-		sureBtnText		: "확인",
-		sureBtnClick	: function () {
-			var data = new Object();
-			data.ordChgSq = ordChgSq;
-			
-			var jsonData = JSON.stringify(data);
-			gagajf.ajaxJsonSubmit(
-				'/order/wdinvoice/send/save'
-				, jsonData
-				, function (result) {
-					uifnPopupClose('popupOrderDetail');
-					fnReOpenOrderDetailPopup();
-				}
-			);
-		}
-	});
-};
-
 // 구매확정철회
 var fnChangedCompleteDelivery = function (ordNo, ordDtlNo, ordDtlStat) {
 	if ('70' !== ordDtlStat) {

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

@@ -39,7 +39,7 @@
 				<div style="text-align:right; padding-bottom:5px; padding-top:5px;">
 					<button type="button" class="btn btn-success" id="rtnReqBtn" onclick="fnCnclReq('rtnReq');">반품신청</button>
 					<button type="button" class="btn btn-success" id="rtnReqCancelBtn" onclick="fnCnclReq('rtnReqCancel');">반품철회</button>
-					<button type="button" class="btn btn-success" id="rtnReqCancelBtn" onclick="fnCnclReq('rtnReqComplete');">반품승인</button>
+					<!-- <button type="button" class="btn btn-success" id="rtnReqCancelBtn" onclick="fnCnclReq('rtnReqComplete');">반품승인</button> -->
 				</div>
 				
 				<table class="frmStyle">
@@ -204,7 +204,7 @@ if (ordChgSq > 0) {
 }
 
 var temp1 = true;
-var temp2 = false;
+var temp2 = true;
 
 // 1. 주문정보(변경요청가능대상)
 var columnCancelReqList = [
@@ -289,7 +289,6 @@ var columnCancelReqList = [
 					var cnclRtnQty 		= parseInt(params.data.cnclRtnQty);
 					var ordReqChgQty 	= parseInt(params.data.ordReqChgQty);
 					var ordCanChgQty 	= parseInt(params.value);
-					var ordCanChgQty 	= ordQty - (cnclRtnQty +  ordReqChgQty);
 					var rtnStr 			= "";
 					
 					// 취소신청가능수량있으면 수량만 표시 (취소,반품,교환 신청정보 처리)
@@ -1234,10 +1233,12 @@ $(document).ready(function() {
 	}
 	
 	// debug mode 해제
-	$("#h4OrderCancelRequestToBeList").css("display", "none");
-	$("#gridOrderCancelRequestToBeList").css("display", "none");
-	$("#h4DelvCdList").css("display", "none");
-	$("#gridDelvCdList").css("display", "none");
+	if (temp2) {
+		$("#h4OrderCancelRequestToBeList").css("display", "none");
+		$("#gridOrderCancelRequestToBeList").css("display", "none");
+		$("#h4DelvCdList").css("display", "none");
+		$("#gridDelvCdList").css("display", "none");
+	}
 });
 </script>
 </html>