마이페이지 단테 수정 커밋

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

@@ -232,14 +232,10 @@ public class TsaOrderChangeController extends TsaBaseController {
 	 * @since 2020. 12. 22
 	 */
 	@GetMapping("/rtn/req/form")
-	public ModelAndView rtnReqForm(@RequestParam(value = "ordNo") int ordNo, @RequestParam(value = "ordChgSq") int ordChgSq) {
+	public ModelAndView rtnReqForm(Order order) {
 
-		Order order = new Order();
 		ModelAndView mav = new ModelAndView();
-		
-		order.setOrdNo(ordNo);
-		order.setOrdChgSq(ordChgSq);
-		
+
 		// 반품가능 주문상세상탭값 설정
 		String[] ordDtlStatArr = new String[3];
 		ordDtlStatArr[0] = TscConstants.OrderDetailStat.SHIPPING.value();
@@ -252,7 +248,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 		List<Order> orderChangeDetailList 			= orderChangeService.getOrderChangeDetailList(order);
 		Collection<Order> orderInfoList 			= orderService.getOrderInfoList(order);
 
-		if (ordChgSq > 0) {
+		if (order.getOrdChgSq() > 0) {
 			Collection<Order> exchangeInfoList = orderChangeService.getExchangeInfo(order);
 			mav.addObject("exchangeInfoList"		, exchangeInfoList);								// 교환정보
 		}
@@ -262,8 +258,8 @@ public class TsaOrderChangeController extends TsaBaseController {
 		mav.addObject("chgReasonList"				, rendererService.getAvailCommonCodeList("G688"));				// 취소사유
 		mav.addObject("cancelRequestTargetList"		, cancelRequestTargetList);										// 취소요청대상 목록
 		mav.addObject("orderInfoList"				, orderInfoList);												// 주문정보
-		mav.addObject("ordNo"						, ordNo);														// 주문번호
-		mav.addObject("ordChgSq"					, ordChgSq);													// 주문변경번호
+		mav.addObject("ordNo"						, order.getOrdNo());											// 주문번호
+		mav.addObject("ordChgSq"					, order.getOrdChgSq());											// 주문변경번호
 		mav.addObject("orderChangeDetailList"		, orderChangeDetailList);										// 변경신청목록 (취소/반품/교환)
 		
 		mav.addObject("orderDelvRtnAddrInfo"		, orderService.getDeliveryAddrList(order));						// 배송정보
@@ -492,13 +488,13 @@ public class TsaOrderChangeController extends TsaBaseController {
 	 * @since 2021. 01. 14
 	 */
 	@GetMapping("/exchange/request/form")
-	public ModelAndView exchangeRequestFrom(@RequestParam(value = "ordNo") int ordNo, @RequestParam(value = "ordChgSq") int ordChgSq) {
+	public ModelAndView exchangeRequestFrom(Order order) {
 
-		Order order = new Order();
+		// Order order = new Order();
 		ModelAndView mav = new ModelAndView();
 
-		order.setOrdNo(ordNo);
-		order.setOrdChgSq(ordChgSq);
+		// order.setOrdNo(ordNo);
+		// order.setOrdChgSq(ordChgSq);
 
 		// 교환가능 주문상세상탭값 설정
 		String[] ordDtlStatArr = new String[3];
@@ -510,7 +506,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 		Collection<Order> cancelRequestTargetList = orderChangeService.getCancelRequestTargetList(order);
 		Collection<Order> orderInfoList = orderService.getOrderInfoList(order);
 
-		if (ordChgSq > 0) {
+		if (order.getOrdChgSq() > 0) {
 			Collection<Order> exchangeInfoList = orderChangeService.getExchangeInfo(order);
 			mav.addObject("exchangeInfoList"		, exchangeInfoList);								// 교환정보
 		}
@@ -518,8 +514,8 @@ public class TsaOrderChangeController extends TsaBaseController {
 		mav.addObject("chgReasonList"				, rendererService.getAvailCommonCodeList("G689"));	// 교환사유
 		mav.addObject("cancelRequestTargetList"		, cancelRequestTargetList);							// 교환요청대상 목록
 		mav.addObject("orderInfoList"				, orderInfoList);									// 주문정보
-		mav.addObject("ordNo"						, ordNo);											// 주문번호
-		mav.addObject("ordChgSq"					, ordChgSq);										// 주문변경번호
+		mav.addObject("ordNo"						, order.getOrdNo());								// 주문번호
+		mav.addObject("ordChgSq"					, order.getOrdChgSq());								// 주문변경번호
 		mav.addObject("orderDelvAddrInfo"			, orderService.getDeliveryAddrList(order));			// 배송정보
 		mav.addObject("TelExcNoList"				, rendererService.getAvailCommonCodeList("G095"));	// 전화번호국번
 		mav.addObject("PhnExcNoList"				, rendererService.getAvailCommonCodeList("G096"));	// (휴대전화)번호국번

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

@@ -1154,14 +1154,14 @@ var fnReturnRequest = function (paramData, ordChgSq) {
 	param += "&delvFeeCdGrp="	+ paramArr[3];
 	param += "&ordChgSq=" 		+ ordChgSq;
 	
-	var actionUrl = "/orderChange/rtn/req/form?ordNo=" + ordNo + "&ordChgSq=" + ordChgSq;
+	var actionUrl = "/orderChange/rtn/req/form?" + param;
 	
 	cfnOpenModalPopup(actionUrl, 'popupReturnRequestForm');
 };
 
 // 교환요청
 var fnExchangeRequest = function (paramData, ordChgSq) {
-	
+	console.log(paramData);
 	// 취소요청 구분 (orChgSq null 이면 취소요청화면 있으면 취소요청정보화면)
 	if (ordChgSq == null) {
 		ordChgSq = 0;
@@ -1175,7 +1175,7 @@ var fnExchangeRequest = function (paramData, ordChgSq) {
 	param += "&delvFeeCdGrp="	+ paramArr[3];
 	param += "&ordChgSq=" 		+ ordChgSq;
 	
-	var actionUrl = "/orderChange/exchange/request/form?ordNo=" + ordNo + "&ordChgSq=" + ordChgSq;
+	var actionUrl = "/orderChange/exchange/request/form?" + param;
 	cfnOpenModalPopup(actionUrl, 'popupExchangeRequestForm');
 };