ST24PRJ-521,ST24PRJ-647

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

@@ -847,6 +847,14 @@
 		     WHERE D.SELF_GOODS_YN  = 'Y'  -- 자사상품만
 		       AND B.ORD_DTL_STAT IN ('G013_20','G013_35')
 		       AND B.GOODS_TYPE    != 'G056_S'
+		       AND NOT EXISTS (
+		           SELECT 1
+		           FROM   TB_ORDER_DETAIL X
+		           WHERE  1=1
+		           AND    X.ORD_DTL_NO = B.ORD_DTL_NO
+		           AND    X.GIFT_PACK_YN = 'Y'
+		           AND    X.GIFT_ADDR_INP_YN = 'N'
+		       )
 			<include refid="getAssignListCondition_sql"/>
 		     UNION ALL
 		    SELECT B.ORD_DTL_NO   -- 주문상세번호
@@ -858,8 +866,16 @@
 		     WHERE D.SELF_GOODS_YN  = 'Y'  -- 자사상품만
 		       AND B.ORD_DTL_STAT IN ('G013_20','G013_35')
 		       AND B.GOODS_TYPE    = 'G056_S'
-		     GROUP  BY B.ORD_DTL_NO
-		          , B.GOODS_CD
+		       AND NOT EXISTS (
+		           SELECT 1
+		           FROM   TB_ORDER_DETAIL X
+		           WHERE  1=1
+		           AND    X.ORD_DTL_NO = B.ORD_DTL_NO
+		           AND    X.GIFT_PACK_YN = 'Y'
+		           AND    X.GIFT_ADDR_INP_YN = 'N'
+		       )
+		     GROUP BY B.ORD_DTL_NO
+		         , B.GOODS_CD
 			<include refid="getAssignListCondition_sql"/>
 		) A
 	</select>
@@ -920,6 +936,14 @@
 		            AND    D.SELF_GOODS_YN  = 'Y'  -- 자사상품만
 		            AND    B.ORD_DTL_STAT IN ('G013_20','G013_35')
 		            AND    B.GOODS_TYPE    != 'G056_S'
+		            AND    NOT EXISTS (
+		                SELECT 1
+		                FROM   TB_ORDER_DETAIL X
+		                WHERE  1=1
+		                AND    X.ORD_DTL_NO = B.ORD_DTL_NO
+		                AND    X.GIFT_PACK_YN = 'Y'
+		                AND    X.GIFT_ADDR_INP_YN = 'N'
+		            )
 					<include refid="getAssignListCondition_sql"/>
 		            UNION ALL
 		            SELECT A.SITE_CD      -- 사이트
@@ -953,6 +977,14 @@
 		            WHERE  D.SELF_GOODS_YN  = 'Y'  -- 자사상품만
 		            AND    B.ORD_DTL_STAT IN ('G013_20','G013_35')
 		            AND    B.GOODS_TYPE     = 'G056_S'
+		            AND    NOT EXISTS (
+		                SELECT 1
+		                FROM   TB_ORDER_DETAIL X
+		                WHERE  1=1
+		                AND    X.ORD_DTL_NO = B.ORD_DTL_NO
+		                AND    X.GIFT_PACK_YN = 'Y'
+		                AND    X.GIFT_ADDR_INP_YN = 'N'
+		            )
 					<include refid="getAssignListCondition_sql"/>
 					GROUP  BY A.SITE_CD      -- 사이트
 		                 , A.ORD_NO       -- 주문번호

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

@@ -183,6 +183,7 @@
 		    LEFT   OUTER JOIN TB_ORDER_DETAIL OD          ON B.ORDER_DTL_NO = OD.ORD_DTL_NO
 		    WHERE  1=1
 		    AND    B.REASON_CODE NOT IN('08','10')
+		    AND    CD.DEL_YN = 'N'
 			<if test='customerName != null and customerName != ""'>
 		    AND    A.CUSTOMER_NAME = #{customerName}
 		    </if>
@@ -354,6 +355,7 @@
 		            LEFT   OUTER JOIN TB_GOODS G ON OD.GOODS_CD = G.GOODS_CD 
 		            WHERE  1=1
 		            AND    B.REASON_CODE IN ('09','11')
+		            AND    CD.DEL_YN = 'N'
 					<if test='customerName != null and customerName != ""'>
 		            AND    A.CUSTOMER_NAME = #{customerName}
 					</if>
@@ -467,6 +469,7 @@
 		            LEFT   OUTER JOIN TB_GOODS G ON OD.GOODS_CD = G.GOODS_CD 
 		            WHERE  1=1
 		            AND    B.REASON_CODE IN('00','02','03','04','05','06','15')
+		            AND    CD.DEL_YN = 'N'
 					<if test='customerName != null and customerName != ""'>
 		            AND    A.CUSTOMER_NAME = #{customerName}
 					</if>
@@ -580,6 +583,7 @@
 		            LEFT   OUTER JOIN TB_GOODS G ON OD.GOODS_CD = G.GOODS_CD
 		            WHERE  1=1
 		            AND    B.REASON_CODE IN('01')
+		            AND    CD.DEL_YN = 'N'
 					<if test='customerName != null and customerName != ""'>
 		            AND    A.CUSTOMER_NAME = #{customerName}
 					</if>