Merge remote-tracking branch '112.172.147.34/style' into 제휴검색기능

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

@@ -1689,7 +1689,9 @@
 		     , OC.CHG_GB
 		     , FN_GET_CODE_NM('G680', OC.CHG_GB)       AS CHG_GB_NM
 		     , OD.GOODS_CD
-		     , IFNULL((SELECT COLOR_KNM FROM TB_COLOR WHERE COLOR_CD = IFNULL(NULLIF(ODI.OPT_CD1,'') , G.MAIN_COLOR_CD ) AND USE_YN  = 'Y'), ODI.OPT_CD1) AS COLOR_NM
+		     , G.GOODS_TYPE
+		     , FN_GET_CODE_NM('G056', G.GOODS_TYPE) AS GOODS_TYPE_NM
+--		     , IFNULL((SELECT COLOR_KNM FROM TB_COLOR WHERE COLOR_CD = IFNULL(NULLIF(ODI.OPT_CD1,'') , G.MAIN_COLOR_CD ) AND USE_YN  = 'Y'), ODI.OPT_CD1) AS COLOR_NM
 		     , ODI.OPT_CD
 		     , ODI.OPT_CD1
 		     , ODI.OPT_CD2
@@ -1734,16 +1736,16 @@
 		 INNER JOIN TB_GOODS G
 		    ON G.GOODS_CD = OD.GOODS_CD
 		 INNER JOIN (
-		      SELECT X.ORD_DTL_ITEM_SQ
-		           , X.ORD_DTL_NO
-		           , X.ITEM_CD
-		           , X.OPT_CD
-		           , X.OPT_CD1
-		           , X.OPT_CD2
+		      SELECT X.ORD_DTL_NO
+		           , GROUP_CONCAT(X.ITEM_CD ORDER BY X.ORD_DTL_ITEM_SQ) AS ITEM_CD
+		           , GROUP_CONCAT(X.OPT_CD ORDER BY X.ORD_DTL_ITEM_SQ) AS OPT_CD
+		           , GROUP_CONCAT(X.OPT_CD1 ORDER BY X.ORD_DTL_ITEM_SQ) AS OPT_CD1
+		           , GROUP_CONCAT(X.OPT_CD2 ORDER BY X.ORD_DTL_ITEM_SQ) AS OPT_CD2
 		        FROM TB_ORDER_DETAIL_ITEM X
 		       WHERE X.ORD_NO = #{ordNo}
-		       LIMIT 1
+		       GROUP BY X.ORD_DTL_NO
 		 ) ODI
+		    ON OD.ORD_DTL_NO = ODI.ORD_DTL_NO
 		 WHERE 1 = 1
 		   AND OD.ORD_NO = #{ordNo}
 		<if test='ordChgSq != null and ordChgSq != ""'>