Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.front into develop

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

@@ -464,22 +464,24 @@
 		                                                                  )
 		                                                  ) >0
 		                        ) 
-		                        OR /* 적용대상:브랜드*/
-		                        (CP.APPLY_SCOPE = 'I' AND (SELECT COUNT(1) FROM TB_COUPON_REFVAL
-		                                                   WHERE CPN_ID = CP.CPN_ID
-		                                                   AND CPN_TARGET = 'G260_12' 
-		                                                   AND DEL_YN = 'N'
-		                                                   AND REF_VAL = G.BRAND_CD
-		                                                   AND IFNULL(REF_FORMAL_GB,G.FORMAL_GB) = G.FORMAL_GB
-		                                                  ) >0
-		                        ) 
-		                        OR /* 적용대상:공급업체*/
-		                        (CP.APPLY_SCOPE = 'I' AND (SELECT COUNT(1) FROM TB_COUPON_REFVAL
-		                                                   WHERE CPN_ID = CP.CPN_ID
-		                                                   AND CPN_TARGET = 'G260_13' 
-		                                                   AND DEL_YN = 'N'
-		                                                   AND REF_VAL = G.SUPPLY_COMP_CD
-		                                                  ) >0
+		                        /* 2021.08.23 적용대상 : 브랜드, 공급업체 */
+		                        OR 
+		                        (CP.APPLY_SCOPE = 'I' AND (SELECT COUNT(1) 
+		                                                   FROM   TB_COUPON_REFVAL CR1
+		                                                   INNER  JOIN TB_COUPON_REFVAL CR2
+		                                                   ON     1=1
+		                                                   AND    CR2.CPN_ID = CP.CPN_ID
+		                                                   AND    CR2.CPN_TARGET = 'G260_12' 
+		                                                   AND    CR2.DEL_YN = 'N'
+		                                                   AND    CR2.REF_VAL = G.SUPPLY_COMP_CD
+		                                                   AND    IFNULL(CR1.REF_FORMAL_GB, G.FORMAL_GB) = G.FORMAL_GB
+		                                                   WHERE  1=1
+		                                                   AND    CR1.CPN_ID = CP.CPN_ID
+		                                                   AND    CR1.CPN_TARGET = 'G260_12' 
+		                                                   AND    CR1.DEL_YN = 'N'
+		                                                   AND    CR1.REF_VAL = G.BRAND_CD
+		                                                   AND    IFNULL(CR1.REF_FORMAL_GB, G.FORMAL_GB) = G.FORMAL_GB
+		                                                  ) > 0
 		                        )
 		                      )
 		                AND NOT EXISTS (
@@ -902,22 +904,24 @@
 		                                                                  )
 		                                                  ) >0
 		                        ) 
-		                        OR /* 적용대상:브랜드*/
-		                        (CP.APPLY_SCOPE = 'I' AND (SELECT COUNT(1) FROM TB_COUPON_REFVAL
-		                                                   WHERE CPN_ID = CP.CPN_ID
-		                                                   AND CPN_TARGET = 'G260_12' 
-		                                                   AND DEL_YN = 'N'
-		                                                   AND REF_VAL = G.BRAND_CD
-		                                                   AND IFNULL(REF_FORMAL_GB,G.FORMAL_GB) = G.FORMAL_GB
-		                                                  ) >0
-		                        ) 
-		                        OR /* 적용대상:공급업체*/
-		                        (CP.APPLY_SCOPE = 'I' AND (SELECT COUNT(1) FROM TB_COUPON_REFVAL
-		                                                   WHERE CPN_ID = CP.CPN_ID
-		                                                   AND CPN_TARGET = 'G260_13' 
-		                                                   AND DEL_YN = 'N'
-		                                                   AND REF_VAL = G.SUPPLY_COMP_CD
-		                                                  ) >0
+		                        /* 2021.08.23 적용대상 : 브랜드, 공급업체 and 조건변경 */
+		                        OR 
+		                        (CP.APPLY_SCOPE = 'I' AND (SELECT COUNT(1) 
+		                                                   FROM   TB_COUPON_REFVAL CR1
+		                                                   INNER  JOIN TB_COUPON_REFVAL CR2
+		                                                   ON     1=1
+		                                                   AND    CR2.CPN_ID = CP.CPN_ID
+		                                                   AND    CR2.CPN_TARGET = 'G260_12' 
+		                                                   AND    CR2.DEL_YN = 'N'
+		                                                   AND    CR2.REF_VAL = G.SUPPLY_COMP_CD
+		                                                   AND    IFNULL(CR1.REF_FORMAL_GB, G.FORMAL_GB) = G.FORMAL_GB
+		                                                   WHERE  1=1
+		                                                   AND    CR1.CPN_ID = CP.CPN_ID
+		                                                   AND    CR1.CPN_TARGET = 'G260_12' 
+		                                                   AND    CR1.DEL_YN = 'N'
+		                                                   AND    CR1.REF_VAL = G.BRAND_CD
+		                                                   AND    IFNULL(CR1.REF_FORMAL_GB, G.FORMAL_GB) = G.FORMAL_GB
+		                                                  ) > 0
 		                        )
 		                      )
 		                AND NOT EXISTS (