Merge remote-tracking branch 'origin/develop' into develop

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

@@ -4745,23 +4745,37 @@
 	<!-- 환불컨펌시 배송중상태 조회 -->
 	<select id="getOrderDetailItem20Cnt" parameterType="Order" resultType="int">
 		/* TscOrderChange.getOrderDetailItem20Cnt : 환불컨펌시 배송중상태 조회 */
-		SELECT COUNT(1) AS CNT
-		FROM   TB_ORDER_DETAIL_ITEM_HST
-		WHERE  1=1
-		AND    ORD_DTL_ITEM_SQ = #{ordDtlItemSq}
-		AND    ORD_DTL_STAT = 'G720_20'
+		SELECT SUM(CNT) AS CNT
+		FROM (
+			SELECT CASE WHEN ODIH.ORD_DTL_STAT IS NULL AND ODI.REG_DT > '2021-09-01'
+			            THEN 0
+			            ELSE 1
+			            END  CNT
+			FROM   TB_ORDER_DETAIL_ITEM ODI
+			LEFT   JOIN TB_ORDER_DETAIL_ITEM_HST ODIH
+			ON     ODIH.ORD_DTL_ITEM_SQ = ODI.ORD_DTL_ITEM_SQ
+			AND    ODIH.ORD_DTL_STAT = 'G720_20'
+			WHERE  1=1
+			AND    ODI.ORD_DTL_ITEM_SQ = #{ordDtlItemSq}
+		) A
 	</select>
 	
 		<!-- 환불컨펌시 배송중상태 조회 전체취소 -->
 	<select id="getOrderDetailItem20CntAll" parameterType="OrderChange" resultType="int">
 		/* TscOrderChange.getOrderDetailItem20CntAll : 환불컨펌시 배송중상태 조회 전체취소 */
-		SELECT COUNT(1) AS CNT
-		FROM   TB_ORDER_DETAIL_ITEM_HST ODIH
-		INNER  JOIN TB_ORDER O
-		ON     ODIH.ORD_NO = O.ORD_NO
-		WHERE  1=1
-		AND    O.ORD_NO = #{ordNo}
-		AND    ODIH.ORD_DTL_STAT = 'G720_20'
+		SELECT SUM(CNT) AS CNT
+		FROM (
+			SELECT CASE WHEN ODIH.ORD_DTL_STAT IS NULL AND O.REG_DT > '2021-09-01'
+			            THEN 0
+			            ELSE 1
+			            END  CNT
+			FROM   TB_ORDER O
+			LEFT   JOIN TB_ORDER_DETAIL_ITEM_HST ODIH
+			ON     ODIH.ORD_NO = O.ORD_NO
+			AND    ODIH.ORD_DTL_STAT = 'G720_20'
+			WHERE  1=1
+			AND    O.ORD_NO = #{ordNo}
+		) A
 	</select>
 
 	<!-- 주문상세단품 정보 조회 -->