Merge remote-tracking branch 'origin/order' into jsh77b

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

@@ -1625,6 +1625,7 @@
 			 , GROUP_CONCAT(Z.OPT_CD1 ORDER BY Z.CART_DTL_SQ) AS OPT_CD1
 			 , GROUP_CONCAT(Z.OPT_CD2 ORDER BY Z.CART_DTL_SQ) AS OPT_CD2
 			 , GROUP_CONCAT(Z.ITEM_QTY ORDER BY Z.CART_DTL_SQ) AS ITEM_QTYR
+			 , MAX(Z.ORDER_GRADE) AS ORDER_GRADE
 			 , Z.GOODS_QTY
 			 , Z.GOODS_TYPE
 			 , Z.LIST_PRICE
@@ -1648,7 +1649,7 @@
 			 , Z.CPN1_CPN_SQ
 		     , Z.PNT_PRATE
 		     , Z.PNT_MRATE
-			 , GI.SYS_IMG_NM
+			 , Z.SYS_IMG_NM
 			 , CASE WHEN #{frontGb} = 'P' 
 			        THEN (Z.CURR_PRICE * Z.GOODS_QTY) * (Z.PNT_PRATE/100)
 					ELSE (Z.CURR_PRICE * Z.GOODS_QTY) * (Z.PNT_MRATE/100) 
@@ -1682,6 +1683,10 @@
 		             , G.PNT_PRATE
 					 , G.PNT_MRATE
 					 , DFP.SUPPLY_COMP_CD
+					 , CT.CUST_GRADE
+					 , CASE WHEN GOG.CUST_GRADE IS NOT NULL AND GOG.CUST_GRADE = IFNULL(CT.CUST_GRADE, '') THEN GOG.CUST_GRADE
+							WHEN GOG.CUST_GRADE IS NOT NULL THEN 'NO'
+							ELSE CT.CUST_GRADE END AS ORDER_GRADE
 					 , CASE WHEN G.SELF_GOODS_YN = 'Y' THEN 'WMS'
 							ELSE DFP.DELV_FEE_CD END AS DELV_FEE_CD
 					 , CASE WHEN GRS.DELV_RES_DT IS NOT NULL THEN 'RES'
@@ -1697,6 +1702,8 @@
 					 , IFNULL(OP.ADD_PRICE, 0) AS OPT_ADD_PRICE
 					 , CASE WHEN G.SELF_GOODS_YN = 'Y' AND G.GOODS_TYPE != 'G056_S' THEN CD.OPT_CD1
 							ELSE '00' END AS COLOR_CD
+					 , CASE WHEN G.GOODS_TYPE != 'G056_S' AND G.SELF_GOODS_YN = 'Y' THEN (SELECT SYS_IMG_NM FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = CD.OPT_CD1 AND DEFAULT_IMG_YN = 'Y' LIMIT 1)
+							ELSE (SELECT SYS_IMG_NM FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = G.MAIN_COLOR_CD AND DEFAULT_IMG_YN = 'Y' LIMIT 1) END AS SYS_IMG_NM
 				  FROM TB_CART CA
 				 INNER JOIN TB_CART_DETAIL CD
 					ON CA.CART_SQ = CD.CART_SQ
@@ -1717,6 +1724,10 @@
 					ON CA.GOODS_CD = GRS.GOODS_CD
 				   AND GRS.USE_YN = 'Y'
 				   AND GRS.DELV_RES_DT > NOW()
+				  LEFT OUTER JOIN TB_CUSTOMER CT
+				    ON CA.CUST_NO = CT.CUST_NO
+				  LEFT OUTER JOIN TB_GOODS_ORDER_GRADE GOG
+				    ON G.GOODS_CD = GOG.GOODS_CD
 				 WHERE 1 = 1
 				   AND G.GOODS_STAT = 'G008_90'
 				<if test="custNo == 0">
@@ -1731,10 +1742,6 @@
 					#{item}
 				</foreach>
 			) Z
-		LEFT   OUTER JOIN TB_GOODS_IMG GI
-		ON	   Z.GOODS_CD = GI.GOODS_CD
-		AND	   Z.OPT_CD1 = GI.COLOR_CD
-		AND    GI.DEFAULT_IMG_YN = 'Y'
 		GROUP  BY Z.CART_SQ
 			 , Z.BRAND_ENM
 			 , Z.GOODS_NM
@@ -1762,7 +1769,7 @@
 			 , Z.OPT_ADD_PRICE
 		     , Z.PNT_PRATE
 		     , Z.PNT_MRATE
-			 , GI.SYS_IMG_NM
+			 , Z.SYS_IMG_NM
 		ORDER  BY Z.SUPPLY_COMP_CD
 				, Z.DELV_FEE_CD
 				, Z.GOODS_CD

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

@@ -138,6 +138,12 @@
 			<foreach collection="ordDtlStatArr" item="item" index="index"  open="(" close=")" separator=",">
 				#{item}
 			</foreach>
+		</if>
+		<if test="ordDtlNoArr != null and ordDtlNoArr != ''">
+			   AND OD. ORD_DTL_NO IN
+			<foreach collection="ordDtlNoArr" item="item" index="index"  open="(" close=")" separator=",">
+				#{item}
+			</foreach>
 		</if>
 			   AND OD.ORD_NO = #{ordNo}
 		) Z