반품TO반품 임시 커밋

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

@@ -331,7 +331,8 @@ public class TsaOrderChangeController extends TsaBaseController {
 			// 교환TO교환 처리 시 미착 수량 설정
 			Collection<Order> returnDetailList;
 			String ordChgGb = order.getOrdChgGb();
-			if (StringUtils.isNotBlank(ordChgGb) && TscConstants.ChangeGb.EXCHANGE_TO_EXCHANGE.value().equals(ordChgGb)) {
+
+			if (StringUtils.isNotBlank(ordChgGb) && TscConstants.ChangeGb.RETURN_TO_RETURN.value().equals(ordChgGb.toUpperCase())) {
 				returnDetailList = coreOrderChangeService.getNonArrivalInfo(order);
 			} else {
 				returnDetailList = orderChangeDetailList;
@@ -339,7 +340,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 
 			// Collection<Order> exchangeInfoList = coreOrderChangeService.getExchangeInfo(order);
 			// mav.addObject("exchangeInfoList"		, exchangeInfoList);											// 교환정보
-			mav.addObject("ordChgGb"				, StringUtils.isBlank(ordChgGb) ? "" : ordChgGb);				// 주문변경요쳥변경구분
+			mav.addObject("ordChgGb"				, StringUtils.isBlank(ordChgGb) ? "" : ordChgGb.toUpperCase());	// 주문변경요쳥변경구분
 
 			// 반품상세 정보 설정
 			List<Integer> ordDtlNoList = new ArrayList<>();
@@ -661,7 +662,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 			// 교환TO교환 처리 시 미착 수량 설정
 			Collection<Order> exchangeDetailList;
 			String ordChgGb = order.getOrdChgGb();
-			if (StringUtils.isNotBlank(ordChgGb) && TscConstants.ChangeGb.EXCHANGE_TO_EXCHANGE.value().equals(ordChgGb)) {
+			if (StringUtils.isNotBlank(ordChgGb) && TscConstants.ChangeGb.EXCHANGE_TO_EXCHANGE.value().equals(ordChgGb.toUpperCase())) {
 				exchangeDetailList = coreOrderChangeService.getNonArrivalInfo(order);
 			} else {
 				exchangeDetailList = orderChangeDetailList;
@@ -699,21 +700,21 @@ public class TsaOrderChangeController extends TsaBaseController {
 				chgOrdDtlStat = exchangeInfoList.iterator().next().getOrdDtlStat();
 			}
 
-			mav.addObject("exchangeInfoList"		, exchangeInfoList);								// 교환정보
-			mav.addObject("ordChgGb"				, StringUtils.isBlank(ordChgGb) ? "" : ordChgGb);	// 주문변경요쳥변경정보
-			mav.addObject("chgOrdDtlStat"			, chgOrdDtlStat);									// 교환상품상세상태
+			mav.addObject("exchangeInfoList"		, exchangeInfoList);											// 교환정보
+			mav.addObject("ordChgGb"				, StringUtils.isBlank(ordChgGb) ? "" : ordChgGb.toUpperCase());	// 주문변경요쳥변경정보
+			mav.addObject("chgOrdDtlStat"			, chgOrdDtlStat);												// 교환상품상세상태
 		}
 
-		mav.addObject("chgReasonList"				, rendererService.getAvailCommonCodeList("G689"));	// 교환사유
-		mav.addObject("cancelRequestTargetList"		, cancelRequestTargetList);							// 교환요청대상 목록
-		mav.addObject("orderChangeDetailList"		, orderChangeDetailList);							// 변경신청목록 (취소/반품/교환)
-		mav.addObject("orderInfoList"				, orderInfoList);									// 주문정보
-		mav.addObject("ordNo"						, order.getOrdNo());								// 주문번호
-		mav.addObject("ordChgSq"					, order.getOrdChgSq());								// 주문변경번호
-		mav.addObject("orderDelvAddrInfo"			, coreOrderService.getDeliveryAddrList(order));		// 배송정보
-		mav.addObject("TelExcNoList"				, rendererService.getAvailCommonCodeList("G095"));	// 전화번호국번
-		mav.addObject("PhnExcNoList"				, rendererService.getAvailCommonCodeList("G096"));	// (휴대전화)번호국번
-		mav.addObject("chgStat"						, chgStat);											// 변경상태
+		mav.addObject("chgReasonList"				, rendererService.getAvailCommonCodeList("G689"));				// 교환사유
+		mav.addObject("cancelRequestTargetList"		, cancelRequestTargetList);										// 교환요청대상 목록
+		mav.addObject("orderChangeDetailList"		, orderChangeDetailList);										// 변경신청목록 (취소/반품/교환)
+		mav.addObject("orderInfoList"				, orderInfoList);												// 주문정보
+		mav.addObject("ordNo"						, order.getOrdNo());											// 주문번호
+		mav.addObject("ordChgSq"					, order.getOrdChgSq());											// 주문변경번호
+		mav.addObject("orderDelvAddrInfo"			, coreOrderService.getDeliveryAddrList(order));					// 배송정보
+		mav.addObject("TelExcNoList"				, rendererService.getAvailCommonCodeList("G095"));				// 전화번호국번
+		mav.addObject("PhnExcNoList"				, rendererService.getAvailCommonCodeList("G096"));				// (휴대전화)번호국번
+		mav.addObject("chgStat"						, chgStat);														// 변경상태
 
 		mav.setViewName("order/ExchangeRequestForm");
 

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

@@ -1137,7 +1137,7 @@ var fnReturnRequest = function (paramData, ordChgSq) {
 	param += "&delvFeeCdGrp="	+ paramArr[3];
 	
 	param += "&ordChgSq=" 		+ ordChgSq;
-	//param += "&ordChgGb=G681_30";
+	param += "&ordChgGb=G681_30";
 	var actionUrl = "/orderChange/rtn/req/form?" + param;
 	cfnOpenModalPopup(actionUrl, 'popupReturnRequestForm');
 };

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

@@ -320,17 +320,15 @@ var columnCancelReqList = [
 
 			// 취소신청가능수량있으면 수량만 표시 (취소,반품,교환 신청정보 처리)
 			// 2021.06.22 반품TO반품 수량 처리
-			if (ordChgSq > 0 && ordChgGb != 'G681_30') {
-				rtnStr = ordCanChgQty;
-			} else {
-				//if (ordChgGb != 'G681_30') {
-					ordCanChgQty = ordQty - (cnclRtnQty + ordReqChgQty);
-				//}
-
+			if (ordChgSq > 0) {
 				if (ordChgGb == 'G681_30') {
 					ordCanChgQty = params.data.chgQty;
 				}
 				
+				rtnStr = ordCanChgQty;
+			} else {
+				ordCanChgQty = ordQty - (cnclRtnQty + ordReqChgQty);
+
 				rtnStr += "<select class='ordCanChgQty' name='ordCanChgQty' ordDtlNo='"+params.data.ordDtlNo+"' onChange='fnCalculateRefundAmt(this);'>";
 				
 				for (i=0 ; i<=ordCanChgQty ; i++) {