Merge branch 'order' into develop

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

@@ -718,7 +718,7 @@ public class TscOrderChangeService {
 				orderChange.setChgGb(TscConstants.OrderChangeGb.EXCHANGE.value());
 				orderChange.setChgReason(excReq.getChgReason());
 				orderChange.setChgMemo(excReq.getChgMemo());
-				// orderChange.setWdGb(wdGb);
+				orderChange.setWdGb(wdGb);
 				orderChange.setChgerNm(excReq.getChgerNm());
 				orderChange.setChgerPhnno(excReq.getChgerPhnno());
 				orderChange.setChgerTelno(excReq.getChgerTelno());

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

@@ -74,8 +74,8 @@
 				  SELECT OD.ORD_DTL_NO
 					   , SUM(OCD.CHG_QTY) AS ORD_REQ_CHG_QTY
 					FROM TB_ORDER_CHANGE_DETAIL OCD
-					INNER JOIN TB_ORDER_DETAIL OD
-					ON OCD.ORD_DTL_NO = OD.ORD_DTL_NO
+				   INNER JOIN TB_ORDER_DETAIL OD
+					  ON OCD.ORD_DTL_NO = OD.ORD_DTL_NO
 				   WHERE 1 = 1
 					 AND OD.ORD_NO = #{ordNo}
 					 AND OCD.DEL_YN = 'N'
@@ -104,8 +104,8 @@
 					   , TDL.RTN_LOC_BASE_ADDR
 					   , TDL.RTN_LOC_DTL_ADDR
 					FROM TB_DELIVERY_LOC TDL
-					INNER JOIN TB_SUPPLY_COMPANY TSC
-					ON TDL.SUPPLY_COMP_CD = TSC.SUPPLY_COMP_CD
+				   INNER JOIN TB_SUPPLY_COMPANY TSC
+					  ON TDL.SUPPLY_COMP_CD = TSC.SUPPLY_COMP_CD
 			  ) DL
 				ON OD.DELV_LOC_CD = DL.DELV_LOC_CD
 			  LEFT OUTER JOIN (
@@ -342,6 +342,7 @@
 			CHG_GB
 			, CHG_REASON
 			, CHG_MEMO
+			, WD_GB
 			, CHGER_NM
 			, CHGER_PHNNO
 			, CHGER_TELNO
@@ -360,6 +361,7 @@
 			#{chgGb}
 			 , #{chgReason}
 			 , #{chgMemo}
+			 , #{wdGb}
 			 , #{chgerNm}
 			 , #{chgerPhnno}
 			 , #{chgerTelno}