소스정리

style24.admin/src/main/java/com/style24/persistence/domain/Order.java

@@ -30,6 +30,7 @@ public class Order extends TscBaseDomain {
 	private String frontGb;
 	private String frontGbNm;
 	
+	
 	// 주문상세
 	private int ordDtlNo;
 	private String ordExchGb;
@@ -357,8 +358,6 @@ public class Order extends TscBaseDomain {
 	private int chgQty;
 	private int rtnDelvFee;
 	private int excDelvFee;
-	
-
 }
 
 

style24.admin/src/main/java/com/style24/persistence/mybatis/shop/TsaOrder.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.style24.admin.biz.dao.TsaOrderDao">
 
-	<!-- 주문목록 카운트 -->
+	<!-- 주문목록 > 주문목록카운트 -->
 	<select id="getOrderListCount" parameterType="Order" resultType="int">
 		/* order.getOrderListCnt */
 		SELECT COUNT(1)  
@@ -166,7 +166,7 @@
         </if>
 	</select>
 
-	<!-- 주문목록 -->
+	<!-- 주문목록 > 주문목록 -->
 	<select id="getOrderList" parameterType="Order" resultType="Order">
 		/* order.getOrderList */
 		SELECT Z.*
@@ -386,7 +386,7 @@
              , Z.ORD_DTL_ITEM_SQ DESC
 	</select>
 	
-	<!-- 주문상세 > 주문 정보 -->
+	<!-- 주문상세 > 주문기본정보 -->
 	<select id="getOrderInfoList" parameterType="Order" resultType="Order">
 		/* order.getOrderInfoList */
 		SELECT O.SITE_CD
@@ -448,7 +448,7 @@
 		LIMIT  1
 	</select>
 	
-	<!-- 주문상세 > 상품상세 목록 -->
+	<!-- 주문상세 > 주문상품상세 목록(단품) -->
 	<select id="getOrderDetailList" parameterType="Order" resultType="Order">
 		/* order.getOrderDetailList */
 		SELECT OD.ORD_NO
@@ -470,6 +470,10 @@
 		     , ODI.ITEM_PRICE
 		     , ODI.ITEM_QTY * OD.ORD_QTY      AS ORD_QTY
 		     , ODI.ITEM_QTY * OD.CNCL_RTN_QTY AS CNCL_RTN_QTY
+ 		     , CASE WHEN OCD.ORD_REQ_CHG_QTY IS NULL
+			        THEN 0
+			        ELSE OCD.ORD_REQ_CHG_QTY * ODI.ITEM_QTY
+			        END  ORD_REQ_CHG_QTY
 		     , ODI.OPT_ADD_PRICE 
 		     , ODI.CPN1_DC_AMT
 		     , ODI.GOODS_CPN_DC_AMT
@@ -540,8 +544,21 @@
 				GROUP  BY ODH.ORD_DTL_STAT
 			) Z
 		) X
-		ON     OD.ORD_NO = X.ORD_NO
-		AND    OD.ORD_DTL_NO = X.ORD_DTL_NO
+		ON     OD.ORD_DTL_NO = X.ORD_DTL_NO
+		LEFT   OUTER JOIN (
+			SELECT OD.ORD_DTL_NO
+			     , SUM(OCD.CHG_QTY) AS ORD_REQ_CHG_QTY
+			FROM   TB_ORDER_CHANGE_DETAIL OCD
+			INNER  JOIN TB_ORDER_DETAIL OD
+			ON     OCD.ORD_DTL_NO = OD.ORD_DTL_NO
+			WHERE  1=1
+			AND    OD.ORD_NO = #{ordNo}
+			AND    OCD.CHG_STAT IN (
+				'G685_20', 'G685_30', 'G685_40'
+			)
+			GROUP  BY OCD.ORD_DTL_NO
+		) OCD
+		ON     OD.ORD_DTL_NO = OCD.ORD_DTL_NO
 		WHERE  1=1
 		AND    OD.ORD_NO = #{ordNo}
 	</select>
@@ -657,7 +674,7 @@
 		     , Z.DELV_FEE_SQ
 	</select>
 	
-	<!-- 주문상세 > 취소 / 반품 / 교환 요청 정보 -->
+	<!-- 주문상세 > 취소/반품/교환 요청정보 -->
 	<select id="getOrderChangeList" parameterType="Order" resultType="Order">
 		/* order.getOrderChangeList */
 		SELECT OCD.ORD_CHG_SQ
@@ -854,14 +871,14 @@
 		</if>
 	</select>
 	
-	<!-- 입점업체 엑셀다운용 임시테이블 삭제-->
+	<!-- 주문/배송 > 입점업체 엑셀다운용 임시테이블 삭제-->
 	<delete id="deleteEntryExcelDownTmp" parameterType="Order">
 		/* TsbOrder.deleteEntryExcelDownTmp */
 		DELETE FROM TB_ENTRY_UPLOAD_EXCEL
 		WHERE  1=1
 	</delete>
 	
-	<!-- 주문상세정보 변경 (입점) -->
+	<!-- 주문/배송 > 입점업체 주문상세정보 변경 (입점) -->
 	<update id="updateOrderDetailStat" parameterType="Order">
 		/* Order.updateOrderDetailStat */
 		UPDATE TB_ORDER_DETAIL
@@ -873,7 +890,7 @@
 		AND    SUPPLY_COMP_CD = #{supplyCompCd}
 	</update>
 	
-	<!-- 주문상세이력 생성-->
+	<!-- 주문/배송 > 주문상세이력 생성-->
 	<insert id="createOrderDetailHst" parameterType="Order">
 		/* Order.createOrderDetailHst */
 		INSERT INTO TB_ORDER_DETAIL_HST (
@@ -1028,7 +1045,7 @@
 		WHERE  ORD_DTL_NO = #{ordDtlNo}
 	</insert>
 	
-	<!-- 입점업체 엑셀다운 임시파일 체크-->
+	<!-- 주문/배송 > 입점업체 엑셀다운 임시파일 체크-->
 	<select id="getEntryUploadExcelCheck" parameterType="Order" resultType="int">
 		SELECT COUNT(1)
 		FROM   TB_ENTRY_UPLOAD_EXCEL X
@@ -1037,7 +1054,7 @@
 		AND    X.ORD_DTL_NO = #{ordDtlNo}
 	</select>
 	
-	<!-- 입점업체 엑셀다운용 임시테이블 생성-->
+	<!-- 주문/배송 > 입점업체 엑셀다운용 임시테이블 생성-->
 	<insert id="createEntryExcelDownTmp" parameterType="Order">
 		INSERT INTO TB_ENTRY_UPLOAD_EXCEL (
 			ORD_NO
@@ -1189,7 +1206,7 @@
 		AND    OD.ORD_DTL_NO = ODI.ORD_DTL_NO
 	</select>
 	
-	<!-- 주문상세정보 변경 - 송장번호 적용(입점)  -->
+	<!-- 주문/배송 > 주문상세정보 변경 - 송장번호 적용(입점)  -->
 	<update id="updateOrderDetailInvoice" parameterType="Order">
 		/* TsaOrder.updateOrderDetailInvoice */
 		UPDATE TB_ORDER_DETAIL
@@ -1648,7 +1665,7 @@
 		AND    ORD_DTL_ITEM_SQ = #{ordDtlItemSq}
 	</insert>
 	
-	<!-- 주문상세이력 생성-->
+	<!-- 주문상세 > 주문취소 > 주문상세이력 생성-->
 	<insert id="createOrderDetailHstCnclRtn" parameterType="Order">
 		/* Order.createOrderDetailHstCnclRtn */
 		INSERT INTO TB_ORDER_DETAIL_HST (

style24.admin/src/main/webapp/WEB-INF/views/order/CancelRequestForm.html

@@ -5,7 +5,7 @@
  * @source  : CancelRequestForm.html
  * @desc    : 취소요청 화면
  *============================================================================
- * Pastelmall
+ * STYLE24
  * Copyright(C) 2019 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/order/CancelRequestFormBack.html

@@ -5,7 +5,7 @@
  * @source  : CancelRequestForm.html
  * @desc    : 취소요청 화면
  *============================================================================
- * Pastelmall
+ * STYLE24
  * Copyright(C) 2019 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/order/OrderDetailChangeHst.html

@@ -5,7 +5,7 @@
  * @source  : OrderDetailChangeHst.html
  * @desc    : 주문상품상세이력 화면
  *============================================================================
- * Pastelmall
+ * STYLE24
  * Copyright(C) 2019 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/order/OrderDetailCouponHst.html

@@ -5,7 +5,7 @@
  * @source  : OrderDetailCouponHst.html
  * @desc    : 주문상품 상세 쿠폰 이력 화면
  *============================================================================
- * Pastelmall
+ * STYLE24
  * Copyright(C) 2019 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/order/OrderDetailForm.html

@@ -5,7 +5,7 @@
  * @source  : OrderListForm.html
  * @desc    : 주문상세화면
  *============================================================================
- * SISUN
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION
@@ -287,6 +287,7 @@ var columnDefsGoodsInfo = [
 		children	: [
 			{headerName: "주문수량"	, field: "ordQty"		, width: 80, cellClass: 'text-center'},
 			{headerName: "취소수량"	, field: "cnclRtnQty"	, width: 80, cellClass: 'text-center'},
+			{headerName: "변경요청수량"	, field: "ordReqChgQty"	, width: 100, cellClass: 'text-center'},
 			{headerName: "상세상태"	, field: "ordDtlStat"	, width: 120, cellClass: 'text-center', hide: true},
 			{
 				headerName		: "상세상태"

style24.admin/src/main/webapp/WEB-INF/views/order/OrderDetailGiftcardHst.html

@@ -5,7 +5,7 @@
  * @source  : OrderDetailPointHst.html
  * @desc    : 주문상품 상세 상품권 이력 화면
  *============================================================================
- * Pastelmall
+ * STYLE24
  * Copyright(C) 2019 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/order/OrderDetailPointHst.html

@@ -5,7 +5,7 @@
  * @source  : OrderDetailPointHst.html
  * @desc    : 주문상품 상세 마일리지 이력 화면
  *============================================================================
- * Pastelmall
+ * STYLE24
  * Copyright(C) 2019 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/order/OrderDetailTmtbHst.html

@@ -5,7 +5,7 @@
  * @source  : OrderDetailPointHst.html
  * @desc    : 주문상품 상세 상품권 이력 화면
  *============================================================================
- * Pastelmall
+ * STYLE24
  * Copyright(C) 2019 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/order/OrderListForm.html

@@ -5,7 +5,7 @@
  * @source  : OrderListForm.html
  * @desc    : 주문목록 Page
  *============================================================================
- * SISUN
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/order/OrderMemoRegistForm.html

@@ -5,7 +5,7 @@
  * @source  : OrderMemoRegistForm.html
  * @desc    : 주문메모 등록 화면
  *============================================================================
- * SISUN
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/order/OrderSellerListForm.html

@@ -5,7 +5,7 @@
  * @source  : OrderSellerListForm.html
  * @desc    : 입점업체미발주목록조회 Page
  *============================================================================
- * SISUN
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/order/RefundAccountRegistForm.html

@@ -5,7 +5,7 @@
  * @source  : OrderListForm.html
  * @desc    : 주문목록 Page
  *============================================================================
- * SISUN
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/order/ReturnRequestForm.html

@@ -5,7 +5,7 @@
  * @source  : CancelRequestForm.html
  * @desc    : 반품요청 화면
  *============================================================================
- * Pastelmall
+ * STYLE24
  * Copyright(C) 2019 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.front/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF

@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
+Build-Jdk-Spec: 14
 Implementation-Title: style24.front
 Implementation-Version: 0.0.1-SNAPSHOT
-Build-Jdk-Spec: 1.8
 Created-By: Maven Integration for Eclipse