1. 주문 임시 커밋

src/main/java/com/style24/core/biz/service/TscOrderChangeService.java

@@ -464,6 +464,7 @@ public class TscOrderChangeService {
 		String allCanYn		= mav.getString("allCanYn").toString();								// 무통장입금전 전체취소 여부
 		String isCustomer	= mav.getString("isCustomer").toString();							// 귀책사유 (고객, 회사)
 		String chgGb		= TscConstants.OrderChangeGb.RETURN.value(); 						// 반품요청
+		String wdGb			= mav.getString("wdGb");											// 회수방법
 		
 		// 4. 주문상세단품정보등록,변경 (단품단위)
 		List<Order> cancelOrderDetailList = new ArrayList<Order>();
@@ -509,6 +510,7 @@ public class TscOrderChangeService {
 				orderChange.setChgMemo(chgMemo);
 				orderChange.setAddPayCost(0);
 				orderChange.setAddPayAmt(0);
+				orderChange.setWdGb(wdGb);
 				orderChange.setRegNo(userNo);
 				orderChange.setUpdNo(userNo);
 				
@@ -520,16 +522,16 @@ public class TscOrderChangeService {
 				String chgerZipcode 	= mav.getString("chgerZipcode").toString();		// 변경우편번호
 				String chgerBaseAddr 	= mav.getString("chgerBaseAddr").toString();	// 변경기본주소
 				String chgerDtlAddr 	= mav.getString("chgerDtlAddr").toString();		// 변경상세주소
+				String chgerRtnMemo		= mav.getString("chgerRtnMemo");				// 반품메모
 				
 				orderChange.setChgerNm(chgerNm);
 				orderChange.setChgerPhnno(chgerPhnno);
 				orderChange.setChgerTelno(chgerTelno);
 				orderChange.setChgerEmail(chgerEmail);
-				orderChange.setChgerRtnMemo("");
+				orderChange.setChgerRtnMemo(chgerRtnMemo);
 				orderChange.setChgerZipcode(chgerZipcode);
 				orderChange.setChgerBaseAddr(chgerBaseAddr);
 				orderChange.setChgerDtlAddr(chgerDtlAddr);
-				orderChange.setChgerRtnMemo("");
 				
 				orderChangeDao.createOrderChange(orderChange);
 				

src/main/java/com/style24/persistence/mybatis/shop/TscOrder.xml

@@ -9,6 +9,7 @@
 		FROM   TB_ORDER O
 		INNER  JOIN TB_ORDER_DETAIL OD
 		ON     O.ORD_NO = OD.ORD_NO
+		AND    OD.ORD_DTL_STAT <![CDATA[<>]]> 'G013_97'			-- 교환철회 상품 제외
 		INNER  JOIN TB_GOODS G1
 		ON     OD.GOODS_CD = G1.GOODS_CD
 		INNER  JOIN TB_ORDER_DETAIL_ITEM ODI

src/main/java/com/style24/persistence/mybatis/shop/TscOrderChange.xml

@@ -181,6 +181,7 @@
 			 , OC.CHGER_DTL_ADDR
 			 , OC.WD_INVOICE_SEND_YN
 			 , OC.WD_INVOICE_NO
+			 , OC.WD_GB
 		  FROM TB_ORDER_CHANGE_DETAIL OCD
 		 INNER JOIN TB_ORDER_CHANGE OC
 		    ON OC.ORD_CHG_SQ = OCD.ORD_CHG_SQ