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

swkim/- 주문

@@ -0,0 +1,9 @@
+- 주문
+ 결제사(PG) 포인트(네이버포인트), 쿠폰등 사용금액 save 필요
+ 총알배송여부, 할인코드 = 쿠폰
+ 주문내역 삭제(display)
+ 결품으로 용어 통일
+ pg쿠폰은 허들 깨지면 환수가 된다. 계산을 위해 환수 금액에 대한 리턴하는지 문의
+ 포인트는 구매확정시 지급
+ 구매확정시 교환/반품 불가
+ 포인트 적립/사용 내역은 주문번호 단위로 보여줌(부분취소시 취소후 적립된것만-상세단위)

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

@@ -2042,7 +2042,7 @@ CREATE TABLE TB_GOODS (
   PRICE_UPD_DT       TIMESTAMP           NULL     COMMENT '가격변경일시', -- 가격변경일시
   DC_RATE            FLOAT(5,2) UNSIGNED NOT NULL DEFAULT 0 COMMENT '할인율', -- 할인율
   GOODS_STAT         VARCHAR(20)         NOT NULL DEFAULT 'G008_00' COMMENT '상품상태(공통코드G008)', -- 상품상태(공통코드G008)
-  DISP_YN            CHAR(1)             NOT NULL DEFAULT 'Y' COMMENT '노출여부', -- 노출여부
+  SELF_MALL_YN       CHAR(1)             NOT NULL DEFAULT 'Y' COMMENT '자사몰노출여부', -- 노출여부
   GOODS_GB           VARCHAR(20)         NOT NULL COMMENT '해외구매대행/병행수입 상품일 경우 주문 시 통관부호 입력 란이 추가되어야 한다(공통코드 G073)', -- 상품구분(공통코드 G073)
   DISTRIBUTION_GB    VARCHAR(20)         NOT NULL COMMENT '유통구분(공콩코드 G065)', -- 유통구분(공통코드 G065)
   SELF_GOODS_YN      CHAR(1)             NOT NULL DEFAULT 'N' COMMENT '자사상품여부', -- 자사상품여부
@@ -4668,6 +4668,7 @@ CREATE TABLE TB_GOODS_COMPOSE (
   COMPS_CURR_PRICE   INT UNSIGNED      NULL     COMMENT '구성상품판매가(세트상품에서 사용)', -- 구성상품판매가
   COMPS_GOODS_OPT_NM VARCHAR(200)      NULL     COMMENT '구성상품 옵션명(딜상품에서 사용)', -- 구성상품 옵션명
   BASE_YN            CHAR(1)           NOT NULL DEFAULT 'N' COMMENT '기준여부(품목/전시카테고리)', -- 기준여부(품목/전시카테고리)
+  USE_YN             CHAR(1)           NOT NULL DEFAULT 'Y' COMMENT '사용여부',
   REG_NO             INT UNSIGNED      NOT NULL COMMENT '등록자번호', -- 등록자번호
   REG_DT             TIMESTAMP         NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '등록일시', -- 등록일시
   UPD_NO             INT UNSIGNED      NOT NULL COMMENT '수정자번호', -- 수정자번호
@@ -4862,4 +4863,30 @@ ALTER TABLE TB_CODI_GOODS
     )
     REFERENCES TB_GOODS ( -- 상품
       GOODS_CD -- 상품코드
+    );
+
+################################################################################
+#판매수량
+################################################################################
+DROP TABLE IF EXISTS TB_SELL_QTY RESTRICT;
+CREATE TABLE TB_SELL_QTY (
+  GOODS_CD         VARCHAR(20)  NOT NULL COMMENT '상품코드', -- 상품코드
+  OPT_CD           VARCHAR(200) NOT NULL COMMENT '옵션코드', -- 옵션코드
+  SELL_GB          VARCHAR(2)   NOT NULL COMMENT '판매구분(10:주문(-), 11:주문취소(+), 12:미출고(+), 20:교환신청(-), 21:교환취소(+), 30:판매매출반영(+))', -- 판매구분
+  ORD_DTL_NO       INT UNSIGNED NULL     COMMENT '주문상세번호', -- 주문상세번호
+  ORD_CHG_SQ       INT UNSIGNED NULL     COMMENT '주문변경일련번호', -- 주문변경일련번호
+  AGENT_ORDER_ID   VARCHAR(30)  NULL     COMMENT '에이전트주문번호', -- 에이전트주문번호
+  EXTMALL_ORDER_ID VARCHAR(50)  NULL     COMMENT '제휴몰주문번호', -- 제휴몰주문번호
+  SELL_QTY         MEDIUMINT    NOT NULL DEFAULT 0 COMMENT '판매수량', -- 판매수량
+  REG_NO           INT UNSIGNED NOT NULL COMMENT '등록자번호', -- 등록자번호
+  REG_DT           TIMESTAMP    NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '등록일시' -- 등록일시
+)
+COMMENT '판매수량. 재고가 변동되는 시점(주문, 주문취소, 교환신청, 교환취소, 판매매출반영)에 발생. ERP재고연동 시 테이블 TRUNCATE';
+
+-- 판매수량
+ALTER TABLE TB_SELL_QTY
+  ADD CONSTRAINT PK_SELL_QTY -- 판매수량 기본키
+    PRIMARY KEY (
+      GOODS_CD, -- 상품코드
+      OPT_CD    -- 옵션코드
     );

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

@@ -863,3 +863,143 @@ Command-line arguments:  -os win32 -ws win32 -arch x86 D:\WIDE\workspace\webapps
 
 !ENTRY org.eclipse.osgi 2 1 2020-10-26 10:24:58.700
 !MESSAGE NLS unused message: ToggleColumnVisibilityHandler_5 in: com.tomato.exerd.handler.messages
+!SESSION 2020-10-27 10:23:34.845 -----------------------------------------------
+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 2020-10-27 10:23:35.783
+!MESSAGE NLS unused message: OpenResourceDialog_openButton_text in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 10:23:35.783
+!MESSAGE NLS unused message: OpenResourceDialog_openWithMenu_label in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 10:23:35.783
+!MESSAGE NLS unused message: OpenResourceDialog_openWithButton_toolTip in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 10:23:35.783
+!MESSAGE NLS unused message: CleanDialog_cleanSelectedTaskName in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 10:23:35.783
+!MESSAGE NLS unused message: RecentWorkspacesPreferencePage_PromptAtStartup_label in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 10:23:35.783
+!MESSAGE NLS unused message: RecentWorkspacesPreferencePage_RemoveButton_label in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 10:23:37.770
+!MESSAGE NLS unused message: url_couldNotResolve_projectDoesNotExist in: org.eclipse.core.internal.utils.messages
+
+!ENTRY org.eclipse.core.resources 2 10035 2020-10-27 10:23:37.832
+!MESSAGE The workspace exited with unsaved changes in the previous session; refreshing workspace to recover changes.
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 10:23:38.035
+!MESSAGE NLS unused message: Shortcuts_shortcutTab in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 10:23:38.035
+!MESSAGE NLS unused message: Shortcuts_selectShortcutsLabel in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 10:23:38.035
+!MESSAGE NLS unused message: Shortcuts_availableMenus in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 10:23:38.035
+!MESSAGE NLS unused message: Shortcuts_availableCategories in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 10:23:38.035
+!MESSAGE NLS unused message: Shortcuts_allShortcuts in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 10:23:38.035
+!MESSAGE NLS unused message: Util_listNull in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 10:23:38.035
+!MESSAGE NLS unused message: OpenBrowserHandler_NoInfoDialogTitle in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 10:23:38.035
+!MESSAGE NLS unused message: AboutFeaturesDialog_SimpleTitle in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 10:23:41.426
+!MESSAGE NLS unused message: BinaryDumpHandler_1 in: com.tomato.exerd.handler.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 10:23:41.426
+!MESSAGE NLS unused message: ConvertToXMLHandler_1 in: com.tomato.exerd.handler.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 10:23:41.426
+!MESSAGE NLS unused message: SelectHandler_11 in: com.tomato.exerd.handler.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 10:23:41.426
+!MESSAGE NLS unused message: ToggleColumnVisibilityHandler_4 in: com.tomato.exerd.handler.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 10:23:41.426
+!MESSAGE NLS unused message: ToggleColumnVisibilityHandler_5 in: com.tomato.exerd.handler.messages
+!SESSION 2020-10-27 22:50:03.553 -----------------------------------------------
+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 2020-10-27 22:50:04.256
+!MESSAGE NLS unused message: OpenResourceDialog_openButton_text in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 22:50:04.256
+!MESSAGE NLS unused message: OpenResourceDialog_openWithMenu_label in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 22:50:04.256
+!MESSAGE NLS unused message: OpenResourceDialog_openWithButton_toolTip in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 22:50:04.256
+!MESSAGE NLS unused message: CleanDialog_cleanSelectedTaskName in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 22:50:04.256
+!MESSAGE NLS unused message: RecentWorkspacesPreferencePage_PromptAtStartup_label in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 22:50:04.256
+!MESSAGE NLS unused message: RecentWorkspacesPreferencePage_RemoveButton_label in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 22:50:05.818
+!MESSAGE NLS unused message: url_couldNotResolve_projectDoesNotExist in: org.eclipse.core.internal.utils.messages
+
+!ENTRY org.eclipse.core.resources 2 10035 2020-10-27 22:50:05.865
+!MESSAGE The workspace exited with unsaved changes in the previous session; refreshing workspace to recover changes.
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 22:50:06.037
+!MESSAGE NLS unused message: Shortcuts_shortcutTab in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 22:50:06.037
+!MESSAGE NLS unused message: Shortcuts_selectShortcutsLabel in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 22:50:06.037
+!MESSAGE NLS unused message: Shortcuts_availableMenus in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 22:50:06.037
+!MESSAGE NLS unused message: Shortcuts_availableCategories in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 22:50:06.037
+!MESSAGE NLS unused message: Shortcuts_allShortcuts in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 22:50:06.037
+!MESSAGE NLS unused message: Util_listNull in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 22:50:06.037
+!MESSAGE NLS unused message: OpenBrowserHandler_NoInfoDialogTitle in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 22:50:06.037
+!MESSAGE NLS unused message: AboutFeaturesDialog_SimpleTitle in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 22:50:08.991
+!MESSAGE NLS unused message: BinaryDumpHandler_1 in: com.tomato.exerd.handler.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 22:50:08.991
+!MESSAGE NLS unused message: ConvertToXMLHandler_1 in: com.tomato.exerd.handler.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 22:50:08.991
+!MESSAGE NLS unused message: SelectHandler_11 in: com.tomato.exerd.handler.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 22:50:08.991
+!MESSAGE NLS unused message: ToggleColumnVisibilityHandler_4 in: com.tomato.exerd.handler.messages
+
+!ENTRY org.eclipse.osgi 2 1 2020-10-27 22:50:08.991
+!MESSAGE NLS unused message: ToggleColumnVisibilityHandler_5 in: com.tomato.exerd.handler.messages

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

@@ -26,13 +26,17 @@
 <folder appearance="1" expanded="2">
 <presentation id="org.eclipse.ui.presentations.WorkbenchPresentationFactory">
 <part id="0"/>
+<part id="1"/>
 </presentation>
 </folder>
 </info>
 </editorArea>
-<editor 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">
+<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 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>
 </editors>
 <views>
 <view id="com.tomato.exerd.modelview3.ModelView3" partName="모델">
@@ -60,7 +64,7 @@
 <viewState/>
 </view>
 </views>
-<perspectives activePart="com.tomato.exerd.ui.views.thumbnail" activePerspective="com.tomato.exerd.perspective.design">
+<perspectives activePart="com.tomato.exerd.editor.DiagramEditor" activePerspective="com.tomato.exerd.perspective.design">
 <perspective editorAreaTrimState="2" editorAreaVisible="1" fixed="0" version="0.016">
 <descriptor class="com.tomato.exerd.perspective.ExerdPerspectiveFactory" id="com.tomato.exerd.perspective.design" label="eXERD"/>
 <alwaysOnActionSet id="org.eclipse.ui.cheatsheets.actionSet"/>
@@ -131,7 +135,7 @@
 </presentation>
 </folder>
 </info>
-<info folder="true" part="bottomFolder" ratio="0.6996904" ratioLeft="452" ratioRight="194" relationship="4" relative="org.eclipse.ui.editorss">
+<info folder="true" part="bottomFolder" ratio="0.9800138" ratioLeft="1422" ratioRight="29" relationship="4" relative="org.eclipse.ui.editorss">
 <folder activePageID="org.eclipse.ui.console.ConsoleView" appearance="2" expanded="2">
 <page content="com.tomato.exerd.validate.ui.ValidateView" label="검토"/>
 <page content="org.eclipse.ui.console.ConsoleView" label="콘솔"/>
@@ -160,7 +164,15 @@
 <navigationHistory>
 <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/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_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/asis/iSTYLE24_Mall.exerd"/>
 </editors>
+<item historyLabel="ST24.exerd" index="0"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="1"/>
+<item historyLabel="ST24.exerd" index="0"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="1"/>
+<item historyLabel="ST24.exerd" index="0"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="2"/>
 <item active="true" historyLabel="ST24.exerd" index="0"/>
 </navigationHistory>
 <input factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/" type="8"/>
@@ -179,6 +191,9 @@
 </trimLayout>
 </window>
 <mruList>
+<file factoryID="org.eclipse.ui.ide.FileStoreEditorInputFactory" id="com.tomato.exerd.editor.DiagramEditor" name="iSTYLE24_Mall.exerd" tooltip="D:\WIDE\workspace\webapps\style24\style24.doc\산출물\3.설계\ERD\asis\iSTYLE24_Mall.exerd">
+<persistable uri="file:/D:/WIDE/workspace/webapps/style24/style24.doc/산출물/3.설계/ERD/asis/iSTYLE24_Mall.exerd"/>
+</file>
 <file factoryID="org.eclipse.ui.ide.FileStoreEditorInputFactory" id="com.tomato.exerd.editor.DiagramEditor" name="ST24.exerd" tooltip="D:\WIDE\workspace\webapps\style24\style24.doc\산출물\3.설계\ERD\ST24.exerd">
 <persistable uri="file:/D:/WIDE/workspace/webapps/style24/style24.doc/산출물/3.설계/ERD/ST24.exerd"/>
 </file>