Explorar el Código

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

card007 hace 5 años
padre
commit
85cf2c8e24

+ 4 - 6
src/main/java/com/style24/persistence/mybatis/shop/TscOrder.xml

@@ -1648,7 +1648,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) 
@@ -1697,6 +1697,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
@@ -1731,10 +1733,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 +1760,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