주문서수정

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

@@ -2193,6 +2193,24 @@ public class TscOrderService {
 				goodsNm		= orderInfo.getGoodsNm();
 				ordNm		= orderInfo.getOrdNm();
 			}
+			
+			// 1.1 세트상품 옵션별 배열로 담기
+			if (orderInfo.getItemNm().contains("!@!")) {
+				orderInfo.setItemNmArr(orderInfo.getItemNm().split("!@!"));
+				orderInfo.setOptCdArr(orderInfo.getOptCd().split(","));
+				orderInfo.setItemQtyArr(orderInfo.getItemQtyr().split(","));
+				orderInfo.setOptCd1Arr(orderInfo.getOptCd1().split(","));
+				orderInfo.setOptCd2Arr(orderInfo.getOptCd2().split(","));
+				orderInfo.setColorNmArr(orderInfo.getColorNm().split(","));
+			} else {
+				String[] arr = {orderInfo.getItemNm()}, arr2 = {orderInfo.getOptCd1()}, arr3 = {orderInfo.getOptCd2()}, arr4 = {orderInfo.getItemQtyr()}, arr5 = {orderInfo.getColorNm()};
+				orderInfo.setItemNmArr(arr);
+				orderInfo.setOptCd1Arr(arr2);
+				orderInfo.setOptCd2Arr(arr3);
+				orderInfo.setItemQtyArr(arr4);
+				orderInfo.setColorNmArr(arr5);
+			}
+						
 			index++;
 		}
 		

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

@@ -1775,8 +1775,7 @@
 		            ON BR.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
 		          LEFT JOIN TB_OPTION OP
 		            ON CD.ITEM_CD = OP.GOODS_CD
-		           AND CD.OPT_CD1 = OP.OPT_CD1
-		           AND CD.OPT_CD2 = OP.OPT_CD2
+		           AND CD.OPT_CD = OP.OPT_CD
 		          LEFT OUTER JOIN VW_STOCK VS
 		            ON CD.ITEM_CD = VS.GOODS_CD
 		           AND CD.OPT_CD = VS.OPT_CD
@@ -3946,7 +3945,8 @@
 		     , GROUP_CONCAT(Z.OPT_CD2    ORDER BY Z.ORD_DTL_ITEM_SQ)                    AS OPT_CD2
 		     , GROUP_CONCAT(Z.ITEM_QTY   ORDER BY Z.ORD_DTL_ITEM_SQ)                    AS ITEM_QTYR
 		     , GROUP_CONCAT(Z.COLOR_NM   ORDER BY Z.ORD_DTL_ITEM_SQ)                    AS COLOR_NM
-			 , GROUP_CONCAT(Z.SYS_IMG_NM   ORDER BY Z.ORD_DTL_ITEM_SQ)                  AS SYS_IMG_NM
+		     , GROUP_CONCAT(Z.SYS_IMG_NM   ORDER BY Z.ORD_DTL_ITEM_SQ)                  AS SYS_IMG_NM
+		     , Z.BRAND_GROUP_NM
 		FROM (
 		    SELECT OD.ORD_NO
 		         , OCD.ORD_DTL_NO
@@ -3975,6 +3975,7 @@
 		         , OC.CHGER_NM
 		         , OC.CHGER_PHNNO
 		         , O.ORD_NM
+		         , (CASE WHEN BG.DISP_NM_LANG = 'EN' THEN BG.BRAND_GROUP_ENM ELSE BG.BRAND_GROUP_KNM END) AS BRAND_GROUP_NM
 		    FROM   TB_ORDER_CHANGE_DETAIL OCD
 		    INNER  JOIN TB_ORDER_CHANGE OC
 		    ON     OCD.ORD_CHG_SQ = OC.ORD_CHG_SQ
@@ -3988,6 +3989,8 @@
 		    ON     OD.GOODS_CD = G.GOODS_CD
 		    INNER  JOIN TB_BRAND BR
 		    ON     G.BRAND_CD = BR.BRAND_CD
+		    INNER  JOIN TB_BRAND_GROUP BG
+		    ON     BR.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
 		    LEFT   OUTER JOIN TB_REFUND RF
 		    ON     RF.ORD_CHG_SQ = OC.ORD_CHG_SQ
 		    WHERE  1=1
@@ -4011,6 +4014,7 @@
 		     , Z.CURR_PRICE 
 		     , Z.CHGER_NM
 		     , Z.CHGER_PHNNO
+		     , Z.BRAND_GROUP_NM
 	</select>
 	
 	<!-- 추가결제 반품,교환 상태값 업데이트 -->