1. 주문 교환 임시 커밋

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

@@ -530,6 +530,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 		GagaMap result = new GagaMap();
 		result.set("status", GagaResponseStatus.FAIL.getCode());
 
+		// 교환요청 데이터 확인
 		if (excReq == null) {
 			result.set("message", message.getMessage("FAIL_1001"));
 			return result;
@@ -540,10 +541,16 @@ public class TsaOrderChangeController extends TsaBaseController {
 		excReq.setUpdNo(userNo);
 		excReq.setRegNo(userNo);
 
-		log.info("excReq >>> {}", excReq);
-
+		// 교환처리
 		result = coreOrderChangeService.exchReq(excReq);
 
+		// 처리 결과 코드에 따른 메세지 설정
+		if (result.get("status").equals(GagaResponseStatus.SUCCESS.getCode())) {
+			result.set("message", message.getMessage("SUCC_0004"));
+		} else {
+			result.set("message", message.getMessage("FAIL_0004"));
+		}
+		
 		return result;
 	}
 }

src/main/java/com/style24/persistence/domain/Order.java

@@ -374,6 +374,8 @@ public class Order extends TscBaseDomain {
 	private String rtnLocDtlAddr;
 	private String rtnLocTelno;
 	private String rtnLocNm;
+	private int exchangeOrdDtlNo;
+	private int exchangeOrdDtlItemSq;
 }
 
 

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

@@ -313,7 +313,7 @@ var columnExchangeReqList = [
 					strVal += '<select class="ordCanChgQty ' + params.data.ordDtlNo + '" name="chgQty" ordDtlNo="'+params.data.ordDtlNo+'" onchange="fnChangeQty(this)">';
 					
 					for (i=0 ; i<=ordCanChgQty ; i++) {
-						if (i == params.data.ordCanChgQty) {
+						if (i == params.data.chgQty) {
 							strVal += "	<option value='"+i+"' selected>"+i+"</option>";
 						} else {
 							strVal += "	<option value='"+i+"'>"+i+"</option>";
@@ -543,8 +543,8 @@ var fnChangeChgReason = function(reasonCd){
 		$("#imputeReason").text("회사");
 	}
 
-	$('#cancelRequestFrm input[name=chgReason]').val(arrReasonCd[0]);
-	$('#cancelRequestFrm input[name=chgReasonDesc]').val(arrReasonCd[1]);
+	$('#exchangeRequestFrm input[name=chgReason]').val(arrReasonCd[0]);
+	$('#exchangeRequestFrm input[name=chgReasonDesc]').val(arrReasonCd[1]);
 	
 	// 추가배송비 설정
 	fnChangeQty();
@@ -552,14 +552,13 @@ var fnChangeChgReason = function(reasonCd){
 
 // 교환요청
 var fnExchange = function () {
-	console.log('a');
 	var qty		= false;
 	var opt		= false;
 	var wdGb	= $('#wdGb:checked').val();
 
 	// 1. 교환수량 체크
 	$.each(cancelRequestTargetList, function(idx, item) {
-		if (item.ordCanChgQty > 0) {
+		if (item.chgQty > 0) {
 			qty = true;
 			
 			if (!gagajf.isNull(item.ordChgOpt)) {
@@ -679,6 +678,7 @@ var fnExchange = function () {
 		,"chgerDtlAddr"		: chgerDtlAddr
 		,"chgerPhnno"		: chgerPhnno
 		,"chgerTelno"		: chgerTelno
+		,"chgerRtnMemo"		: $("#exchangeRequestFrm textarea[name=chgerRtnMemo]").val()
 		,"recipNm"			: recipNm
 		,"recipEmail"		: recipEmail
 		,"recipZipcode"		: recipZipcode
@@ -686,6 +686,7 @@ var fnExchange = function () {
 		,"recipDtlAddr"		: recipDtlAddr
 		,"recipPhnno"		: recipPhnno
 		,"recipTelno"		: recipTelno
+		,"delvMemo"			: $("#exchangeRequestFrm textarea[name=delvMemo]").val()
 	}
 
 	// 주문번호, 교환사유, 교환메모, (취소, 반품, 교환 신청 정보 목록)
@@ -699,9 +700,9 @@ var fnExchange = function () {
 				'/orderChange/exchangeRequest/'
 				, jsonData
 				, function() {
-					//uifnPopupClose('popupOrderDetail');
-					//fnReOpenOrderDetailPopup();
-					//uifnPopupClose('popupReturnRequestForm');
+					uifnPopupClose('popupOrderDetail');
+					fnReOpenOrderDetailPopup();
+					uifnPopupClose('popupExchangeRequestForm');
 				}
 			);
 		}
@@ -802,7 +803,7 @@ var fnChangeOption = function(param) {
 
 // 교환수량 변경 이벤트
 var fnChangeQty = function(param) {
-	var ordCanChgQty = $(param).val();
+	var chgQty = $(param).val();
 	var ordDtlNo = $(param).attr('ordDtlNo');
 	var exchangeRequestTargetList = [];
 
@@ -813,12 +814,12 @@ var fnChangeQty = function(param) {
 				return false;
 			}
 			
-			item.ordCanChgQty = ordCanChgQty;
+			item.chgQty = chgQty;
 			
-			if (ordCanChgQty > 0) {
+			if (chgQty > 0) {
 				exchangeRequestTargetList.push(item);
 			}
-		} else if (item.ordCanChgQty > 0) {
+		} else if (item.chgQty > 0) {
 			exchangeRequestTargetList.push(item);
 		}
 	});