1. 주문상세 교환 임시 커밋

src/main/java/com/style24/admin/biz/service/TsaOrderChangeService.java

@@ -11,10 +11,11 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.gagaframework.web.parameter.GagaMap;
-import com.style24.admin.biz.dao.TsaOrderChangeDao;
 import com.style24.admin.biz.dao.TsaOrderDao;
+import com.style24.admin.biz.dao.TsaOrderChangeDao;
 import com.style24.admin.biz.dao.TsaRefundDao;
 import com.style24.admin.support.security.session.TsaSession;
+import com.style24.core.biz.dao.TscOrderChangeDao;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.persistence.domain.Order;
 import com.style24.persistence.domain.OrderChange;

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

@@ -405,7 +405,6 @@ public class TsaOrderChangeController extends TsaBaseController {
 	public ModelAndView exchangeRequestFrom(@RequestParam(value = "ordNo") int ordNo) {
 
 		Order order = new Order();
-		Delivery delivery = new Delivery();
 		ModelAndView mav = new ModelAndView();
 
 		order.setOrdNo(ordNo);

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

@@ -484,7 +484,7 @@ gridOptionsExchangeReqList.rowSelection = 'multiple';
 
 // 3. 배송비정보(환불정보)
 var columnDelvCdList = [
-	{headerName: "업체"			, field: "supplyCompCd"		, width: 100	, cellClass: 'text-center', hide: temp2},
+	{headerName: "업체"			, field: "supplyCompNm"		, width: 100	, cellClass: 'text-center', hide: temp2},
 	{headerName: "배송비코드"		, field: "delvFeeCd"		, width: 100	, cellClass: 'text-center', hide: temp2},
 	{
 		headerName		: "추가배송비"
@@ -497,7 +497,10 @@ var columnDelvCdList = [
 		, hide			: temp2
 	},
 	{headerName: "반품지명"		, field: "rtnLocNm"			, width: 100	, cellClass: 'text-center', hide: temp2},
-	{headerName: "반품지명"		, field: "rtnLocNm"			, width: 100	, cellClass: 'text-center', hide: temp2},
+	{headerName: "반품지전화번호"	, field: "rtnLocTelno"		, width: 100	, cellClass: 'text-center', hide: temp2},
+	{headerName: "반품지우편번호"	, field: "rtnLocZipcode"	, width: 100	, cellClass: 'text-center', hide: temp2},
+	{headerName: "반품지기본주소"	, field: "rtnLocBaseAddr"	, width: 300	, cellClass: 'text-center', hide: temp2},
+	{headerName: "반품지상세주소"	, field: "rtnLocDtlAddr"	, width: 300	, cellClass: 'text-center', hide: temp2},
 ];
 var gridOptionsDelvCdList = gagaAgGrid.getGridOptions(columnDelvCdList);
 </script>
@@ -817,24 +820,34 @@ var fnAddDelvFee = function (exchangeRequestTargetList) {
 	var delvFee = 0;
 
 	// 고객 귀책사유에 한하여 추가배송비 설정
-	if (isCustomer) {
-		$.each(exchangeRequestTargetList, function (idx, item) {
-			if (!delvCdList.includes(item.delvFeeCd)) {
-				var delvFeeTmp = $('#wdGb').val() == 'W' ? item.excDelvFee : item.rtnDelvFee;
+	$.each(exchangeRequestTargetList, function (idx, item) {
+		if (!delvCdList.includes(item.delvFeeCd)) {
+			if (isCustomer) {
+				var delvFeeTmp = $('#wdGb:checked').val() == 'W' ? item.excDelvFee : item.rtnDelvFee;
 				delvFee += delvFeeTmp;
 				item.addDelvFeeYn = 'Y';
 				item.addDelvFee = delvFeeTmp;
-				delvCdList.push(item.delvFeeCd);
-				delvFeeList.push(item);
+			} else {
+				item.addDelvFeeYn = 'N';
+				item.addDelvFee = 0;
 			}
-		});
-	}
-	
+
+			delvCdList.push(item.delvFeeCd);
+			delvFeeList.push(item);
+		}
+	});
+
 	addDelvFee = delvFee;
 	addDelvFeeList = delvFeeList;
+
+	// 회수방법 > 직접발송일 경우 그리드 표시
+	if ($('#wdGb:checked').val() == 'D') {
+		gridOptionsDelvCdList.api.setRowData(addDelvFeeList);
+	} else {
+		gridOptionsDelvCdList.api.setRowData();
+	}
 	
-	gridOptionsDelvCdList.api.setRowData(addDelvFeeList);
-	$('#addDelvFee').text(addDelvFee);
+	$('#addDelvFee').text(addDelvFee + '원');
 }
 
 $(document).ready(function() {