Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.core into develop

src/main/java/com/style24/core/biz/service/TscOrderService.java

@@ -327,7 +327,8 @@ public class TscOrderService {
 			, "할인금액"
 			, "실결제금액"
 			, "배송비"
-			, "송장"
+			, "배송업체코드"
+			, "송장번호"
 			, "배송메모"
 		};
 
@@ -359,6 +360,7 @@ public class TscOrderService {
 			, "totDcAmt"
 			, "realOrdAmt"
 			, "realDelvAmt"
+			, "shipCompCd"
 			, "invoiceNo"
 			, "delvMemo"
 		};
@@ -392,6 +394,7 @@ public class TscOrderService {
 			, GagaExcelConstants.CellType.CHAR_CENTER.name()
 			, GagaExcelConstants.CellType.CHAR_CENTER.name()
 			, GagaExcelConstants.CellType.CHAR_CENTER.name()
+			, GagaExcelConstants.CellType.CHAR_CENTER.name()
 		};
 
 		GagaExcelResultHandler<Order> handler = new GagaExcelResultHandler<>(excelFilenameWithPath, "출고배송목록(입점)", listTitles, cellNames, cellTypes);

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

@@ -4745,23 +4745,37 @@
 	<!-- 환불컨펌시 배송중상태 조회 -->
 	<select id="getOrderDetailItem20Cnt" parameterType="Order" resultType="int">
 		/* TscOrderChange.getOrderDetailItem20Cnt : 환불컨펌시 배송중상태 조회 */
-		SELECT COUNT(1) AS CNT
-		FROM   TB_ORDER_DETAIL_ITEM_HST
-		WHERE  1=1
-		AND    ORD_DTL_ITEM_SQ = #{ordDtlItemSq}
-		AND    ORD_DTL_STAT = 'G720_20'
+		SELECT SUM(CNT) AS CNT
+		FROM (
+			SELECT CASE WHEN ODIH.ORD_DTL_STAT IS NULL AND ODI.REG_DT > '2021-09-01'
+			            THEN 0
+			            ELSE 1
+			            END  CNT
+			FROM   TB_ORDER_DETAIL_ITEM ODI
+			LEFT   JOIN TB_ORDER_DETAIL_ITEM_HST ODIH
+			ON     ODIH.ORD_DTL_ITEM_SQ = ODI.ORD_DTL_ITEM_SQ
+			AND    ODIH.ORD_DTL_STAT = 'G720_20'
+			WHERE  1=1
+			AND    ODI.ORD_DTL_ITEM_SQ = #{ordDtlItemSq}
+		) A
 	</select>
 	
 		<!-- 환불컨펌시 배송중상태 조회 전체취소 -->
 	<select id="getOrderDetailItem20CntAll" parameterType="OrderChange" resultType="int">
 		/* TscOrderChange.getOrderDetailItem20CntAll : 환불컨펌시 배송중상태 조회 전체취소 */
-		SELECT COUNT(1) AS CNT
-		FROM   TB_ORDER_DETAIL_ITEM_HST ODIH
-		INNER  JOIN TB_ORDER O
-		ON     ODIH.ORD_NO = O.ORD_NO
-		WHERE  1=1
-		AND    O.ORD_NO = #{ordNo}
-		AND    ODIH.ORD_DTL_STAT = 'G720_20'
+		SELECT SUM(CNT) AS CNT
+		FROM (
+			SELECT CASE WHEN ODIH.ORD_DTL_STAT IS NULL AND O.REG_DT > '2021-09-01'
+			            THEN 0
+			            ELSE 1
+			            END  CNT
+			FROM   TB_ORDER O
+			LEFT   JOIN TB_ORDER_DETAIL_ITEM_HST ODIH
+			ON     ODIH.ORD_NO = O.ORD_NO
+			AND    ODIH.ORD_DTL_STAT = 'G720_20'
+			WHERE  1=1
+			AND    O.ORD_NO = #{ordNo}
+		) A
 	</select>
 
 	<!-- 주문상세단품 정보 조회 -->

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

@@ -299,13 +299,13 @@
 		     , ODI.OPT_CD1
 		     , ODI.OPT_CD2
 		     , CONCAT(ODI.OPT_CD1, ',', ODI.OPT_CD2) AS OPT
-		     , DF.REAL_DELV_AMT
 		     , OD.ORD_QTY
 		     , OD.CNCL_RTN_QTY
 		     , OD.ORD_AMT
 		     , OD.CNCL_RTN_AMT
 		     , OD.CPN1_DC_AMT + OD.TMTB1_DC_AMT + OD.TMTB2_DC_AMT +  OD.GOODS_CPN_DC_AMT + OD.CART_CPN_DC_AMT + OD.PNT_DC_AMT + OD.PRE_PNT_DC_AMT AS TOT_DC_AMT
 		     , OD.REAL_ORD_AMT
+		     , OD.SHIP_COMP_CD
 		     , OD.INVOICE_NO
 		     , DA.DELV_MEMO
 		FROM   TB_ORDER O