Merge branch 'develop' into jmh

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

@@ -471,10 +471,10 @@
 		                                                   INNER  JOIN TB_COUPON_REFVAL CR2
 		                                                   ON     1=1
 		                                                   AND    CR2.CPN_ID = CP.CPN_ID
-		                                                   AND    CR2.CPN_TARGET = 'G260_12' 
+		                                                   AND    CR2.CPN_TARGET = 'G260_13' 
 		                                                   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
+		                                                   AND    IFNULL(CR2.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' 
@@ -721,22 +721,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_13' 
+		                                                   AND    CR2.DEL_YN = 'N'
+		                                                   AND    CR2.REF_VAL = G.SUPPLY_COMP_CD
+		                                                   AND    IFNULL(CR2.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 (
@@ -911,10 +913,10 @@
 		                                                   INNER  JOIN TB_COUPON_REFVAL CR2
 		                                                   ON     1=1
 		                                                   AND    CR2.CPN_ID = CP.CPN_ID
-		                                                   AND    CR2.CPN_TARGET = 'G260_12' 
+		                                                   AND    CR2.CPN_TARGET = 'G260_13' 
 		                                                   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
+		                                                   AND    IFNULL(CR2.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' 

src/main/webapp/WEB-INF/views/mob/order/OrderCompleteMob.html

@@ -550,7 +550,7 @@ for (i=0 ; i<orderDetailList.length ; i++) {
 	
 	// 코마스 광고 스크립트
 	setTimeout( function() {
-		cosemConvert([[${orderInfo.ordNo}]], (currPrice * ordQty), goodsCd, currPrice, currPrice, itemkindNm, brandGroupNm + "_" + goodsNm);
+		cosemConvert([[${orderInfo.ordNo}]], (currPrice * ordQty), goodsCd, ordQty, currPrice, itemkindNm, brandGroupNm + "_" + goodsNm);
 	}, 10);
 }
 /* END LOOP */

src/main/webapp/WEB-INF/views/web/goods/GoodsDetailFormWeb.html

@@ -1265,6 +1265,8 @@
 			</div>
 		</div>
 		<!-- // 이 상품과 함께 본 상품 -->
+		</th:block>
+		<!-- //2021.08.30 card007 추천솔루션 관련 주석처리 추후 주석 제거 필요 -->
 		<!-- STYLE24의 스타일링 추천 -->
 		<div class="content wide pd_recommend" th:if="${lookbookList != null and !lookbookList.empty}">
 			<div class="cont_head">
@@ -1348,6 +1350,8 @@
 			</div>
 		</div>
 		<!-- // STYLE24의 스타일링 추천 -->
+		<!-- 2021.08.30 card007 추천솔루션 관련 주석처리 추후 주석 제거 필요 -->
+		<th:block th:if="false">
 		<!-- 브랜드 추천상품 -->
 		<div class="content wide pd_brand" id="goodsRecommendbArea" th:if="${recommendGoodsList != null and !recommendGoodsList.empty}">
 			<div class="cont_head">

src/main/webapp/WEB-INF/views/web/order/OrderCompleteWeb.html

@@ -448,7 +448,7 @@ for (i=0 ; i<orderDetailList.length ; i++) {
 	
 	// 코마스 광고 스크립트
 	setTimeout( function() {
-		cosemConvert([[${orderInfo.ordNo}]], (currPrice * ordQty), goodsCd, currPrice, currPrice, itemkindNm, brandGroupNm + "_" + goodsNm);
+		cosemConvert([[${orderInfo.ordNo}]], (currPrice * ordQty), goodsCd, ordQty, currPrice, itemkindNm, brandGroupNm + "_" + goodsNm);
 	}, 10);
 }
 /* END LOOP */