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

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

@@ -1,6 +1,6 @@
 DROP VIEW VW_SEARCH_GOODS;
 CREATE VIEW VW_SEARCH_GOODS AS
-SELECT DISTINCT G.GOODS_CD
+SELECT DISTINCT  G.GOODS_CD
      , IF(G.SELF_GOODS_YN  = 'Y', O.OPT_CD1, G.MAIN_COLOR_CD) AS COLOR_CD
      , (SELECT GROUP_CONCAT(DISTINCT CONCAT(T.OPT_CD2,'|',T.SOLDOUT_YN, '|', VS.CURR_STOCK_QTY)) FROM TB_OPTION T 
                                                                          INNER JOIN VW_STOCK VS ON T.GOODS_CD = VS.GOODS_CD 
@@ -32,14 +32,20 @@ SELECT DISTINCT G.GOODS_CD
      , G.ITEMKIND_CD
      , G.FORMAL_GB
      , G.LIST_PRICE
-     , BP.CURR_PRICE
-     , 100 - ROUND((BP.CURR_PRICE / G.LIST_PRICE) * 100 ,0) AS DC_RATE
+     , G.CURR_PRICE
+     , BP.PC_CURR_PRICE
+     , BP.MO_CURR_PRICE
+     , BP.APP_CURR_PRICE
+     -- , BP.CURR_PRICE
+     -- , 100 - ROUND((BP.CURR_PRICE / G.LIST_PRICE) * 100 ,0) AS DC_RATE
      , G.SELF_GOODS_YN
      , G.GOODS_STAT
      , G.PNT_PRATE
      , G.PRE_PPNT_USABLE_YN
      , G.PNT_MRATE
      , G.PRE_MPNT_USABLE_YN
+     -- , (CASE WHEN  'P' /**P*/ = 'P' THEN G.PNT_PRATE ELSE G.PNT_MRATE END) AS PNT_RATE
+     -- , (CASE WHEN  'P' /**P*/ = 'P' THEN G.PRE_PPNT_USABLE_YN ELSE G.PRE_MPNT_USABLE_YN END) AS PRE_PNT_USABLE_YN
      , G.MIN_ORD_QTY
      , G.MAX_ORD_QTY
      , G.DAY_MAX_ORD_QTY
@@ -48,7 +54,7 @@ SELECT DISTINCT G.GOODS_CD
      , E.DELV_FEE
      , E.MIN_ORD_AMT
      , G.GOODS_GB
-     , (SELECT NI_CLSF_CD FROM TB_ITEMKIND  WHERE ITEMKIND_CD = G.ITEMKIND_CD) AS NI_CLSF_CD
+     , (SELECT MAX(NI_CLSF_CD) FROM tb_goods_noti_info  WHERE GOODS_CD = G.GOODS_CD) AS NI_CLSF_CD
      , G.MAIN_COLOR_CD
      , G.SUPPLY_COMP_CD
      , G.SELF_MALL_YN
@@ -56,13 +62,13 @@ SELECT DISTINCT G.GOODS_CD
      , FN_GET_CODE_NM('G023',G.AGE_GRP_CD) AGE_GRP_NM
      , G.SEASON_CD 
      , FN_GET_CODE_NM('G006',G.SEASON_CD) SEASON_NM
-     , G.GIFT_PACK_YN
-     , G.NEW_CUST_ORD_YN
-     , G.ADULT_YN
+     -- , G.GIFT_PACK_YN
+     -- , G.NEW_CUST_ORD_YN
+     -- , G.ADULT_YN
      , G.GOODS_TYPE
-     , G.CHANGEABLE_YN
-     , G.RETURNABLE_YN
-     , (SELECT CATE1_NO FROM TB_SITE_BRAND WHERE  BRAND_CD = G.BRAND_CD AND SITE_CD =  'G000_10' AND USE_YN = 'Y') AS BRAND_CATE1_NO
+     -- , G.CHANGEABLE_YN
+     -- , G.RETURNABLE_YN
+     -- , (SELECT CATE1_NO FROM TB_SITE_BRAND WHERE  BRAND_CD = G.BRAND_CD AND SITE_CD =  'G000_10' AND USE_YN = 'Y') AS BRAND_CATE1_NO
      , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = IF(G.SELF_GOODS_YN  = 'Y' AND G.GOODS_TYPE ='G056_N', O.OPT_CD1, G.MAIN_COLOR_CD) AND DEFAULT_IMG_YN = 'Y') AS SYS_IMG_NM
      , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = IF(G.SELF_GOODS_YN  = 'Y' AND G.GOODS_TYPE ='G056_N', O.OPT_CD1, G.MAIN_COLOR_CD) AND MOUSEOVER_IMG_YN = 'Y') AS SYS_IMG_NM2
 --     , (CASE WHEN W.GOODS_CD IS NULL THEN 'N' ELSE 'Y' END) AS WISH_YN  -- 실시간 데이터 반영? 
@@ -72,7 +78,7 @@ SELECT DISTINCT G.GOODS_CD
                                                 FROM  VW_STOCK
                                                 WHERE GOODS_CD = G.GOODS_CD
                                                 AND OPT_CD1 =  (CASE WHEN G.SELF_GOODS_YN = 'N' THEN OPT_CD1 
-                                                                     ELSE  IFNULL(G.MAIN_COLOR_CD,'00') END)
+                                                                     ELSE  IFNULL(G.MAIN_COLOR_CD,'XX') END)
                                                 GROUP BY GOODS_CD )
             ELSE (SELECT IFNULL(MAX(CASE WHEN SOLDOUT_YN = 'Y' THEN 0
                                       ELSE CURR_STOCK_QTY
@@ -82,12 +88,6 @@ SELECT DISTINCT G.GOODS_CD
                   GROUP BY GOODS_CD )
             END) AS STOCK_QTY
        , K.AD_KEYWORD
-       , FN_IS_GOODS_COUPON('P',G.GOODS_CD, BP.CURR_PRICE) AS COUPON_PC_ICON
-       , FN_IS_GOODS_COUPON('M',G.GOODS_CD, BP.CURR_PRICE) AS COUPON_MO_ICON
-       , FN_IS_GOODS_COUPON('A',G.GOODS_CD, BP.CURR_PRICE) AS COUPON_APP_ICON
-       , (CASE WHEN BP.CURR_PRICE <= E.MIN_ORD_AMT THEN 'Y' ELSE 'N' END) AS DELV_FREE_ICON
-       , FN_GET_FREEGIFT_GOODS_YN(G.GOODS_CD) AS FREEGIFT_ICON
-       , (CASE WHEN G.FORMAL_GB = 'G009_10' THEN 'Y' ELSE 'N' END) AS NEW_GOODS_ICON
        , (SELECT GROUP_CONCAT(DISTINCT CONCAT(C4.LEAF_CATE_NO , '|', C4.FULL_CATE_NM ) ) FROM TB_CATE_4SRCH C4
                                                                                          INNER JOIN TB_CATE_GOODS CG ON C4.LEAF_CATE_NO = CG.CATE_NO 
                                                                                          WHERE  C4.SITE_CD = 'G000_10'
@@ -97,20 +97,29 @@ SELECT DISTINCT G.GOODS_CD
         , G.REG_DT AS REG_DT 
         , GS.SELL_WEEK_QTY AS ORDER_CNT
         , GS.REVIEW_REG_CNT AS REVIEW_CNT
+        , (CASE WHEN G.SELF_GOODS_YN ='Y' AND ifnull(QDS.GOODS_CD, 'Y') THEN 'Y' ELSE 'N' END ) AS QUIK_DELV_YN
+      -- , FN_IS_GOODS_COUPON('P',G.GOODS_CD, BP.CURR_PRICE) AS COUPON_PC_ICON  -- 속도 이슈
+      -- , FN_IS_GOODS_COUPON('M',G.GOODS_CD, BP.CURR_PRICE) AS COUPON_MO_ICON
+      -- , FN_IS_GOODS_COUPON('A',G.GOODS_CD, BP.CURR_PRICE) AS COUPON_APP_ICON
+      -- , (CASE WHEN BP.CURR_PRICE <= E.MIN_ORD_AMT THEN 'Y' ELSE 'N' END) AS DELV_FREE_ICON
+      -- , FN_GET_FREEGIFT_GOODS_YN(G.GOODS_CD) AS FREEGIFT_ICON
+      -- , (CASE WHEN G.FORMAL_GB = 'G009_10' THEN 'Y' ELSE 'N' END) AS NEW_GOODS_ICON
 FROM TB_GOODS G
 INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
                       AND B.USE_YN = 'Y'
 INNER JOIN TB_BRAND_GROUP BG ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
-                            AND BG.USE_YN = 'Y'
-INNER JOIN (SELECT GOODS_CD
-                 , FN_GET_BENEFIT_PRICE( 'P' /**P*/,GOODS_CD, CURR_PRICE, '00' /**P*/) AS CURR_PRICE 
-            FROM TB_GOODS
-            ) BP ON G.GOODS_CD = BP.GOODS_CD
+                            AND BG.USE_YN = 'Y'                            
+-- INNER JOIN (SELECT GOODS_CD
+--                 , FN_GET_BENEFIT_PRICE( 'P' /**P*/,GOODS_CD, CURR_PRICE, '00' /**P*/) AS CURR_PRICE 
+--            FROM TB_GOODS
+--            ) BP ON G.GOODS_CD = BP.GOODS_CD
 INNER JOIN TB_DELV_FEE_POLICY E ON G.SUPPLY_COMP_CD = E.SUPPLY_COMP_CD
                                 AND G.DELV_FEE_CD =  E.DELV_FEE_CD
-INNER JOIN TB_GOODS_SUMMARY GS ON G.GOODS_CD = GS.GOODS_CD                               
-LEFT OUTER JOIN TB_OPTION O ON G.GOODS_CD  = O.GOODS_CD
+INNER JOIN TB_GOODS_SUMMARY GS ON G.GOODS_CD = GS.GOODS_CD
+INNER JOIN TB_OPTION O ON G.GOODS_CD  = O.GOODS_CD
                             AND O.DISP_YN = 'Y'
+LEFT OUTER JOIN TB_GOODS_BENEFIT_PRICE BP ON G.GOODS_CD = BP.GOODS_CD 
+                                          AND BP.CUST_GB = 'G100_00'
 LEFT OUTER JOIN (SELECT AKG.GOODS_CD
                       , GROUP_CONCAT(AK.AD_KEYWORD) AS  AD_KEYWORD
                  FROM TB_AD_KEYWORD AK
@@ -140,7 +149,13 @@ LEFT OUTER JOIN (SELECT MAX(GOODS_CD) AS GOODS_CD
 LEFT OUTER JOIN TB_ITEMKIND I ON G.ITEMKIND_CD  = I.ITEMKIND_CD 
 -- LEFT OUTER JOIN TB_WISHLIST W ON G.GOODS_CD = W.GOODS_CD
 --                               AND IFNULL( 0 /**P*/, 0) = W.CUST_NO
+LEFT OUTER JOIN TB_GOODS_QUICK_DELEVERY_SKIP QDS ON G.GOODS_CD  = QDS.GOODS_CD 
 WHERE 1 = 1                              
+-- AND G.GOODS_CD =  '14443216' /**P*/  -- 테스트용   입점:STYS00000042 , 자사:14443216 , 딜 : STYD000000025 , 세트 : STYS00000042
 AND G.SELF_MALL_YN = 'Y' -- 자사몰 노출(기획전과 상품상세는 노출)
+-- AND G.SELF_GOODS_YN ='Y'  -- 테스트용
 AND G.GOODS_STAT = 'G008_90'
-;
+-- ) Z
+-- WHERE 1 = 1
+-- AND Z.AD_KEYWORD IS NOT NULL
+;

산출물/3.설계/05.DB-Object/03.db_function/FN_GET_BENEFIT_PRICE.sql

@@ -12,7 +12,7 @@ create FUNCTION FN_GET_BENEFIT_PRICE
 /* Program Name : fn_get_benefit_price
 /* Description  : 상품의 현재판매가에 즉시할인상품쿠폰을 적용한 판매가를 반환한다.
 /*
-/*                Input  : i_front_gb => 프론트구분(P:PC, M:모바일)''
+/*                Input  : i_front_gb => 프론트구분(P:PC, M:모바일, A:APP)
 /*                         i_goods_cd => 상품코드
 /*                         i_curr_price => 현재판매가
 /*                         i_usable_cust_gb => 사용가능고객구분(G100_00:전체, G100_10:일반회원, G100_20:임직원)
@@ -47,6 +47,8 @@ BEGIN
                 WHEN I_FRONT_GB = 'P' AND I_USABLE_CUST_GB <> 'G100_20' THEN PC_CURR_PRICE
                 WHEN I_FRONT_GB = 'M' AND I_USABLE_CUST_GB = 'G100_20'  THEN STAFF_MO_CURR_PRICE
                 WHEN I_FRONT_GB = 'M' AND I_USABLE_CUST_GB <> 'G100_20' THEN MO_CURR_PRICE
+                WHEN I_FRONT_GB = 'A' AND I_USABLE_CUST_GB = 'G100_20'  THEN STAFF_APP_CURR_PRICE
+                WHEN I_FRONT_GB = 'A' AND I_USABLE_CUST_GB <> 'G100_20' THEN APP_CURR_PRICE
                 ELSE I_CURR_PRICE END
     INTO   O_RET_VALUE            
     FROM TB_GOODS_BENEFIT_PRICE

산출물/3.설계/05.DB-Object/03.db_function/FN_IS_GOODS_COUPON.sql

@@ -11,7 +11,7 @@ create FUNCTION FN_IS_GOODS_COUPON
 /* Program Name : FN_IS_GOODS_COUPON
 /* Description  : 상품의 최대로 할인 받는 쿠폰정보 조회한다.
 /*
-/*                Input  : i_front_gb => 프론트구분(P:PC, M:모바일)
+/*                Input  : i_front_gb => 프론트구분(P:PC, M:모바일,A:APP )
 /*                         i_goods_cd => 상품코드
 /*                         i_curr_price => 현재판매가
 /*                OutPut : 쿠폰정보
@@ -50,7 +50,7 @@ BEGIN
                       AND    CP.BUY_LIMIT_AMT <= I_CURR_PRICE  /*최소주문금액*/
                       AND    (CASE WHEN I_FRONT_GB = 'P' THEN DC_PVAL
                                    WHEN I_FRONT_GB = 'M' THEN DC_MVAL
-                                   ELSE DC_AVAL END) > 0       /*  APP은 추후 사용여부 확인해야함 */
+                                   ELSE DC_AVAL END) > 0       
                       AND    IF (CP.TOT_PUB_LIMIT_QTY = 0, 9999999999,CP.TOT_PUB_LIMIT_QTY) > (SELECT COUNT(1) FROM TB_CUST_COUPON WHERE CPN_ID = CP.CPN_ID) /*총발행제한수*/
                       AND   (
                               (CP.APPLY_SCOPE = 'A' ) 

산출물/3.설계/ERD/.metadata/.log

@@ -4168,3 +4168,73 @@ Command-line arguments:  -os win32 -ws win32 -arch x86 D:\WIDE\workspace\webapps
 
 !ENTRY org.eclipse.osgi 2 1 2021-02-15 10:47:44.273
 !MESSAGE NLS unused message: ToggleColumnVisibilityHandler_5 in: com.tomato.exerd.handler.messages
+!SESSION 2021-02-26 11:02:40.202 -----------------------------------------------
+eclipse.buildId=M20090211-1700
+java.version=1.6.0_24
+java.vendor=Sun Microsystems Inc.
+BootLoader constants: OS=win32, ARCH=x86, WS=win32, NL=ko_KR
+Framework arguments:  D:\WIDE\workspace\webapps\style24\style24.doc\산출물\3.설계\ERD\ST24.exerd
+Command-line arguments:  -os win32 -ws win32 -arch x86 D:\WIDE\workspace\webapps\style24\style24.doc\산출물\3.설계\ERD\ST24.exerd
+
+!ENTRY org.eclipse.osgi 2 1 2021-02-26 11:02:42.718
+!MESSAGE NLS unused message: OpenResourceDialog_openButton_text in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-02-26 11:02:42.718
+!MESSAGE NLS unused message: OpenResourceDialog_openWithMenu_label in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-02-26 11:02:42.718
+!MESSAGE NLS unused message: OpenResourceDialog_openWithButton_toolTip in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-02-26 11:02:42.718
+!MESSAGE NLS unused message: CleanDialog_cleanSelectedTaskName in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-02-26 11:02:42.718
+!MESSAGE NLS unused message: RecentWorkspacesPreferencePage_PromptAtStartup_label in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-02-26 11:02:42.718
+!MESSAGE NLS unused message: RecentWorkspacesPreferencePage_RemoveButton_label in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-02-26 11:02:47.904
+!MESSAGE NLS unused message: url_couldNotResolve_projectDoesNotExist in: org.eclipse.core.internal.utils.messages
+
+!ENTRY org.eclipse.core.resources 2 10035 2021-02-26 11:02:48.029
+!MESSAGE The workspace exited with unsaved changes in the previous session; refreshing workspace to recover changes.
+
+!ENTRY org.eclipse.osgi 2 1 2021-02-26 11:02:48.451
+!MESSAGE NLS unused message: Shortcuts_shortcutTab in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-02-26 11:02:48.451
+!MESSAGE NLS unused message: Shortcuts_selectShortcutsLabel in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-02-26 11:02:48.451
+!MESSAGE NLS unused message: Shortcuts_availableMenus in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-02-26 11:02:48.451
+!MESSAGE NLS unused message: Shortcuts_availableCategories in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-02-26 11:02:48.451
+!MESSAGE NLS unused message: Shortcuts_allShortcuts in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-02-26 11:02:48.451
+!MESSAGE NLS unused message: Util_listNull in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-02-26 11:02:48.451
+!MESSAGE NLS unused message: OpenBrowserHandler_NoInfoDialogTitle in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-02-26 11:02:48.451
+!MESSAGE NLS unused message: AboutFeaturesDialog_SimpleTitle in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-02-26 11:02:53.865
+!MESSAGE NLS unused message: BinaryDumpHandler_1 in: com.tomato.exerd.handler.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-02-26 11:02:53.865
+!MESSAGE NLS unused message: ConvertToXMLHandler_1 in: com.tomato.exerd.handler.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-02-26 11:02:53.865
+!MESSAGE NLS unused message: SelectHandler_11 in: com.tomato.exerd.handler.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-02-26 11:02:53.865
+!MESSAGE NLS unused message: ToggleColumnVisibilityHandler_4 in: com.tomato.exerd.handler.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-02-26 11:02:53.865
+!MESSAGE NLS unused message: ToggleColumnVisibilityHandler_5 in: com.tomato.exerd.handler.messages

산출물/3.설계/ERD/.metadata/.plugins/com.tomato.exerd.core/dialog_settings.xml

@@ -3,38 +3,38 @@
 	<section name="com.tomato.exerd.handler.DiagramSelectDialog">
 		<item value="400" key="DIALOG_WIDTH"/>
 		<item value="588" key="DIALOG_Y_ORIGIN"/>
-		<item value="300" key="DIALOG_HEIGHT"/>
 		<item value="1088" key="DIALOG_X_ORIGIN"/>
+		<item value="300" key="DIALOG_HEIGHT"/>
 		<item value="1|맑은 고딕|9.0|0|WINDOWS|1|-12|0|0|0|400|0|0|0|1|0|0|0|0|맑은 고딕" key="DIALOG_FONT_NAME"/>
 	</section>
 	<section name="com.tomato.exerd.handler.Helper.FindTableDialog2">
 		<item value="" key="history"/>
 		<item value="744" key="DIALOG_WIDTH"/>
 		<item value="613" key="DIALOG_Y_ORIGIN"/>
-		<item value="1174" key="DIALOG_X_ORIGIN"/>
 		<item value="428" key="DIALOG_HEIGHT"/>
+		<item value="1174" key="DIALOG_X_ORIGIN"/>
 		<item value="1|맑은 고딕|9.0|0|WINDOWS|1|-12|0|0|0|400|0|0|0|1|0|0|0|0|맑은 고딕" key="DIALOG_FONT_NAME"/>
 	</section>
 	<section name="com.tomato.exerd.export.ModelExportWizardDialog">
 		<item value="701" key="DIALOG_WIDTH"/>
 		<item value="" key="destinationPath"/>
 		<item value="342" key="DIALOG_Y_ORIGIN"/>
-		<item value="테이블 정의서 HTML(기본)" key="lastUsedTemplateName"/>
-		<item value="938" key="DIALOG_X_ORIGIN"/>
 		<item value="670" key="DIALOG_HEIGHT"/>
+		<item value="938" key="DIALOG_X_ORIGIN"/>
+		<item value="테이블 정의서 HTML(기본)" key="lastUsedTemplateName"/>
 		<item value="file" key="sendType"/>
 		<item value="1|맑은 고딕|9.0|0|WINDOWS|1|-12|0|0|0|400|0|0|0|1|0|0|0|0|맑은 고딕" key="DIALOG_FONT_NAME"/>
 	</section>
-	<section name="solutionSelectionDialog">
-		<item value="1" key="applyScope"/>
-	</section>
 	<section name="com.tomato.exerd.print.PrintSettingsEditorDialog">
 		<item value="721" key="DIALOG_WIDTH"/>
 		<item value="374" key="DIALOG_Y_ORIGIN"/>
-		<item value="621" key="DIALOG_HEIGHT"/>
 		<item value="928" key="DIALOG_X_ORIGIN"/>
+		<item value="621" key="DIALOG_HEIGHT"/>
 		<item value="1|맑은 고딕|9.0|0|WINDOWS|1|-12|0|0|0|400|0|0|0|1|0|0|0|0|맑은 고딕" key="DIALOG_FONT_NAME"/>
 	</section>
+	<section name="solutionSelectionDialog">
+		<item value="1" key="applyScope"/>
+	</section>
 	<section name="com.tomato.exerd.export.ExportModelWizard">
 		<list key="templateContents">
 		</list>
@@ -44,17 +44,17 @@
 	<section name="com.tomato.exerd.domain.internal.FindDomainDialog">
 		<item value="228" key="DIALOG_WIDTH"/>
 		<item value="533" key="DIALOG_Y_ORIGIN"/>
-		<item value="1174" key="DIALOG_X_ORIGIN"/>
 		<item value="263" key="DIALOG_HEIGHT"/>
+		<item value="1174" key="DIALOG_X_ORIGIN"/>
 		<item value="1|맑은 고딕|9.0|0|WINDOWS|1|-12|0|0|0|400|0|0|0|1|0|0|0|0|맑은 고딕" key="DIALOG_FONT_NAME"/>
 	</section>
-	<section name="solution">
-	</section>
 	<section name="com.tomato.exerd.handler.Helper.DiagramOrderEditor">
 		<item value="350" key="DIALOG_WIDTH"/>
 		<item value="486" key="DIALOG_Y_ORIGIN"/>
-		<item value="1113" key="DIALOG_X_ORIGIN"/>
 		<item value="453" key="DIALOG_HEIGHT"/>
+		<item value="1113" key="DIALOG_X_ORIGIN"/>
 		<item value="1|맑은 고딕|9.0|0|WINDOWS|1|-12|0|0|0|400|0|0|0|1|0|0|0|0|맑은 고딕" key="DIALOG_FONT_NAME"/>
 	</section>
+	<section name="solution">
+	</section>
 </section>

산출물/3.설계/ERD/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml

@@ -7,8 +7,8 @@
 	<section name="SaveAsDialogSettings">
 		<item value="525" key="DIALOG_WIDTH"/>
 		<item value="-51" key="DIALOG_Y_ORIGIN"/>
-		<item value="580" key="DIALOG_HEIGHT"/>
 		<item value="88" key="DIALOG_X_ORIGIN"/>
+		<item value="580" key="DIALOG_HEIGHT"/>
 		<item value="1|맑은 고딕|9.0|0|WINDOWS|1|-12|0|0|0|400|0|0|0|1|0|0|0|0|맑은 고딕" key="DIALOG_FONT_NAME"/>
 	</section>
 </section>

산출물/3.설계/ERD/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml

@@ -32,10 +32,10 @@
 </folder>
 </info>
 </editorArea>
-<editor id="com.tomato.exerd.editor.DiagramEditor" name="ST24.exerd" partName="ST24.exerd" title="ST24.exerd" tooltip="D:\WIDE\workspace\webapps\style24\style24.doc\산출물\3.설계\ERD\ST24.exerd" workbook="DefaultEditorWorkbook">
+<editor activePart="true" focus="true" id="com.tomato.exerd.editor.DiagramEditor" name="ST24.exerd" partName="ST24.exerd" title="ST24.exerd" tooltip="D:\WIDE\workspace\webapps\style24\style24.doc\산출물\3.설계\ERD\ST24.exerd" workbook="DefaultEditorWorkbook">
 <input factoryID="org.eclipse.ui.ide.FileStoreEditorInputFactory" uri="file:/D:/WIDE/workspace/webapps/style24/style24.doc/산출물/3.설계/ERD/ST24.exerd"/>
 </editor>
-<editor activePart="true" focus="true" id="com.tomato.exerd.editor.DiagramEditor" name="iSTYLE24_Mall.exerd" partName="iSTYLE24_Mall.exerd" title="iSTYLE24_Mall.exerd" tooltip="D:\WIDE\workspace\webapps\style24\style24.doc\산출물\3.설계\ERD\asis\iSTYLE24_Mall.exerd" workbook="DefaultEditorWorkbook">
+<editor id="com.tomato.exerd.editor.DiagramEditor" name="iSTYLE24_Mall.exerd" partName="iSTYLE24_Mall.exerd" title="iSTYLE24_Mall.exerd" tooltip="D:\WIDE\workspace\webapps\style24\style24.doc\산출물\3.설계\ERD\asis\iSTYLE24_Mall.exerd" workbook="DefaultEditorWorkbook">
 <input factoryID="org.eclipse.ui.ide.FileStoreEditorInputFactory" uri="file:/D:/WIDE/workspace/webapps/style24/style24.doc/산출물/3.설계/ERD/asis/iSTYLE24_Mall.exerd"/>
 </editor>
 <editor id="com.tomato.exerd.editor.DiagramEditor" name="iSTYLE24_Wms.exerd" partName="iSTYLE24_Wms.exerd" title="iSTYLE24_Wms.exerd" tooltip="D:\WIDE\workspace\webapps\style24\style24.doc\산출물\3.설계\ERD\asis\iSTYLE24_Wms.exerd" workbook="DefaultEditorWorkbook">
@@ -120,7 +120,7 @@
 <page content="org.eclipse.ui.cheatsheets.views.CheatSheetView" label="LabelNotFound"/>
 </folder>
 </info>
-<info part="org.eclipse.ui.editorss" ratio="0.13299333" ratioLeft="339" ratioRight="2210" relationship="2" relative="leftFolder"/>
+<info part="org.eclipse.ui.editorss" ratio="0.13043478" ratioLeft="249" ratioRight="1660" relationship="2" relative="leftFolder"/>
 <info folder="true" part="org.eclipse.ui.internal.ViewStack@12f529b" ratio="0.87222475" ratioLeft="1925" ratioRight="282" relationship="2" relative="org.eclipse.ui.editorss">
 <folder activePageID="com.tomato.exerd.ui.views.thumbnail" appearance="2" expanded="2">
 <page content="com.tomato.exerd.ui.views.thumbnail" label="썸네일"/>
@@ -169,61 +169,60 @@
 <editors>
 <editor factoryID="org.eclipse.ui.ide.FileStoreEditorInputFactory" id="com.tomato.exerd.editor.DiagramEditor" uri="file:/D:/WIDE/workspace/webapps/style24/style24.doc/산출물/3.설계/ERD/asis/iSTYLE24_Mall.exerd"/>
 <editor factoryID="org.eclipse.ui.ide.FileStoreEditorInputFactory" id="com.tomato.exerd.editor.DiagramEditor" uri="file:/D:/WIDE/workspace/webapps/style24/style24.doc/산출물/3.설계/ERD/ST24.exerd"/>
-<editor factoryID="org.eclipse.ui.ide.FileStoreEditorInputFactory" id="com.tomato.exerd.editor.DiagramEditor" uri="file:/D:/WIDE/workspace/webapps/style24/style24.doc/산출물/3.설계/ERD/ST24.exerd"/>
-<editor factoryID="org.eclipse.ui.ide.FileStoreEditorInputFactory" id="com.tomato.exerd.editor.DiagramEditor" uri="file:/D:/WIDE/workspace/webapps/style24/style24.doc/산출물/3.설계/ERD/asis/iSTYLE24_Wms.exerd"/>
 <editor factoryID="org.eclipse.ui.ide.FileStoreEditorInputFactory" id="com.tomato.exerd.editor.DiagramEditor" uri="file:/D:/WIDE/workspace/webapps/style24/style24.doc/산출물/3.설계/ERD/asis/iSTYLE24_Mall.exerd"/>
 <editor factoryID="org.eclipse.ui.ide.FileStoreEditorInputFactory" id="com.tomato.exerd.editor.DiagramEditor" uri="file:/D:/WIDE/workspace/webapps/style24/style24.doc/산출물/3.설계/ERD/ST24.exerd"/>
+<editor factoryID="org.eclipse.ui.ide.FileStoreEditorInputFactory" id="com.tomato.exerd.editor.DiagramEditor" uri="file:/D:/WIDE/workspace/webapps/style24/style24.doc/산출물/3.설계/ERD/ST24.exerd"/>
 </editors>
-<item historyLabel="ST24.exerd" index="1"/>
 <item historyLabel="iSTYLE24_Mall.exerd" index="0"/>
 <item historyLabel="ST24.exerd" index="1"/>
 <item historyLabel="iSTYLE24_Mall.exerd" index="0"/>
 <item historyLabel="ST24.exerd" index="1"/>
 <item historyLabel="iSTYLE24_Mall.exerd" index="0"/>
-<item historyLabel="ST24.exerd" index="2"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="0"/>
-<item historyLabel="ST24.exerd" index="2"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="0"/>
-<item historyLabel="iSTYLE24_Wms.exerd" index="3"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="0"/>
-<item historyLabel="ST24.exerd" index="2"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="0"/>
-<item historyLabel="ST24.exerd" index="2"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="0"/>
-<item historyLabel="ST24.exerd" index="2"/>
+<item historyLabel="ST24.exerd" index="1"/>
 <item historyLabel="iSTYLE24_Mall.exerd" index="0"/>
-<item historyLabel="ST24.exerd" index="2"/>
+<item historyLabel="ST24.exerd" index="1"/>
 <item historyLabel="iSTYLE24_Mall.exerd" index="0"/>
-<item historyLabel="ST24.exerd" index="2"/>
+<item historyLabel="ST24.exerd" index="1"/>
 <item historyLabel="iSTYLE24_Mall.exerd" index="0"/>
-<item historyLabel="ST24.exerd" index="2"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="4"/>
-<item historyLabel="ST24.exerd" index="2"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="4"/>
-<item historyLabel="ST24.exerd" index="2"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="4"/>
-<item historyLabel="ST24.exerd" index="2"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="4"/>
-<item historyLabel="ST24.exerd" index="2"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="4"/>
-<item historyLabel="ST24.exerd" index="2"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="4"/>
-<item historyLabel="ST24.exerd" index="2"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="4"/>
-<item historyLabel="ST24.exerd" index="2"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="4"/>
-<item historyLabel="ST24.exerd" index="2"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="4"/>
-<item historyLabel="ST24.exerd" index="2"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="4"/>
-<item historyLabel="ST24.exerd" index="2"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="4"/>
-<item historyLabel="ST24.exerd" index="2"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="4"/>
-<item historyLabel="ST24.exerd" index="5"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="4"/>
-<item historyLabel="ST24.exerd" index="5"/>
-<item active="true" historyLabel="iSTYLE24_Mall.exerd" index="4"/>
+<item historyLabel="ST24.exerd" index="1"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="2"/>
+<item historyLabel="ST24.exerd" index="1"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="2"/>
+<item historyLabel="ST24.exerd" index="1"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="2"/>
+<item historyLabel="ST24.exerd" index="1"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="2"/>
+<item historyLabel="ST24.exerd" index="1"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="2"/>
+<item historyLabel="ST24.exerd" index="1"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="2"/>
+<item historyLabel="ST24.exerd" index="1"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="2"/>
+<item historyLabel="ST24.exerd" index="1"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="2"/>
+<item historyLabel="ST24.exerd" index="1"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="2"/>
+<item historyLabel="ST24.exerd" index="1"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="2"/>
+<item historyLabel="ST24.exerd" index="1"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="2"/>
+<item historyLabel="ST24.exerd" index="1"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="2"/>
+<item historyLabel="ST24.exerd" index="3"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="2"/>
+<item historyLabel="ST24.exerd" index="3"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="2"/>
+<item historyLabel="ST24.exerd" index="4"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="2"/>
+<item historyLabel="ST24.exerd" index="4"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="2"/>
+<item historyLabel="ST24.exerd" index="4"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="2"/>
+<item historyLabel="ST24.exerd" index="4"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="2"/>
+<item historyLabel="ST24.exerd" index="4"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="2"/>
+<item active="true" historyLabel="ST24.exerd" index="4"/>
 </navigationHistory>
 <input factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/" type="8"/>
 </page>

산출물/검색/검색_상품색인.sql

@@ -31,8 +31,12 @@ SELECT DISTINCT  G.GOODS_CD
      , G.ITEMKIND_CD
      , G.FORMAL_GB
      , G.LIST_PRICE
-     , BP.CURR_PRICE
-     , 100 - ROUND((BP.CURR_PRICE / G.LIST_PRICE) * 100 ,0) AS DC_RATE
+     , G.CURR_PRICE
+     , BP.PC_CURR_PRICE
+     , BP.MO_CURR_PRICE
+     , BP.APP_CURR_PRICE
+     -- , BP.CURR_PRICE
+     -- , 100 - ROUND((BP.CURR_PRICE / G.LIST_PRICE) * 100 ,0) AS DC_RATE
      , G.SELF_GOODS_YN
      , G.GOODS_STAT
      , G.PNT_PRATE
@@ -49,7 +53,7 @@ SELECT DISTINCT  G.GOODS_CD
      , E.DELV_FEE
      , E.MIN_ORD_AMT
      , G.GOODS_GB
-     , (SELECT NI_CLSF_CD FROM TB_ITEMKIND  WHERE ITEMKIND_CD = G.ITEMKIND_CD) AS NI_CLSF_CD
+     , (SELECT MAX(NI_CLSF_CD) FROM tb_goods_noti_info  WHERE GOODS_CD = G.GOODS_CD) AS NI_CLSF_CD
      , G.MAIN_COLOR_CD
      , G.SUPPLY_COMP_CD
      , G.SELF_MALL_YN
@@ -57,13 +61,13 @@ SELECT DISTINCT  G.GOODS_CD
      , FN_GET_CODE_NM('G023',G.AGE_GRP_CD) AGE_GRP_NM
      , G.SEASON_CD 
      , FN_GET_CODE_NM('G006',G.SEASON_CD) SEASON_NM
-     , G.GIFT_PACK_YN
-     , G.NEW_CUST_ORD_YN
-     , G.ADULT_YN
+     -- , G.GIFT_PACK_YN
+     -- , G.NEW_CUST_ORD_YN
+     -- , G.ADULT_YN
      , G.GOODS_TYPE
-     , G.CHANGEABLE_YN
-     , G.RETURNABLE_YN
-     , (SELECT CATE1_NO FROM TB_SITE_BRAND WHERE  BRAND_CD = G.BRAND_CD AND SITE_CD =  'G000_10' AND USE_YN = 'Y') AS BRAND_CATE1_NO
+     -- , G.CHANGEABLE_YN
+     -- , G.RETURNABLE_YN
+     -- , (SELECT CATE1_NO FROM TB_SITE_BRAND WHERE  BRAND_CD = G.BRAND_CD AND SITE_CD =  'G000_10' AND USE_YN = 'Y') AS BRAND_CATE1_NO
      , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = IF(G.SELF_GOODS_YN  = 'Y' AND G.GOODS_TYPE ='G056_N', O.OPT_CD1, G.MAIN_COLOR_CD) AND DEFAULT_IMG_YN = 'Y') AS SYS_IMG_NM
      , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = IF(G.SELF_GOODS_YN  = 'Y' AND G.GOODS_TYPE ='G056_N', O.OPT_CD1, G.MAIN_COLOR_CD) AND MOUSEOVER_IMG_YN = 'Y') AS SYS_IMG_NM2
 --     , (CASE WHEN W.GOODS_CD IS NULL THEN 'N' ELSE 'Y' END) AS WISH_YN  -- 실시간 데이터 반영? 
@@ -83,12 +87,6 @@ SELECT DISTINCT  G.GOODS_CD
                   GROUP BY GOODS_CD )
             END) AS STOCK_QTY
        , K.AD_KEYWORD
-       , FN_IS_GOODS_COUPON('P',G.GOODS_CD, BP.CURR_PRICE) AS COUPON_PC_ICON
-       , FN_IS_GOODS_COUPON('M',G.GOODS_CD, BP.CURR_PRICE) AS COUPON_MO_ICON
-       , FN_IS_GOODS_COUPON('A',G.GOODS_CD, BP.CURR_PRICE) AS COUPON_APP_ICON
-       , (CASE WHEN BP.CURR_PRICE <= E.MIN_ORD_AMT THEN 'Y' ELSE 'N' END) AS DELV_FREE_ICON
-       , FN_GET_FREEGIFT_GOODS_YN(G.GOODS_CD) AS FREEGIFT_ICON
-       , (CASE WHEN G.FORMAL_GB = 'G009_10' THEN 'Y' ELSE 'N' END) AS NEW_GOODS_ICON
        , (SELECT GROUP_CONCAT(DISTINCT CONCAT(C4.LEAF_CATE_NO , '|', C4.FULL_CATE_NM ) ) FROM TB_CATE_4SRCH C4
                                                                                          INNER JOIN TB_CATE_GOODS CG ON C4.LEAF_CATE_NO = CG.CATE_NO 
                                                                                          WHERE  C4.SITE_CD = 'G000_10'
@@ -98,21 +96,30 @@ SELECT DISTINCT  G.GOODS_CD
         , G.REG_DT AS REG_DT 
         , GS.SELL_WEEK_QTY AS ORDER_CNT
         , GS.REVIEW_REG_CNT AS REVIEW_CNT
+        , (CASE WHEN G.SELF_GOODS_YN ='Y' AND ifnull(QDS.GOODS_CD, 'Y') THEN 'Y' ELSE 'N' END ) AS QUIK_DELV_YN
+      -- , FN_IS_GOODS_COUPON('P',G.GOODS_CD, BP.CURR_PRICE) AS COUPON_PC_ICON  -- 속도 이슈
+      -- , FN_IS_GOODS_COUPON('M',G.GOODS_CD, BP.CURR_PRICE) AS COUPON_MO_ICON
+      -- , FN_IS_GOODS_COUPON('A',G.GOODS_CD, BP.CURR_PRICE) AS COUPON_APP_ICON
+      -- , (CASE WHEN BP.CURR_PRICE <= E.MIN_ORD_AMT THEN 'Y' ELSE 'N' END) AS DELV_FREE_ICON
+      -- , FN_GET_FREEGIFT_GOODS_YN(G.GOODS_CD) AS FREEGIFT_ICON
+      -- , (CASE WHEN G.FORMAL_GB = 'G009_10' THEN 'Y' ELSE 'N' END) AS NEW_GOODS_ICON
+       
 FROM TB_GOODS G
 INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
                       AND B.USE_YN = 'Y'
 INNER JOIN TB_BRAND_GROUP BG ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
-                            AND BG.USE_YN = 'Y'
-INNER JOIN (SELECT GOODS_CD
-                 , FN_GET_BENEFIT_PRICE( 'P' /**P*/,GOODS_CD, CURR_PRICE, '00' /**P*/) AS CURR_PRICE 
-            FROM TB_GOODS
-            -- WHERE GOODS_CD =  '14443216' /**P*/
-            ) BP ON G.GOODS_CD = BP.GOODS_CD
+                            AND BG.USE_YN = 'Y'                            
+-- INNER JOIN (SELECT GOODS_CD
+--                 , FN_GET_BENEFIT_PRICE( 'P' /**P*/,GOODS_CD, CURR_PRICE, '00' /**P*/) AS CURR_PRICE 
+--            FROM TB_GOODS
+--            ) BP ON G.GOODS_CD = BP.GOODS_CD
 INNER JOIN TB_DELV_FEE_POLICY E ON G.SUPPLY_COMP_CD = E.SUPPLY_COMP_CD
                                 AND G.DELV_FEE_CD =  E.DELV_FEE_CD
-INNER JOIN TB_GOODS_SUMMARY GS ON G.GOODS_CD = GS.GOODS_CD                               
-LEFT OUTER JOIN TB_OPTION O ON G.GOODS_CD  = O.GOODS_CD
+INNER JOIN TB_GOODS_SUMMARY GS ON G.GOODS_CD = GS.GOODS_CD
+INNER JOIN TB_OPTION O ON G.GOODS_CD  = O.GOODS_CD
                             AND O.DISP_YN = 'Y'
+LEFT OUTER JOIN TB_GOODS_BENEFIT_PRICE BP ON G.GOODS_CD = BP.GOODS_CD 
+                                          AND BP.CUST_GB = 'G100_00'
 LEFT OUTER JOIN (SELECT AKG.GOODS_CD
                       , GROUP_CONCAT(AK.AD_KEYWORD) AS  AD_KEYWORD
                  FROM TB_AD_KEYWORD AK
@@ -142,10 +149,11 @@ LEFT OUTER JOIN (SELECT MAX(GOODS_CD) AS GOODS_CD
 LEFT OUTER JOIN TB_ITEMKIND I ON G.ITEMKIND_CD  = I.ITEMKIND_CD 
 -- LEFT OUTER JOIN TB_WISHLIST W ON G.GOODS_CD = W.GOODS_CD
 --                               AND IFNULL( 0 /**P*/, 0) = W.CUST_NO
+LEFT OUTER JOIN TB_GOODS_QUICK_DELEVERY_SKIP QDS ON G.GOODS_CD  = QDS.GOODS_CD 
 WHERE 1 = 1                              
- AND G.GOODS_CD =  '14443216' /**P*/  -- 테스트용   입점:STYS00000042 , 자사:14443216 , 딜 : STYD000000025 , 세트 : STYS00000042
+-- AND G.GOODS_CD =  '14443216' /**P*/  -- 테스트용   입점:STYS00000042 , 자사:14443216 , 딜 : STYD000000025 , 세트 : STYS00000042
 AND G.SELF_MALL_YN = 'Y' -- 자사몰 노출(기획전과 상품상세는 노출)
-AND G.SELF_GOODS_YN ='Y'  -- 테스트용
+-- AND G.SELF_GOODS_YN ='Y'  -- 테스트용
 AND G.GOODS_STAT = 'G008_90'
 -- ) Z
 -- WHERE 1 = 1