Merge branch 'master' of http://112.172.147.34:4936/style24/style24.doc.git

산출물/3.설계/05.DB-Object/01.db_view/VW_MAIN_CATEGORY.sql

@@ -19,7 +19,7 @@ SELECT
 	 , CLOC_PREFIX
 FROM(	SELECT	
 		  0							AS CATE1_NO
-		, '-----STYLE24 PC-----'	AS CATE1_NM
+		, '-----STYLE24-----'	AS CATE1_NM
 		, NULL						AS CATE2_NO
 		, NULL						AS CATE2_NM
 		, NULL						AS CATE3_NO
@@ -118,107 +118,5 @@ FROM(	SELECT
 		, 6					AS DISP_ORD
 		, 'SAD'				AS CLOC_PREFIX
 	FROM DUAL	
-	UNION ALL
-	SELECT	
-		  0								AS CATE1_NO
-		, '-----STYLE24 MOBILE-----'	AS CATE1_NM
-		, NULL						AS CATE2_NO
-		, NULL						AS CATE2_NM
-		, NULL						AS CATE3_NO
-		, NULL						AS CATE3_NM
-		, NULL						AS CATE4_NO
-		, NULL						AS CATE4_NM
-		, 50						AS DISP_ORD
-		, NULL						AS CLOC_PREFIX
-	FROM DUAL
-	UNION ALL
-	SELECT 
-		  1720						AS CATE1_NO
-		, '몰메인'					AS CATE1_NM
-		, NULL						AS CATE2_NO
-		, NULL						AS CATE2_NM
-		, NULL						AS CATE3_NO
-		, NULL						AS CATE3_NM
-		, NULL						AS CATE4_NO
-		, NULL						AS CATE4_NM
-		, 51						AS DISP_ORD
-		, 'SMM'						AS CLOC_PREFIX
-	FROM DUAL	
-	UNION ALL
-	SELECT 
-		  1721						AS CATE1_NO
-		, '브랜드메인'					AS CATE1_NM
-		, NULL						AS CATE2_NO
-		, NULL						AS CATE2_NM
-		, NULL						AS CATE3_NO
-		, NULL						AS CATE3_NM
-		, NULL						AS CATE4_NO
-		, NULL						AS CATE4_NM
-		, 52						AS DISP_ORD
-		, 'SBMM'						AS CLOC_PREFIX
-	FROM DUAL	
-	UNION ALL
-	SELECT 
-		 CATE1_NO
-		,CATE1_NM
-		,CATE2_NO
-		,CATE2_NM
-		,NULL 	AS CATE3_NO
-		,NULL 	AS CATE3_NM
-		,NULL 	AS CATE4_NO
-		,NULL 	AS CATE4_NM
-		,53 	AS DISP_ORD
-		,'SCMM' 	AS CLOC_PREFIX
-	FROM (
-		SELECT  1722	 			AS CATE1_NO
-				, '카테고리메인' 	AS CATE1_NM
-				, A.CATE1_NO		AS CATE2_NO
-				, A.CATE1_NM		AS CATE2_NM
-				, RANK() OVER(ORDER BY A.CATE1_NO) AS DISP_ORD
-		FROM 	TB_CATE_4SRCH A
-		WHERE 	A.SITE_CD = 'G000_10'
-		AND		A.CATE_GB = 'G032_101'
-		AND		A.CATE_TYPE = 'G031_10'
-		GROUP BY A.CATE1_NO, A.CATE1_NM
-	) A
-	UNION ALL
-	SELECT
-		  1723						AS CATE1_NO
-		, '아울렛메인'				AS CATE1_NM
-		, NULL						AS CATE2_NO
-		, NULL						AS CATE2_NM
-		, NULL						AS CATE3_NO
-		, NULL						AS CATE3_NM
-		, NULL						AS CATE4_NO
-		, NULL						AS CATE4_NM
-		, 54						AS DISP_ORD
-		, 'SOM'						AS CLOC_PREFIX
-	FROM DUAL	
-	UNION ALL
-	SELECT
-		  1724						AS CATE1_NO
-		, '상품상세메인'				AS CATE1_NM
-		, NULL						AS CATE2_NO
-		, NULL						AS CATE2_NM
-		, NULL						AS CATE3_NO
-		, NULL						AS CATE3_NM
-		, NULL						AS CATE4_NO
-		, NULL						AS CATE4_NM
-		, 55						AS DISP_ORD
-		, 'SPM'						AS CLOC_PREFIX
-	FROM DUAL		
-	UNION ALL
-	SELECT
-		  1725						AS CATE1_NO
-		, '광고상품메인'				AS CATE1_NM
-		, NULL						AS CATE2_NO
-		, NULL						AS CATE2_NM
-		, NULL						AS CATE3_NO
-		, NULL						AS CATE3_NM
-		, NULL						AS CATE4_NO
-		, NULL						AS CATE4_NM
-		, 56						AS DISP_ORD
-		, 'SAD'						AS CLOC_PREFIX
-	FROM DUAL		
 ) B
 ;

산출물/3.설계/05.DB-Object/06.DDL/table.sql

@@ -2711,14 +2711,23 @@ INSERT INTO TB_COMMON_CODE VALUES ('G045', 'G045_5', '5컷', NULL, 'Y', 5, 1, NO
 INSERT INTO TB_COMMON_CODE VALUES ('G045', 'G045_6', '6컷', NULL, 'Y', 6, 1, NOW(), 1, NOW());
 
 INSERT INTO TB_COMMON_CODE VALUES ('ROOT', 'G046', 'FAQ유형', NULL, 'Y', 46, 1, NOW(), 1, NOW());
-INSERT INTO TB_COMMON_CODE VALUES ('G046', 'G046_10', '배송', NULL, 'Y', 10, 1, NOW(), 1, NOW());
-INSERT INTO TB_COMMON_CODE VALUES ('G046', 'G046_20', '취소/교환/반품', NULL, 'Y', 20, 1, NOW(), 1, NOW());
-INSERT INTO TB_COMMON_CODE VALUES ('G046', 'G046_30', '주문/결제', NULL, 'Y', 30, 1, NOW(), 1, NOW());
-INSERT INTO TB_COMMON_CODE VALUES ('G046', 'G046_40', '영수증/세금계산서', NULL, 'N', 40, 1, NOW(), 1, NOW());
-INSERT INTO TB_COMMON_CODE VALUES ('G046', 'G046_50', '회원', NULL, 'Y', 50, 1, NOW(), 1, NOW());
-INSERT INTO TB_COMMON_CODE VALUES ('G046', 'G046_60', '포인트/쿠폰', NULL, 'Y', 60, 1, NOW(), 1, NOW());
-INSERT INTO TB_COMMON_CODE VALUES ('G046', 'G046_70', '상품권/기타', NULL, 'Y', 70, 1, NOW(), 1, NOW());
-INSERT INTO TB_COMMON_CODE VALUES ('G046', 'G046_80', '모바일', NULL, 'N', 80, 1, NOW(), 1, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G046', 'G046_10', '상품', NULL, 'Y', 10, 1, NOW(), 1, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G046', 'G046_20', '배송', NULL, 'Y', 20, 1, NOW(), 1, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G046', 'G046_30', '취소/반품/교환', NULL, 'Y', 30, 1, NOW(), 1, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G046', 'G046_40', '주문/결제', NULL, 'N', 40, 1, NOW(), 1, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G046', 'G046_50', '쿠폰/포인트/상품권', NULL, 'Y', 50, 1, NOW(), 1, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G046', 'G046_60', '회원/멤버쉽', NULL, 'Y', 60, 1, NOW(), 1, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G046', 'G046_70', '서비스/이벤트', NULL, 'Y', 70, 1, NOW(), 1, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G046', 'G046_80', '증빙서류', NULL, 'N', 80, 1, NOW(), 1, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G046', 'G046_90', '사이트 이용', NULL, 'N', 90, 1, NOW(), 1, NOW());
+-- INSERT INTO TB_COMMON_CODE VALUES ('G046', 'G046_10', '배송', NULL, 'Y', 10, 1, NOW(), 1, NOW());
+-- INSERT INTO TB_COMMON_CODE VALUES ('G046', 'G046_20', '취소/교환/반품', NULL, 'Y', 20, 1, NOW(), 1, NOW());
+-- INSERT INTO TB_COMMON_CODE VALUES ('G046', 'G046_30', '주문/결제', NULL, 'Y', 30, 1, NOW(), 1, NOW());
+-- INSERT INTO TB_COMMON_CODE VALUES ('G046', 'G046_40', '영수증/세금계산서', NULL, 'N', 40, 1, NOW(), 1, NOW());
+-- INSERT INTO TB_COMMON_CODE VALUES ('G046', 'G046_50', '회원', NULL, 'Y', 50, 1, NOW(), 1, NOW());
+-- INSERT INTO TB_COMMON_CODE VALUES ('G046', 'G046_60', '포인트/쿠폰', NULL, 'Y', 60, 1, NOW(), 1, NOW());
+-- INSERT INTO TB_COMMON_CODE VALUES ('G046', 'G046_70', '상품권/기타', NULL, 'Y', 70, 1, NOW(), 1, NOW());
+-- INSERT INTO TB_COMMON_CODE VALUES ('G046', 'G046_80', '모바일', NULL, 'N', 80, 1, NOW(), 1, NOW());
 
 INSERT INTO TB_COMMON_CODE VALUES ('ROOT', 'G047', '공지유형', NULL, 'Y', 47, 1, NOW(), 1, NOW());
 INSERT INTO TB_COMMON_CODE VALUES ('G047', 'G047_10', '사이트공지', NULL, 'Y', 10, 1, NOW(), 1, NOW());
@@ -5850,6 +5859,8 @@ COMMENT '투표문항답변. 투표의 문항에 대한 답변 등록에 의한
 
 CREATE INDEX IX_POLL_ANSWER_01 ON TB_POLL_ANSWER (POLL_QSQ, ANS_CUST_NO);
 
+ALTER TABLE TB_POLL_ANSWER
+  MODIFY COLUMN POLL_ASQ INT UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '투표답변일련번호';
 ALTER TABLE TB_POLL_ANSWER AUTO_INCREMENT = 1;
 
 ################################################################################
@@ -10969,6 +10980,7 @@ CREATE TABLE TB_ORDER_DETAIL (
   CONTENTS_LOC       VARCHAR(20)         NULL     COMMENT '컨텐츠위치(공통코드G028)', -- 컨텐츠위치(공통코드G028)
   PLAN_DTL_SQ        INT UNSIGNED        NULL     COMMENT '기획전상세번호', -- 기획전상세번호
   SOCIAL_SQ          INT UNSIGNED        NULL     COMMENT '소셜일련번호', -- 소셜일련번호
+  NPAY_ORD_DTL_NO    INT UNSIGNED        NULL     COMMENT '네이버페이_상품주문번호',  -- 네이버페이 상품주문번호(주문상세번호)
   REG_NO             INT UNSIGNED        NOT NULL COMMENT '등록자번호', -- 등록자번호
   REG_DT             TIMESTAMP           NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '등록일시', -- 등록일시
   UPD_NO             INT UNSIGNED        NOT NULL COMMENT '수정자번호', -- 수정자번호

산출물/4.구축/데이터처리/10.카테고리필터생성(최종)_배치적용해야함.sql

@@ -262,7 +262,7 @@ WITH TAB_FILTER AS (
                  , (MAX(CURR_PRICE) - MIN(CURR_PRICE)) / 5 AS SLICE_VAL /*분할값*/
             FROM   TAB_FILTER
             WHERE  FORMAL_GB IN ('G009_10','G009_20')
-            GROUP  BY SITE_CD, CATE_GB, BRAND_GROUP_NO, CATE1_NO
+            GROUP  BY SITE_CD, CATE_GB, BRAND_GROUP_NO
            ) Z
 	UNION ALL 
 	SELECT SITE_CD
@@ -286,7 +286,7 @@ WITH TAB_FILTER AS (
                  , (MAX(CURR_PRICE) - MIN(CURR_PRICE)) / 5 AS SLICE_VAL /*분할값*/
             FROM   TAB_FILTER
             WHERE  FORMAL_GB IN ('G009_20')
-            GROUP  BY SITE_CD, CATE_GB, BRAND_GROUP_NO, CATE1_NO
+            GROUP  BY SITE_CD, CATE_GB, BRAND_GROUP_NO
            ) Z
 )
 SELECT DISTINCT

산출물/4.구축/데이터처리/11.상품혜택생성(TB_GOODS_BENEFIT).sql

@@ -129,6 +129,18 @@ AND   NOT EXISTS (SELECT 1
                   WHERE  GOODS_CD = G.GOODS_CD
                   AND    DEL_YN = 'N'
                  )
+AND NOT EXISTS (
+		SELECT 1
+		FROM TB_RANDOM_COUPON RC
+		WHERE 1=1 
+		AND RC.CPN_ID = CP.CPN_ID
+	)
+AND NOT EXISTS (
+		SELECT 1
+		FROM TB_FIRST_COME_COUPON FCC
+		WHERE 1=1 
+		AND FCC.CPN_ID = CP.CPN_ID
+	)				 
 GROUP  BY G.GOODS_CD
 HAVING COUNT(*) > 0
 ;
@@ -174,6 +186,10 @@ FROM   (
         ON     F.FREEGIFT_SQ = FGA.FREEGIFT_SQ
         AND    FGA.GOODS_GB = 'G800_20'
         AND    FGA.TARGET_GB = 'G260_10'
+		INNER JOIN TB_FREEGIFT_VAL FGV	   
+		ON     F.FREEGIFT_SQ = FGV.FREEGIFT_SQ
+		AND    FGV.DEL_YN = 'N'
+		AND    FGV.LEFT_QTY - FGV.ITEM_QTY > 0
         INNER  JOIN TB_GOODS G
         ON     FGA.TARGET_VAL = G.GOODS_CD
         LEFT   OUTER JOIN TB_FREEGIFT_GOODS NOT_APPLY
@@ -203,6 +219,10 @@ FROM   (
         INNER  JOIN TB_FREEGIFT_GOODS_APPLY COMPANY_FGA
         ON     F.FREEGIFT_SQ = COMPANY_FGA.FREEGIFT_SQ
         AND    COMPANY_FGA.TARGET_GB = 'G260_13' /*업체*/
+		INNER JOIN TB_FREEGIFT_VAL FGV	   
+		ON     F.FREEGIFT_SQ = FGV.FREEGIFT_SQ
+		AND    FGV.DEL_YN = 'N'
+		AND    FGV.LEFT_QTY - FGV.ITEM_QTY > 0
         INNER  JOIN TB_GOODS G
         ON     BRAND_FGA.TARGET_VAL = G.BRAND_CD
         AND    COMPANY_FGA.TARGET_VAL = G.SUPPLY_COMP_CD