08.30

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

@@ -1434,6 +1434,7 @@
 			   AND A.SWT_TRC_SEND_YN = 'N'
 			   AND A.WD_GB           = 'W'
 			   AND B.CHG_STAT IN('G685_30') --  회수요청
+			   AND A.REG_DT >= DATE_ADD(STR_TO_DATE(REPLACE( '2021-09-01','-','')+ 1, '%Y%m%d%H%i%s'), INTERVAL 0 DAY) 
 			 GROUP BY A.WD_INVOICE_NO, A.SHIP_COMP_CD, A.ORD_CHG_SQ 
 		 ) A WHERE SWT_SHIP_COMP_CD IS NOT NULL AND SWT_SHIP_COMP_CD != ''
 	</select>
@@ -1487,7 +1488,7 @@
 			   AND C.SELF_GOODS_YN = 'Y'       -- 자사 상품
 			   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('20210831','%Y%m%d%H%i%S') , INTERVAL 0 DAY)   -- 오픈 시점 날짜 세팅 후 주석풀기
+			   AND A.ORD_DT >= DATE_ADD(DATE_FORMAT('20210831160000','%Y%m%d%H%i%S') , INTERVAL 0 DAY)   -- 오픈 시점 날짜 세팅 후 주석풀기
 	
 			UNION ALL  
 			 
@@ -1502,7 +1503,7 @@
 			   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 A.ORD_DT >= DATE_ADD(DATE_FORMAT('20210831','%Y%m%d%H%i%S') , INTERVAL 0 DAY)   -- 오픈 시점 날짜 세팅 후 주석풀기 
+			   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)   -- 오픈 시점 날짜 세팅 후 주석풀기 
 		) A 
 		GROUP BY A.ORD_NO
 		ORDER BY ORD_NO
@@ -1543,12 +1544,15 @@
 	<!-- 품절대상 출고예외 주문 목록 조회         -->	
 	<select id="getSoldoutOrderExcNoList" resultType="Delivery" timeout="600">
 		/*TsbDelivery.getSoldoutOrderExcNoList*/
+		<![CDATA[
 		SELECT A.ORD_NO 
 		  FROM TB_ORDER_DELIVERY_EXCEPTION A 
 		  JOIN TB_ORDER_DELIVERY_EXCEPTION_ITEM B ON A.DELIVERY_EXCEPTION_SQ = B.DELIVERY_EXCEPTION_SQ 
 		 WHERE A.COMPLTED_YN = 'N'
 		   AND B.GIFT_YN     = 'N'
+		   AND A.REG_DT >= DATE_ADD(DATE_FORMAT('20210901','%Y%m%d%H%i%S') , INTERVAL 0 DAY)
 		 GROUP BY A.ORD_NO 
+		 ]]>
 	</select>
 	
 	<!-- 품절대상 출고예외 주문상세 목록 조회         -->
@@ -1608,6 +1612,7 @@
 		  FROM TB_ORDER_RECALL_EXCEPTION A 
 		  JOIN TB_ORDER_RECALL_EXCEPTION_ITEM B ON A.RECALL_EXCEPTION_NO = B.RECALL_EXCEPTION_NO 
 		  JOIN TB_ORDER                         C ON A.ORDER_NO = C.ORD_NO 
+		  JOIN TB_ORDER_DETAIL                 OD ON A.ORDER_NO = OD.ORD_NO AND B.ORDER_DTL_NO = OD.ORD_DTL_NO AND OD.ORD_DTL_STAT NOT IN('G013_99')
 		  JOIN TB_PAYMENT                       D ON A.ORDER_NO = D.ORD_NO   AND D.PAY_STAT = 'G016_30'
 		  LEFT OUTER JOIN TB_CUST_ACCOUNT       E ON C.CUST_NO = E.CUST_NO   AND E.DEL_YN = 'N' AND E.CUST_NO NOT IN(0)
 		 WHERE B.REASON_CODE IN ('08','10')

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

@@ -2471,6 +2471,7 @@
 	<!-- TB_SELL_QTY 테이블 생성 -->
 	<insert id="createTtbSellQty"  timeout="300">
 		/* TsbGoods.createTtbSellQty */
+		<![CDATA[
 		INSERT INTO TB_SELL_QTY (
 		      GOODS_CD
 		    , OPT_CD
@@ -2503,12 +2504,15 @@
 		                     AND OD.ORD_DTL_STAT IN ('G013_10','G013_20','G013_25','G013_30','G013_35','G013_40') -- 입금대기, 결제완료, 교환대기, 상품준비중,출고처지정,배송준비중
 		                     AND OD.GOODS_CD = G.GOODS_CD
 		                     AND G.SELF_GOODS_YN ='Y'
+		                     AND OD.REG_DT >= DATE_ADD(DATE_FORMAT('20210831','%Y%m%d%H%i%S') , INTERVAL 0 DAY) 
 		                    )
+		]]>
 	</insert>
 
 	<!-- TB_SELL_QTY 테이블 생성 -->
 	<insert id="createTtbSellQtyByOrderDetail"  timeout="300">
 		/* TsbGoods.createTtbSellQtyByOrderDetail */
+		<![CDATA[
 		INSERT INTO TB_SELL_QTY (
 		      GOODS_CD
 		    , OPT_CD
@@ -2542,6 +2546,7 @@
 		      WHERE OD.ORD_DTL_NO = ODI.ORD_DTL_NO
 		      AND OD.ORD_DTL_STAT IN ('G013_10','G013_20','G013_25','G013_30','G013_35','G013_40') -- 입금대기, 결제완료, 교환대기, 상품준비중,출고처지정,배송준비중
 		      AND EXISTS (SELECT 1 FROM TB_OPTION X WHERE X.GOODS_CD = ODI.ITEM_CD AND X.OPT_CD = ODI.OPT_CD)
+		      AND OD.REG_DT >= DATE_ADD(DATE_FORMAT('20210831','%Y%m%d%H%i%S') , INTERVAL 0 DAY) 
 		      GROUP BY ODI.ITEM_CD, ODI.OPT_CD, OD.ORD_DTL_NO, OD.AGENT_ORDER_ID, OD.EXTMALL_ORDER_ID
 		     ) A
 		WHERE NOT EXISTS (SELECT 1
@@ -2551,6 +2556,7 @@
 		                  AND Y.SELL_GB = A.SELL_GB
 		                  AND Y.ORD_DTL_NO = A.ORD_DTL_NO
 		                  )
+		]]>
 	</insert>
 
 	<!-- 입고상품중 온라인 옵션이 없는 상품옵션 추가  -->