Merge remote-tracking branch 'origin/ST24PRJ-4(회수상품정보,금액정보노출)' into develop

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

@@ -1523,6 +1523,7 @@
 		     , A.DELV_LOC_NM
 		     , A.PG_GB
 		     , A.SUPPLY_COMP_NM
+		     , A.ORD_CHG_SQ
 		FROM (
 		    SELECT OD.ORD_NO
 		         , OD.ORD_EXCH_GB
@@ -1615,6 +1616,7 @@
 		         , (SELECT Z.SUPPLY_COMP_NM
 		            FROM   TB_SUPPLY_COMPANY Z
 		            WHERE  Z.SUPPLY_COMP_CD = OD.SUPPLY_COMP_CD) AS SUPPLY_COMP_NM
+		         , OCD2.ORD_CHG_SQ
 		      FROM TB_ORDER O
 		     INNER JOIN TB_ORDER_DETAIL OD
 		        ON O.ORD_NO = OD.ORD_NO
@@ -1671,6 +1673,9 @@
 		                   GROUP BY OCD.ORD_DTL_NO
 		                      ) OCD
 		        ON OD.ORD_DTL_NO = OCD.ORD_DTL_NO
+		      LEFT OUTER JOIN TB_ORDER_CHANGE_DETAIL OCD2
+		        ON OD.ORD_DTL_NO = OCD2.CHG_ORD_DTL_NO
+		       AND OCD2.DEL_YN = 'N'
 		     WHERE 1 = 1
 		       AND OD.ORD_NO = #{ordNo}
 		       AND OD.ORD_DTL_STAT NOT IN ('G013_00', 'G013_25', 'G013_97')
@@ -1723,6 +1728,7 @@
 		     , A.DELV_LOC_NM
 		     , A.PG_GB
 		     , A.SUPPLY_COMP_NM
+		     , A.ORD_CHG_SQ
 		 ORDER BY A.ORD_NO
 		     , A.ORD_DTL_NO
 	</select>

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

@@ -600,6 +600,18 @@
 		             , OCD.WH_MEMO
 		             , O.ORD_NM
 		             , O.ORD_PHNNO
+		             , OD.ORD_AMT
+		             , OD.CNCL_RTN_AMT
+		             , OD.CPN1_DC_AMT
+		             , OD.TMTB1_DC_AMT
+		             , OD.TMTB2_DC_AMT
+		             , OD.GOODS_CPN_DC_AMT
+		             , OD.CART_CPN_DC_AMT
+		             , OD.PRE_PNT_DC_AMT
+		             , OD.PNT_DC_AMT
+		             , OD.REAL_ORD_AMT
+		             , OD.GFCD_USE_AMT
+		             , OD.SAVE_PNT_AMT
 		        FROM   TB_ORDER_CHANGE_DETAIL OCD
 		        INNER  JOIN TB_ORDER_CHANGE OC
 		        ON     OCD.ORD_CHG_SQ = OC.ORD_CHG_SQ