교환배송미출고대상개발중

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

@@ -49,7 +49,7 @@
 		  LEFT OUTER JOIN TB_CUSTOMER CU
 		    ON O.CUST_NO = CU.CUST_NO
 	 	 WHERE 1=1
-	 	   AND OD.ORD_DTL_STAT <![CDATA[<>]]> 'G013_00'
+	 	   AND OD.ORD_DTL_STAT NOT IN ('G013_00', 'G013_25', 'G013_97')
 		<if test='siteCd != null and siteCd != ""'>
 		   AND O.SITE_CD = #{siteCd}
 		</if>
@@ -295,7 +295,6 @@
 			                  FROM TB_ORDER O
 			                 INNER JOIN TB_ORDER_DETAIL OD
 			                    ON O.ORD_NO = OD.ORD_NO
-			                   AND OD.ORD_DTL_STAT <![CDATA[<>]]> 'G013_97'			-- 교환철회 상품 제외
 			                 INNER JOIN TB_GOODS G1
 			                    ON OD.GOODS_CD = G1.GOODS_CD
 			                 INNER JOIN TB_ORDER_DETAIL_ITEM ODI
@@ -324,7 +323,7 @@
 		                      LEFT OUTER JOIN TB_CUSTOMER CU
 		                        ON O.CUST_NO = CU.CUST_NO
 			                 WHERE 1=1
-			                   AND OD.ORD_DTL_STAT <![CDATA[<>]]> 'G013_00'
+			                   AND OD.ORD_DTL_STAT NOT IN ('G013_00', 'G013_25', 'G013_97')
 			<if test='siteCd != null and siteCd != ""'>
 			                   AND O.SITE_CD = #{siteCd}
 			</if>
@@ -757,6 +756,7 @@
 								   ON OCD.ORD_DTL_NO = OD.ORD_DTL_NO
 								WHERE 1 = 1
 								  AND OD.ORD_NO = #{ordNo}
+								  AND OD.ORD_DTL_STAT NOT IN ('G013_00', 'G013_25', 'G013_97')
 								  AND OCD.CHG_STAT IN ('G685_10', 'G685_11', 'G685_20', 'G685_21', 'G685_30', 'G685_31', 'G685_32', 'G685_33', 'G685_50', 'G685_51')
 								  AND OCD.DEL_YN = 'N'
 								GROUP BY OCD.ORD_DTL_NO
@@ -807,6 +807,8 @@
 		     , A.DELV_FEE_CD
 		     , A.DELV_FEE_CD_GRP
 		     , A.BRAND_GROUP_NM
+		 ORDER BY A.ORD_NO
+		     , A.ORD_DTL_NO DESC
 	</select>
 
 	<!-- 주문상세 > 사은품목록 -->

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

@@ -273,8 +273,14 @@
 		                    THEN 'WMS'
 		                    ELSE OD.DELV_FEE_CD
 		                    END  DELV_FEE_CD
-		             , X.CHG_QTY AS ORD_CAN_CHG_QTY
-		             , X.CHG_STAT
+		             , CASE WHEN X.CHG_STAT IS NOT NULL 
+		                    THEN X.CHG_QTY
+		                    ELSE Y.CNCL_RTN_QTY
+		                    END ORD_CAN_CHG_QTY
+		             , CASE WHEN X.CHG_STAT IS NOT NULL 
+		                    THEN X.CHG_STAT
+		                    ELSE Y.CHG_STAT
+		                    END CHG_STAT
 		        FROM   TB_ORDER_DETAIL OD
 		        INNER  JOIN TB_GOODS G1
 		        ON     OD.GOODS_CD = G1.GOODS_CD
@@ -319,6 +325,18 @@
 		               AND OCD.ORD_CHG_SQ = #{ordChgSq}
 		        ) X
 		        ON OD.ORD_DTL_NO = X.ORD_DTL_NO
+		        LEFT OUTER JOIN (
+		            SELECT EDF.ORD_DTL_NO
+		                 , EDF.CNCL_RTN_QTY
+		                 , OCD.CHG_STAT
+		              FROM TB_EXCHANGE_DELV_FAIL EDF
+		             INNER JOIN TB_ORDER_CHANGE_DETAIL OCD
+		                ON EDF.ORD_DTL_NO = OCD.CHG_ORD_DTL_NO
+		             WHERE OCD.DEL_YN = 'N'
+		               AND OCD.ORD_CHG_SQ = #{ordChgSq}
+		               AND EDF.DELV_CNCL_YN = 'N'
+		        ) Y
+		        ON OD.ORD_DTL_NO = Y.ORD_DTL_NO
 		        WHERE  1=1
 		        <if test="ordDtlStatArr != null and ordDtlStatArr != ''">
 		        AND OD. ORD_DTL_STAT IN
@@ -4494,6 +4512,7 @@
 		 WHERE OFG.ORD_NO = #{ordNo}
 		   AND OFG.DEL_YN = 'Y'
 	</select>
+	
 </mapper>