Browse Source

[ST24PRJ-19] [CS개선][클레임] 취소/교환/반품>접수/상세>SKUCODE추가 수정

card007 4 năm trước cách đây
mục cha
commit
a94d39af1c

+ 1 - 0
src/main/java/com/style24/persistence/mybatis/shop/TscOrder.xml

@@ -1690,6 +1690,7 @@
 		     , 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
+		     , ODI.OPT_CD
 		     , ODI.OPT_CD1
 		     , ODI.OPT_CD2
 		     , OCD.CHG_STAT

+ 2 - 1
src/main/java/com/style24/persistence/mybatis/shop/TscOrderChange.xml

@@ -135,7 +135,8 @@
 		               WHERE OCD.DEL_YN = 'N'
 		                 AND OCD.ORD_CHG_SQ = #{ordChgSq}
 		          ) X
-		            ON OD.ORD_DTL_NO = X.ORD_DTL_NO
+		            ON ODI.ORD_DTL_NO = X.ORD_DTL_NO
+		           AND ODI.OPT_CD = X.OPT_CD
 		         WHERE 1 = 1
 		<if test="ordDtlStatArr != null and ordDtlStatArr != ''">
 		           AND OD. ORD_DTL_STAT IN