1. 주문 임시 커밋

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

@@ -120,6 +120,10 @@ public class Order extends TscBaseDomain {
 	private String chgGb;
 	private String wdInvoiceSendYn;
 	
+	private int cancelRequestQty;
+	private int exchangeRequestQty;
+	private int returnRequestQty;
+	
 	// 상품정보
 	private String imgPath1;
 	private String sysImgNm;
@@ -168,6 +172,7 @@ public class Order extends TscBaseDomain {
 	private String recipZipcode;
 	private String recipBaseAddr;
 	private String recipDtlAddr;
+	private String recipAddr;
 	private String ordEmail;
 	private String delvMemo;
 	private String delvAddrEditYn;

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

@@ -25,25 +25,21 @@
 		   AND P.PAY_STAT = 'G016_30'
 		 INNER JOIN TB_DELIVERY_ADDR DA
 		    ON OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
+		<if test="(chgStat != null and chgStat != '') or (chgGb != null and chgGb != '')">
 		  LEFT OUTER JOIN (
-			SELECT OC.WD_INVOICE_NO
-			     , OC.WD_INVOICE_SEND_YN
-			     , OC.SHIP_COMP_CD
-			     , OCD.ORD_DTL_NO
-			     , OCD.CHG_QTY
+			SELECT OCD.ORD_DTL_NO
+			     , OC.CHG_GB
 			     , OCD.CHG_STAT
 			  FROM TB_ORDER_CHANGE OC
 			 INNER JOIN TB_ORDER_CHANGE_DETAIL OCD
 			    ON OC.ORD_CHG_SQ  = OCD.ORD_CHG_SQ
 			 WHERE 1=1
-			 GROUP BY OC.WD_INVOICE_NO
-			     , OC.WD_INVOICE_SEND_YN
-			     , OC.SHIP_COMP_CD
-			     , OCD.ORD_DTL_NO
-			     , OCD.CHG_QTY
+			 GROUP BY OCD.ORD_DTL_NO
+			     , OC.CHG_GB
 			     , OCD.CHG_STAT
 		) OCD
 		    ON OD.ORD_DTL_NO = OCD.ORD_DTL_NO
+		</if>
 	 	 WHERE 1=1
 		<if test='siteCd != null and siteCd != ""'>
 		   AND O.SITE_CD = #{siteCd}
@@ -77,10 +73,8 @@
 		<if test="chgStat != null and chgStat != ''">
 		   AND OCD.CHG_STAT = #{chgStat}
 		</if>
-		<if test="chgStat == null or chgStat == ''">
-			<if test="chgGb != null and chgGb != ''">
-		   AND OCD.CHG_STAT = #{chgGb}
-			</if>
+		<if test="chgGb != null and chgGb != ''">
+		   AND OCD.CHG_GB = #{chgGb}
 		</if>
 		<if test='search != null and search == "searchOrdNo"'>
 			<if test="condition != null and condition != ''">
@@ -222,6 +216,11 @@
 										THEN '주문'
 									ELSE '교환'
 							   END   EXCH_GB_NM
+							 , DA.RECIP_NM
+							 , DA.RECIP_PHNNO
+							 , CONCAT(DA.RECIP_BASE_ADDR, ' ', DA.RECIP_DTL_ADDR) AS RECIP_ADDR 
+							 , DA.DELV_MEMO
+							 , OD.DSTRBT_NOTE
 						  FROM TB_ORDER O
 						 INNER JOIN TB_ORDER_DETAIL OD
 							ON O.ORD_NO = OD.ORD_NO
@@ -242,19 +241,18 @@
 						   AND P.PAY_STAT = 'G016_30'
 						 INNER JOIN TB_DELIVERY_ADDR DA
 							ON OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
-						  LEFT OUTER JOIN (SELECT OC.WD_INVOICE_NO
-												, OC.WD_INVOICE_SEND_YN
-												, OC.SHIP_COMP_CD
-												, OCD.ORD_DTL_NO
-												, OCD.CHG_QTY
+		<if test="(chgStat != null and chgStat != '') or (chgGb != null and chgGb != '')">
+						  LEFT OUTER JOIN (SELECT OCD.ORD_DTL_NO
+												, OC.CHG_GB
 												, OCD.CHG_STAT
 											 FROM TB_ORDER_CHANGE OC
 											INNER JOIN TB_ORDER_CHANGE_DETAIL OCD
 											   ON OC.ORD_CHG_SQ  = OCD.ORD_CHG_SQ
 											WHERE 1=1
-											GROUP BY OC.WD_INVOICE_NO, OC.WD_INVOICE_SEND_YN, OC.SHIP_COMP_CD, OCD.ORD_DTL_NO, OCD.CHG_QTY, OCD.CHG_STAT
+											GROUP BY OCD.ORD_DTL_NO, OC.CHG_GB, OCD.CHG_STAT
 										  ) OCD
 							ON OD.ORD_DTL_NO = OCD.ORD_DTL_NO
+		</if>
 						 WHERE 1=1
 		<if test='siteCd != null and siteCd != ""'>
 						   AND O.SITE_CD = #{siteCd}
@@ -288,10 +286,8 @@
 		<if test="chgStat != null and chgStat != ''">
 						   AND OCD.CHG_STAT = #{chgStat}
 		</if>
-		<if test="chgStat == null or chgStat == ''">
-			<if test="chgGb != null and chgGb != ''">
-						   AND OCD.CHG_STAT = #{chgGb}
-			</if>
+		<if test="chgGb != null and chgGb != ''">
+						   AND OCD.CHG_GB = #{chgGb}
 		</if>
 		<if test='search != null and search == "searchOrdNo"'>
 			<if test="condition != null and condition != ''">
@@ -490,6 +486,18 @@
 						THEN 0
 					ELSE OCD.ORD_REQ_CHG_QTY * ODI.ITEM_QTY
 			   END                                        ORD_REQ_CHG_QTY
+			 , CASE WHEN OCD.CANCEL_REQUEST_QTY IS NULL
+						THEN 0
+					ELSE OCD.CANCEL_REQUEST_QTY * ODI.ITEM_QTY
+			   END                                        CANCEL_REQUEST_QTY
+			 , CASE WHEN OCD.EXCHANGE_REQUEST_QTY IS NULL
+						THEN 0
+					ELSE OCD.EXCHANGE_REQUEST_QTY * ODI.ITEM_QTY
+			   END                                        EXCHANGE_REQUEST_QTY
+			 , CASE WHEN OCD.RETURN_REQUEST_QTY IS NULL
+						THEN 0
+					ELSE OCD.RETURN_REQUEST_QTY * ODI.ITEM_QTY
+			   END                                        RETURN_REQUEST_QTY
 			 , ODI.OPT_ADD_PRICE
 			 , ODI.CPN1_DC_AMT
 			 , ODI.GOODS_CPN_DC_AMT
@@ -564,6 +572,9 @@
 		    ON OD.ORD_DTL_NO = X.ORD_DTL_NO
 		  LEFT OUTER JOIN (SELECT OD.ORD_DTL_NO
 								, SUM(OCD.CHG_QTY) AS ORD_REQ_CHG_QTY
+		  						, SUM(IF(OCD.CHG_STAT = 'G685_20', OCD.CHG_QTY, 0)) AS CANCEL_REQUEST_QTY
+								, SUM(IF(OCD.CHG_STAT = 'G685_30', OCD.CHG_QTY, 0)) AS EXCHANGE_REQUEST_QTY
+								, SUM(IF(OCD.CHG_STAT = 'G685_40', OCD.CHG_QTY, 0)) AS RETURN_REQUEST_QTY
 							 FROM TB_ORDER_CHANGE_DETAIL OCD
 							INNER JOIN TB_ORDER_DETAIL OD
 							   ON OCD.ORD_DTL_NO = OD.ORD_DTL_NO
@@ -1577,7 +1588,7 @@
 	<update id="updateOrderChange" parameterType="Order">
 		/* order.updateOrderChange : 반품/교환 > 회수지 정보 수정 */
 		UPDATE TB_ORDER_CHANGE
-		   SET CHGER_ZIPCODE   = #{chgerZipCode}
+		   SET CHGER_ZIPCODE   = #{chgerZipcode}
 			 , CHGER_BASE_ADDR = #{chgerBaseAddr}
 			 , CHGER_DTL_ADDR  = #{chgerDtlAddr}
 			 , UPD_NO          = #{updNo}