Merge branch 'yujung_style' into style

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

@@ -14,9 +14,8 @@
 	<delete id="deleteCartDetail" parameterType="Order">
 		/* TsbCart.deleteCartDetail : 장바구니 마스터 정보 없는 상세데이터 삭제 */
 		DELETE FROM TB_CART_DETAIL CD
-		WHERE  CD.CART_SQ NOT IN (SELECT CA.CART_SQ
-		                          FROM   TB_CART CA
-		                          WHERE  CA.REG_DT > CAST(ADDDATE(NOW(), INTERVAL -${saveLimitDay} DAY) AS DATE))			/* DeadLock 발생으로 날짜 조건 추가 */
+		WHERE  1=1
+		AND    CD.REG_DT <![CDATA[ < ]]> CAST(ADDDATE(NOW(), INTERVAL -${saveLimitDay} DAY) AS DATE)
 	</delete>
 
 	<!-- 장바구니 미구매 상품 존재 알림(앱푸시) 대상 리스트트(장바구니 삭제 10일전) -->

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

@@ -122,10 +122,11 @@
 		SELECT OD.ORD_DTL_NO
 		FROM   TB_ORDER_DETAIL OD
 		WHERE  OD.ORD_DTL_STAT = 'G013_60'
-		AND    DATEDIFF(NOW(), OD.DELV_EDDT) > (
+		AND    OD.REG_DT <![CDATA[>]]> '2021-08-15'
+		AND    DATEDIFF(NOW(), OD.DELV_EDDT) <![CDATA[>]]> (
 		                                        SELECT STR_SET_VAL2 -- 자동 구매확정처리일수(배송완료일 기준)
 			                                    FROM   TB_ENVSET
-			                                   WHERE  ENVSET_SQ = (
+			                                    WHERE  ENVSET_SQ = (
 			                                                        SELECT MAX(ENVSET_SQ)
 			                                                        FROM   TB_ENVSET
 			                                                        WHERE  SITE_CD = 'G000_10'