Merge branch 'stage_tsit' into card007

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

@@ -1491,10 +1491,14 @@
 			   AND B.ORD_EXCH_GB = 'O'
 			   AND 2 <= FN_GET_BIZDAYS(DATE_FORMAT(A.ORD_DT, '%Y%m%d') , DATE_FORMAT(DATE_ADD(NOW(),INTERVAL -1 DAY ), '%Y%m%d'))
 			   AND A.ORD_DT >= DATE_ADD(DATE_FORMAT('20210831160000','%Y%m%d%H%i%S') , INTERVAL 0 DAY)   -- 오픈 시점 날짜 세팅 후 주석풀기
-			   AND NOT EXISTS (SELECT 1 FROM TB_ORDER_CHANGE_DETAIL OCD WHERE OCD.ORD_DTL_NO = B.ORD_DTL_NO AND OCD.CHG_STAT ='G685_10')
-		
+			   AND NOT EXISTS (
+		            SELECT 1 
+		            FROM   TB_ORDER_CHANGE_DETAIL OCD 
+		            WHERE  OCD.ORD_DTL_NO = B.ORD_DTL_NO 
+		            AND    OCD.CHG_STAT ='G685_10'
+			   )
+			   AND GIFT_PACK_YN = 'N' -- 선물주문이아닌주문
 			UNION ALL  
-			 
 			SELECT A.ORD_NO 
 			  FROM TB_ORDER A 
 			  JOIN TB_ORDER_DETAIL B ON A.ORD_NO = B.ORD_NO 
@@ -1506,8 +1510,35 @@
 			   AND B.ORD_EXCH_GB = 'O'
 			   AND D.DELV_RES_DT  < NOW()
 			   AND 2 <= FN_GET_BIZDAYS(DATE_FORMAT(CASE WHEN  A.ORD_DT < D.DELV_RES_DT THEN D.DELV_RES_DT ELSE A.ORD_DT END, '%Y%m%d') , DATE_FORMAT(DATE_ADD(NOW(),INTERVAL -1 DAY ), '%Y%m%d'))
-			   AND CASE WHEN  A.ORD_DT < D.DELV_RES_DT THEN D.DELV_RES_DT ELSE A.ORD_DT END  >= DATE_ADD(DATE_FORMAT('20210831160000','%Y%m%d%H%i%S') , INTERVAL 0 DAY)   -- 오픈 시점 날짜 세팅 후 주석풀기 
-			   AND NOT EXISTS (SELECT 1 FROM TB_ORDER_CHANGE_DETAIL OCD WHERE OCD.ORD_DTL_NO = B.ORD_DTL_NO AND OCD.CHG_STAT ='G685_10')
+			   AND CASE WHEN A.ORD_DT < D.DELV_RES_DT 
+			            THEN D.DELV_RES_DT 
+			            ELSE A.ORD_DT 
+			             END >= DATE_ADD(DATE_FORMAT('20210831160000','%Y%m%d%H%i%S') , INTERVAL 0 DAY)   -- 오픈 시점 날짜 세팅 후 주석풀기 
+			   AND NOT EXISTS (
+		            SELECT 1 
+		            FROM   TB_ORDER_CHANGE_DETAIL OCD 
+		            WHERE  OCD.ORD_DTL_NO = B.ORD_DTL_NO 
+		            AND    OCD.CHG_STAT ='G685_10'
+			   )
+			   AND GIFT_PACK_YN = 'N' -- 선물주문이아닌주문
+			 UNION ALL  
+			SELECT A.ORD_NO 
+			  FROM TB_ORDER A 
+			  JOIN TB_ORDER_DETAIL B ON A.ORD_NO = B.ORD_NO 
+			  JOIN TB_GOODS        C ON B.GOODS_CD = C.GOODS_CD 
+			 WHERE B.ORD_DTL_STAT  = 'G013_20' -- 결재완료 
+			   AND C.SELF_GOODS_YN = 'Y'       -- 자사 상품
+			   AND B.ORD_EXCH_GB = 'O'
+			   AND 4 <= FN_GET_BIZDAYS(DATE_FORMAT(A.ORD_DT, '%Y%m%d') , DATE_FORMAT(DATE_ADD(NOW(),INTERVAL -1 DAY ), '%Y%m%d'))
+			   AND A.ORD_DT >= DATE_ADD(DATE_FORMAT('20210831160000','%Y%m%d%H%i%S') , INTERVAL 0 DAY)   -- 오픈 시점 날짜 세팅 후 주석풀기
+			   AND NOT EXISTS (
+		            SELECT 1 
+		            FROM   TB_ORDER_CHANGE_DETAIL OCD 
+		            WHERE  OCD.ORD_DTL_NO = B.ORD_DTL_NO 
+		            AND    OCD.CHG_STAT ='G685_10'
+			   )
+			   AND B.GIFT_PACK_YN = 'Y' -- 선물주문이아닌주문
+			   AND B.GIFT_ADDR_INP_YN = 'Y' -- 주소입력완료
 		) A 
 		GROUP BY A.ORD_NO
 		ORDER BY ORD_NO