Merge remote-tracking branch '112.172.147.34/style' into ST24PRJ-659(휴대폰-취소시-계좌번호-입력화면-오류-문의)

src/main/java/com/style24/core/biz/dao/TscScmDao.java

@@ -158,4 +158,44 @@ public interface TscScmDao {
 	 * @since 2021. 05. 20
 	 */
 	int getChgReasonCheck(Order order);
+	
+	/**
+	 * 주문변경신청 완료 정보 조회(취소,반품)
+	 * 
+	 * @param Order
+	 * @return Collection<Order>
+	 * @author jsh77b
+	 * @since 2021. 12. 21
+	 */
+	List<Order> getCnclRtnCompleteList(Order order);
+	
+	/**
+	 * 취소,반품,교환 대상목록 조회
+	 * 
+	 * @param Order
+	 * @return Collection<Order>
+	 * @author jsh77b
+	 * @since 2021. 12. 21
+	 */
+	List<Order> getCancelRequestTargetList2(Order order);
+	
+	/**
+	 * 주문변경 대상목록 조회 (취소, 반품, 교환)
+	 * 
+	 * @param Order
+	 * @return Collection<Order>
+	 * @author jsh77b
+	 * @since 2021. 12. 21
+	 */
+	List<Order> getCancelRequestTargetList(Order order);
+	
+	/**
+	 * 추가배송비 결제여부 조회
+	 * 
+	 * @param Order
+	 * @return Collection<Order>
+	 * @author jsh77b
+	 * @since 2021. 12. 21
+	 */
+	Order getAddDelvFee(Order order);
 }

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

@@ -3467,6 +3467,50 @@ public class TscOrderService {
 	public int getDeliveryBanZipcode(Order order) {
 		return orderDao.getDeliveryBanZipcode(order);
 	}
+	
+	/**
+	 * 주문변경신청 완료 정보 조회(취소,반품)
+	 * @param Order
+	 * @return Order
+	 * @author jsh77b
+	 * @since 2021. 12. 21
+	 */
+	public List<Order> getCnclRtnCompleteList(Order order) {
+		return scmDao.getCnclRtnCompleteList(order);
+	}
+	
+	/**
+	 * 취소,반품,교환 대상목록 조회
+	 * @param Order
+	 * @return Order
+	 * @author jsh77b
+	 * @since 2021. 12. 21
+	 */
+	public List<Order> getCancelRequestTargetList2(Order order) {
+		return scmDao.getCancelRequestTargetList2(order);
+	}
+	
+	/**
+	 * 주문변경 대상목록 조회 (취소, 반품, 교환)
+	 * @param Order
+	 * @return Order
+	 * @author jsh77b
+	 * @since 2021. 12. 21
+	 */
+	public List<Order> getCancelRequestTargetList(Order order) {
+		return scmDao.getCancelRequestTargetList(order);
+	}
+	
+	/**
+	 * 추가배송비 결제여부 조회
+	 * @param Order
+	 * @return Order
+	 * @author jsh77b
+	 * @since 2021. 12. 21
+	 */
+	public Order getAddDelvFee(Order order) {
+		return scmDao.getAddDelvFee(order);
+	}
 }
 
 

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

@@ -838,4 +838,9 @@ public class Order extends TscBaseDomain {
 	private String cashReceipReqYn;	/*현금영수증신청여부*/
 	private String shotDelvGb;		/*총알배송구분*/
 	
+	
+	private int dcSumAmt;
+	private String addPayCostPayYn;
+	private String addPayCostPgGb;
+	
 }

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

@@ -499,6 +499,13 @@
 		                 )
 		       END                                        AS REG_NM
 		     , DATE_FORMAT(CA.REG_DT,'%Y-%m-%d %H:%i:%S') AS REG_DT
+		     , CASE WHEN CA.CUST_NO = CA.UPD_NO THEN CONCAT(C.CUST_ID,'/',FN_DEC_AES(C.CUST_NM))
+		            ELSE (SELECT CONCAT(USER_ID,'/',USER_NM)
+		                  FROM   TB_USER
+		                  WHERE  USER_NO = CA.UPD_NO
+		                 )
+		       END                                        AS UPD_NM
+		     , DATE_FORMAT(CA.UPD_DT,'%Y-%m-%d %H:%i:%S') AS UPD_DT
 		FROM   TB_CUST_ACCOUNT CA
 		     , TB_CUSTOMER C
 		WHERE  CA.CUST_NO = C.CUST_NO

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

@@ -583,6 +583,7 @@
 		             , G.GOODS_NM
 		             , ODI.OPT_CD1 
 		             , ODI.OPT_CD2
+		             , OD.ORD_QTY
 		             , OCD.CHG_QTY
 		             , OCD.CHG_ORD_DTL_NO AS EXCHANGE_ORD_DTL_NO
 		             , ODI2.OPT_CD1 AS OPT_CD11 
@@ -691,6 +692,703 @@
 		AND    ORD_CHG_SQ = #{ordChgSq}
 		AND    CHG_REASON = #{chgReason}
 	</select>
+	
+	<!-- 주문변경신청 완료 정보 조회(취소,반품) -->
+	<select id="getCnclRtnCompleteList" parameterType="Order" resultType="Order">
+		/* TscScm.getCnclRtnCompleteList */
+		SELECT A.ORD_NO
+		     , A.ORD_DTL_NO
+		     , A.GOODS_CD
+		     , A.GOODS_NM
+		     , A.GOODS_TYPE_NM
+		     , A.CHG_REASON 
+		     , A.CHG_REASON_NM
+		     , A.CHG_MEMO
+		     , A.ADD_PAY_COST
+		     , A.RA_BANK 
+		     , A.RA_BANK_NM
+		     , A.RA_NM 
+		     , A.RA_NO
+		     , A.REAL_DELV_AMT
+		     , A.DELV_CPN_DC_AMT
+		     , A.ORD_QTY
+		     , A.CNCL_RTN_QTY
+		     , A.ORD_AMT
+		     , A.OPT_CD
+		     , A.OPT_CD1
+		     , A.OPT_CD2
+		     , A.COLOR_NM
+		     , A.CNCL_RTN_AMT
+		     , A.CPN1_DC_AMT
+		     , A.TMTB1_DC_AMT
+		     , A.TMTB2_DC_AMT
+		     , A.GOODS_CPN_DC_AMT
+		     , A.CART_CPN_DC_AMT
+		     , A.PNT_DC_AMT
+		     , A.PRE_PNT_DC_AMT
+		     , A.GFCD_USE_AMT
+		     , A.REAL_ORD_AMT
+		     , A.SAVE_PNT_AMT
+		     , A.REFUND_AMT
+		     , A.DEPOSIT_AMT
+		     , A.RF_CPN1_AMT
+		     , A.RF_TMTB1_AMT
+		     , A.RF_TMTB2_AMT
+		     , A.RF_GOODS_CPN_AMT
+		     , A.RF_CART_CPN_AMT
+		     , A.RF_DELV_CPN_AMT
+		     , A.RF_PNT_AMT
+		     , A.RF_PRE_PNT_AMT
+		     , A.RF_GFCD_USE_AMT
+		     , A.RF_DELV_GFCD_USE_AMT
+		     , A.RF_CNCL_AMT
+		     , A.RF_DELIVERY_FEE
+		     , A.RF_REAL_CNCL_AMT
+		     , A.SUPPLY_COMP_NM
+		     , A.BRAND_GROUP_NM
+		     , A.CHG_GB_NM
+		     , A.CHG_STAT_NM
+		     , A.REG_DT
+		FROM (
+		    SELECT ODIH.ORD_NO
+		         , ODIH.ORD_DTL_NO
+		         , G1.GOODS_CD
+		         , G1.GOODS_NM
+		         , CASE WHEN G1.GOODS_TYPE IN ('G056_N')
+		                THEN '일반'
+		                ELSE '셋트'
+		                END GOODS_TYPE_NM
+		         , OC.CHG_REASON 
+		         , CASE WHEN OC.CHG_GB = 'G680_20' THEN FN_GET_CODE_NM('G686', OC.CHG_REASON)
+  		                WHEN OC.CHG_GB = 'G680_30' THEN FN_GET_CODE_NM('G688', OC.CHG_REASON)
+  		                ELSE FN_GET_CODE_NM('G689', OC.CHG_REASON)
+  		                END  CHG_REASON_NM
+		         , CASE WHEN OC.CHG_MEMO IS NULL
+		                THEN ''
+		                ELSE OC.CHG_MEMO
+		                END  CHG_MEMO
+		         , OC.ADD_PAY_COST
+		         , RF.RA_BANK 
+		         , FN_GET_CODE_NM('G940', RF.RA_BANK) AS RA_BANK_NM
+		         , RF.RA_NM 
+		         , RF.RA_NO
+		         , IFNULL(DDF.REAL_DELV_AMT, 0) * -1 AS REAL_DELV_AMT
+		         , RF.RF_DELV_CPN_AMT AS DELV_CPN_DC_AMT
+		         , IFNULL((SELECT COLOR_KNM FROM TB_COLOR C WHERE COLOR_CD = IFNULL(NULLIF(ODIH.OPT_CD1,'') , G1.MAIN_COLOR_CD ) AND USE_YN  = 'Y'), ODIH.OPT_CD1) AS COLOR_NM
+		         , ODIH.ORD_DTL_ITEM_SQ
+		         , ODIH.OPT_CD
+		         , ODIH.OPT_CD1
+		         , ODIH.OPT_CD2
+		         , ODIH.ORD_QTY
+		         , ODIH.CNCL_RTN_QTY
+		         , ODIH.ORD_AMT
+		         , ODIH.CNCL_RTN_AMT
+		         , ODIH.CPN1_DC_AMT
+		         , ODIH.TMTB1_DC_AMT 
+		         , ODIH.TMTB2_DC_AMT 
+		         , ODIH.GOODS_CPN_DC_AMT
+		         , ODIH.CART_CPN_DC_AMT
+		         , ODIH.PNT_DC_AMT
+		         , ODIH.PRE_PNT_DC_AMT 
+		         , ODIH.GFCD_USE_AMT 
+		         , ODIH.REAL_ORD_AMT 
+		         , ODIH.SAVE_PNT_AMT
+		         , RF.REFUND_AMT
+		         , RF.DEPOSIT_AMT
+		         , RF.RF_CPN1_AMT
+		         , RF.RF_TMTB1_AMT
+		         , RF.RF_TMTB2_AMT
+		         , RF.RF_GOODS_CPN_AMT
+		         , RF.RF_CART_CPN_AMT
+		         , RF.RF_DELV_CPN_AMT
+		         , RF.RF_PNT_AMT
+		         , RF.RF_PRE_PNT_AMT
+		         , RF.RF_GFCD_USE_AMT
+		         , RF.RF_DELV_GFCD_USE_AMT
+		         , RF.RF_CNCL_AMT
+		         , RF.RF_DELIVERY_FEE
+		         , RF.RF_REAL_CNCL_AMT
+		         , FN_GET_SUPPLY_COMP_NM(OD.SUPPLY_COMP_CD) AS SUPPLY_COMP_NM
+		         , (SELECT CASE WHEN BG.DISP_NM_LANG = 'EN'
+		                        THEN BG.BRAND_GROUP_ENM
+		                        ELSE BG.BRAND_GROUP_KNM
+		                        END  BRAND_GROUP_NM
+		            FROM   TB_BRAND BR
+		            INNER  JOIN TB_BRAND_GROUP BG
+		            ON     BR.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
+		            WHERE  1=1
+		            AND    BR.BRAND_CD = G1.BRAND_CD
+		            AND    BG.USE_YN = 'Y') AS BRAND_GROUP_NM
+		         , FN_GET_CODE_NM('G680', OC.CHG_GB) AS CHG_GB_NM
+		         , FN_GET_CODE_NM('G685', OCD.CHG_STAT) AS CHG_STAT_NM
+		         , OC.REG_DT
+		    FROM   TB_ORDER_DETAIL_ITEM_HST ODIH
+		    INNER  JOIN TB_ORDER_DETAIL OD
+		    ON     ODIH.ORD_DTL_NO = OD.ORD_DTL_NO
+		    INNER  JOIN TB_GOODS G1
+		    ON     OD.GOODS_CD = G1.GOODS_CD
+		    INNER  JOIN TB_ORDER_CHANGE OC
+		    ON     ODIH.ORD_CHG_SQ = OC.ORD_CHG_SQ
+		    INNER  JOIN TB_ORDER_CHANGE_DETAIL OCD
+		    ON     OC.ORD_CHG_SQ = OCD.ORD_CHG_SQ
+		    INNER  JOIN TB_REFUND RF
+		    ON     ODIH.ORD_CHG_SQ = RF.ORD_CHG_SQ
+		    LEFT   OUTER JOIN (
+		        SELECT SUM(DF.REAL_DELV_AMT) AS REAL_DELV_AMT
+		             , DF.ORD_CHG_SQ
+		        FROM   TB_DELIVERY_FEE DF
+		        WHERE  DF.ORD_CHG_SQ = #{ordChgSq}
+		        GROUP  BY DF.ORD_CHG_SQ
+		    ) DDF
+		    ON     DDF.ORD_CHG_SQ = ODIH.ORD_CHG_SQ
+		    WHERE  1=1
+		    AND    ODIH.ORD_CHG_SQ = #{ordChgSq}
+		<choose>
+			<when test="chgStat == 'G720_30'">
+		    AND    ODIH.ORD_DTL_STAT IN ('G720_30', 'G720_40')
+			</when>
+			<otherwise>
+		    AND    ODIH.ORD_DTL_STAT = #{chgStat}
+			</otherwise>
+		</choose>
+		) A
+		WHERE  1=1
+		GROUP  BY A.ORD_NO
+		     , A.ORD_DTL_NO
+		     , A.GOODS_CD
+		     , A.GOODS_NM
+		     , A.GOODS_TYPE_NM
+		     , A.CHG_REASON 
+		     , A.CHG_REASON_NM
+		     , A.CHG_MEMO
+		     , A.ADD_PAY_COST
+		     , A.RA_BANK 
+		     , A.RA_BANK_NM
+		     , A.RA_NM 
+		     , A.RA_NO
+		     , A.REAL_DELV_AMT
+		     , A.DELV_CPN_DC_AMT
+		     , A.ORD_QTY
+		     , A.CNCL_RTN_QTY
+		     , A.ORD_AMT
+		     , A.OPT_CD
+		     , A.OPT_CD1
+		     , A.OPT_CD2
+		     , A.COLOR_NM
+		     , A.CNCL_RTN_AMT
+		     , A.CPN1_DC_AMT
+		     , A.TMTB1_DC_AMT
+		     , A.TMTB2_DC_AMT
+		     , A.GOODS_CPN_DC_AMT
+		     , A.CART_CPN_DC_AMT
+		     , A.PNT_DC_AMT
+		     , A.PRE_PNT_DC_AMT
+		     , A.GFCD_USE_AMT
+		     , A.REAL_ORD_AMT
+		     , A.SAVE_PNT_AMT
+		     , A.REFUND_AMT
+		     , A.DEPOSIT_AMT
+		     , A.RF_CPN1_AMT
+		     , A.RF_TMTB1_AMT
+		     , A.RF_TMTB2_AMT
+		     , A.RF_GOODS_CPN_AMT
+		     , A.RF_CART_CPN_AMT
+		     , A.RF_DELV_CPN_AMT
+		     , A.RF_PNT_AMT
+		     , A.RF_PRE_PNT_AMT
+		     , A.RF_GFCD_USE_AMT
+		     , A.RF_DELV_GFCD_USE_AMT
+		     , A.RF_CNCL_AMT
+		     , A.RF_DELIVERY_FEE
+		     , A.RF_REAL_CNCL_AMT
+		     , A.SUPPLY_COMP_NM
+		     , A.BRAND_GROUP_NM
+		     , A.CHG_GB_NM
+		     , A.CHG_STAT_NM
+		     , A.REG_DT
+		ORDER  BY A.ORD_NO
+		     , A.ORD_DTL_NO
+	</select>
+	
+	<!-- 취소,반품,교환 대상목록 조회 -->
+	<select id="getCancelRequestTargetList2" parameterType="Order" resultType="Order">
+		/* TscScm.getCancelRequestTargetList2 */
+		SELECT Z.*
+		     , DF.DELV_FEE
+		FROM (
+		    SELECT A.ORD_NO
+		         , A.ORD_DTL_NO
+		         , A.ORD_DTL_STAT
+		         , A.ORD_DTL_STAT_NM
+		         , A.ALL_CAN_YN
+		         , A.GOODS_CD
+		         , A.GOODS_NM
+		         , A.GOODS_TYPE
+		         , A.GOODS_TYPE_NM
+		         , GROUP_CONCAT(A.ITEM_CD ORDER BY A.ORD_DTL_ITEM_SQ) AS ITEM_CD
+		         , GROUP_CONCAT(A.ITEM_NM ORDER BY A.ORD_DTL_ITEM_SQ) AS ITEM_NM
+		         , GROUP_CONCAT(A.OPT_CD ORDER BY A.ORD_DTL_ITEM_SQ) AS OPT_CD
+		         , GROUP_CONCAT(A.OPT_CD1 ORDER BY A.ORD_DTL_ITEM_SQ) AS OPT_CD1
+		         , GROUP_CONCAT(A.OPT_CD2 ORDER BY A.ORD_DTL_ITEM_SQ) AS OPT_CD2
+		         , GROUP_CONCAT(A.ITEM_QTY ORDER BY A.ORD_DTL_ITEM_SQ) AS ITEM_QTYR
+		         , GROUP_CONCAT(A.COLOR_NM ORDER BY A.ORD_DTL_ITEM_SQ) AS COLOR_NM
+		         , A.LIST_PRICE
+		         , A.CURR_PRICE
+		         , SUM(A.OPT_ADD_PRICE) AS OPT_ADD_PRICE
+		         , A.ORD_QTY
+		         , A.CNCL_RTN_QTY
+		         , A.ORD_REQ_CHG_QTY
+		         , A.CPN1_DC_AMT
+		         , A.ORD_AMT
+		         , A.CNCL_RTN_AMT
+		         , A.TMTB1_DC_AMT
+		         , A.TMTB2_DC_AMT
+		         , A.GOODS_CPN_DC_AMT
+		         , A.CART_CPN_DC_AMT
+		         , A.PRE_PNT_DC_AMT
+		         , A.PNT_DC_AMT
+		         , A.GFCD_USE_AMT
+		         , A.REAL_ORD_AMT
+		         , A.SUPPLY_COMP_CD
+		         , A.SUPPLY_COMP_NM
+		         , A.DELV_FEE_CRITE
+		         , A.MIN_ORD_AMT
+		         , A.ORG_DELV_FEE
+		         , A.RTN_DELV_FEE
+		         , A.EXC_DELV_FEE
+		         , A.SELF_GOODS_YN
+		         , A.DELV_FEE_CD
+		         , A.ORD_CAN_CHG_QTY
+		         , A.CHG_STAT
+		         , A.WD_GB
+		         , A.ADD_PAY_COST
+		         , A.DELV_FAIL_REASON
+		         , A.BRAND_GROUP_NM
+		         , A.CHG_GB_NM
+		         , A.CHG_STAT_NM
+		         , A.REG_DT
+		    FROM (
+		        SELECT OD.ORD_NO
+		             , OD.ORD_DTL_NO
+		             , OD.ORD_DTL_STAT
+		             , FN_GET_CODE_NM('G013', OD.ORD_DTL_STAT)  AS ORD_DTL_STAT_NM
+		             , CASE WHEN OD.ORD_DTL_STAT IN ('G013_10', 'G013_20', 'G013_30')
+		                    THEN 'Y'
+		                    ELSE 'N'
+		                    END  ALL_CAN_YN
+		             , G1.GOODS_CD
+		             , G1.GOODS_NM
+		             , G1.GOODS_TYPE
+		             , FN_GET_CODE_NM('G056', G1.GOODS_TYPE)    AS GOODS_TYPE_NM
+		             , ODI.ORD_DTL_ITEM_SQ
+		             , ODI.ITEM_CD
+		             , G2.GOODS_NM AS ITEM_NM
+		             , ODI.OPT_CD
+		             , ODI.OPT_CD1
+		             , ODI.OPT_CD2
+		             , ODI.ITEM_QTY
+		             , IFNULL((SELECT COLOR_KNM FROM TB_COLOR WHERE COLOR_CD = IFNULL(NULLIF(ODI.OPT_CD1,'') , G1.MAIN_COLOR_CD ) AND USE_YN  = 'Y'), ODI.OPT_CD1) AS COLOR_NM
+		             , OD.LIST_PRICE
+		             , OD.CURR_PRICE
+		             , ODI.OPT_ADD_PRICE
+		             , OD.ORD_QTY
+		             , OD.CNCL_RTN_QTY
+		             , IFNULL(OCD.ORD_REQ_CHG_QTY, 0) AS ORD_REQ_CHG_QTY
+		             , OD.CPN1_DC_AMT
+		             , OD.ORD_AMT
+		             , OD.CNCL_RTN_AMT
+		             , OD.TMTB1_DC_AMT
+		             , OD.TMTB2_DC_AMT
+		             , OD.GOODS_CPN_DC_AMT
+		             , OD.CART_CPN_DC_AMT
+		             , OD.PRE_PNT_DC_AMT
+		             , OD.PNT_DC_AMT
+		             , OD.GFCD_USE_AMT
+		             , OD.REAL_ORD_AMT
+		             , OD.SUPPLY_COMP_CD
+		             , FN_GET_SUPPLY_COMP_NM(OD.SUPPLY_COMP_CD) AS SUPPLY_COMP_NM
+		             , DFP.DELV_FEE_CRITE
+		             , CASE DFP.DELV_FEE_CRITE WHEN 'G078_30' THEN 99999999
+		                                       WHEN 'G078_20' THEN 0
+		                                       ELSE DFP.MIN_ORD_AMT
+		                END AS MIN_ORD_AMT
+		             , DFP.DELV_FEE AS ORG_DELV_FEE
+		             , DFP.RTN_DELV_FEE
+		             , DFP.RTN_DELV_FEE + DFP.RTN_DELV_FEE AS EXC_DELV_FEE
+		             , G1.SELF_GOODS_YN
+		             , CASE WHEN G1.SELF_GOODS_YN = 'Y'
+		                    THEN 'WMS'
+		                    ELSE OD.DELV_FEE_CD
+		                    END  DELV_FEE_CD
+		             , CASE WHEN X.CHG_STAT IS NOT NULL 
+		                    THEN X.CHG_QTY
+		                    ELSE Y.CNCL_RTN_QTY
+		                    END ORD_CAN_CHG_QTY
+		             , CASE WHEN X.CHG_STAT IS NOT NULL 
+		                    THEN X.CHG_STAT
+		                    ELSE Y.CHG_STAT
+		                    END CHG_STAT
+		             , Y.WD_GB
+		             , Y.ADD_PAY_COST
+		             , Y.DELV_FAIL_REASON
+		             , (SELECT CASE WHEN BG.DISP_NM_LANG = 'EN'
+		                       THEN BG.BRAND_GROUP_ENM
+		                       ELSE BG.BRAND_GROUP_KNM
+		                       END  BRAND_GROUP_NM
+		                FROM   TB_BRAND BR
+		                INNER  JOIN TB_BRAND_GROUP BG
+		                ON     BR.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
+		                WHERE  1=1
+		                AND    BR.BRAND_CD = G1.BRAND_CD
+		                AND    BG.USE_YN = 'Y') AS BRAND_GROUP_NM
+		             , FN_GET_CODE_NM('G680', X.CHG_GB) AS CHG_GB_NM
+		             , FN_GET_CODE_NM('G685', X.CHG_STAT) AS CHG_STAT_NM
+		             , X.REG_DT
+		        FROM   TB_ORDER_DETAIL OD
+		        INNER  JOIN TB_GOODS G1
+		        ON     OD.GOODS_CD = G1.GOODS_CD
+		        INNER  JOIN TB_ORDER_DETAIL_ITEM ODI
+		        ON     OD.ORD_DTL_NO = ODI.ORD_DTL_NO
+		        INNER  JOIN TB_GOODS G2
+		        ON     ODI.ITEM_CD = G2.GOODS_CD
+		        LEFT   OUTER JOIN (
+		            SELECT OCD.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
+		            INNER  JOIN TB_ORDER_CHANGE OC
+		            ON     OC.ORD_CHG_SQ = OCD.ORD_CHG_SQ
+		            WHERE  1=1
+		            AND    OD.ORD_NO = #{ordNo}
+		            AND    OCD.DEL_YN = 'N'
+		            AND    OCD.CHG_STAT IN ('G685_10', 'G685_11','G685_20', 'G685_21', 'G685_30', 'G685_31', 'G685_32', 'G685_33', 'G685_50', 'G685_51')
+		            AND    OC.WD_BF_SEND_YN = 'N'
+		            GROUP  BY OCD.ORD_DTL_NO
+		        ) OCD
+		        ON     OD.ORD_DTL_NO = OCD.ORD_DTL_NO
+		        LEFT   OUTER JOIN TB_DELV_FEE_POLICY DFP
+		        ON     OD.DELV_FEE_CD = DFP.DELV_FEE_CD
+		        AND    OD.SUPPLY_COMP_CD = DFP.SUPPLY_COMP_CD
+		        AND    DFP.USE_YN = 'Y'
+		        LEFT OUTER JOIN (
+		            SELECT OCD.ORD_DTL_NO
+		                 , OCD.CHG_QTY
+		                 , OCD.CHG_STAT
+		                 , OC.CHG_GB
+		                 , OC.REG_DT
+		              FROM TB_ORDER_CHANGE_DETAIL OCD
+		             INNER JOIN TB_ORDER_CHANGE OC
+		                ON OCD.ORD_CHG_SQ = OC.ORD_CHG_SQ
+		             WHERE OCD.DEL_YN = 'N'
+		               AND OCD.ORD_CHG_SQ = #{ordChgSq}
+		        ) X
+		        ON OD.ORD_DTL_NO = X.ORD_DTL_NO
+		        LEFT OUTER JOIN (
+		            SELECT EDF.ORD_DTL_NO
+		                 , EDF.CNCL_RTN_QTY
+		                 , OCD.CHG_STAT
+		                 , OC.WD_GB
+		                 , OC.ADD_PAY_COST
+		                 , EDF.DELV_FAIL_REASON
+		              FROM TB_EXCHANGE_DELV_FAIL EDF
+		             INNER JOIN TB_ORDER_CHANGE_DETAIL OCD
+		                ON EDF.ORD_DTL_NO = OCD.CHG_ORD_DTL_NO
+		             INNER JOIN TB_ORDER_CHANGE OC
+		                ON OC.ORD_CHG_SQ = OCD.ORD_CHG_SQ
+		             WHERE OCD.DEL_YN = 'N'
+		               AND OCD.ORD_CHG_SQ = #{ordChgSq}
+		               AND EDF.DELV_CNCL_YN = 'N'
+		        ) Y
+		        ON OD.ORD_DTL_NO = Y.ORD_DTL_NO
+		        WHERE  1=1
+		        AND    OD.ORD_NO = #{ordNo}
+		        <if test="ordDtlStatArr != null and ordDtlStatArr != ''">
+		        AND OD. ORD_DTL_STAT IN
+					<foreach collection="ordDtlStatArr" item="item" index="index"  open="(" close=")" separator=",">
+		            #{item}
+					</foreach>
+				</if>
+				<if test="ordDtlNoArr != null and ordDtlNoArr != ''">
+		        AND OD.ORD_DTL_NO IN
+					<foreach collection="ordDtlNoArr" item="item" index="index"  open="(" close=")" separator=",">
+		            #{item}
+					</foreach>
+				</if>
+				<choose>
+					<when test="chgGb == 'G680_30'">
+		        AND    OD.RETURNABLE_YN = 'Y'
+					</when>
+					<when test="chgGb == 'G680_40'">
+		        AND    OD.CHANGEABLE_YN = 'Y'
+					</when>
+				</choose>
+		    ) A
+		    GROUP  BY A.ORD_NO
+		         , A.ORD_DTL_NO
+		         , A.ORD_DTL_STAT
+		         , A.ORD_DTL_STAT_NM
+		         , A.ALL_CAN_YN
+		         , A.GOODS_CD
+		         , A.GOODS_NM
+		         , A.GOODS_TYPE
+		         , A.GOODS_TYPE_NM
+		         , A.LIST_PRICE
+		         , A.CURR_PRICE
+		         , A.ORD_QTY
+		         , A.CNCL_RTN_QTY
+		         , A.ORD_REQ_CHG_QTY
+		         , A.CPN1_DC_AMT
+		         , A.ORD_AMT
+		         , A.CNCL_RTN_AMT
+		         , A.TMTB1_DC_AMT
+		         , A.TMTB2_DC_AMT
+		         , A.GOODS_CPN_DC_AMT
+		         , A.CART_CPN_DC_AMT
+		         , A.PRE_PNT_DC_AMT
+		         , A.PNT_DC_AMT
+		         , A.GFCD_USE_AMT
+		         , A.REAL_ORD_AMT
+		         , A.SUPPLY_COMP_CD
+		         , A.SUPPLY_COMP_NM
+		         , A.DELV_FEE_CRITE
+		         , A.MIN_ORD_AMT
+		         , A.ORG_DELV_FEE
+		         , A.RTN_DELV_FEE
+		         , A.EXC_DELV_FEE
+		         , A.SELF_GOODS_YN
+		         , A.DELV_FEE_CD
+		         , A.ORD_CAN_CHG_QTY
+		         , A.CHG_STAT
+		         , A.WD_GB
+		         , A.ADD_PAY_COST
+		         , A.DELV_FAIL_REASON
+		         , A.BRAND_GROUP_NM
+		         , A.CHG_GB_NM
+		         , A.CHG_STAT_NM
+		         , A.REG_DT
+		) Z
+		INNER  JOIN (
+		    SELECT X.DELV_FEE_CD
+		         , SUM(X.DELV_FEE) AS DELV_FEE
+		    FROM   TB_DELIVERY_FEE X
+		    WHERE  1=1
+		    AND    X.ORD_NO = #{ordNo}
+		    AND    X.DELV_FEE_GB = 'G018_10'
+		    GROUP  BY X.DELV_FEE_CD
+		) DF
+		ON     Z.DELV_FEE_CD = DF.DELV_FEE_CD
+		WHERE  1=1
+		AND    Z.DELV_FEE_CD = #{delvFeeCdGrp}
+		ORDER  BY Z.DELV_FEE_CD
+		     , Z.ORD_NO
+		     , Z.ORD_DTL_NO
+	</select>
+	
+	<!-- 취소,반품,교환 대상목록 조회 -->
+	<select id="getCancelRequestTargetList" parameterType="Order" resultType="Order">
+		/* TscScm.getCancelRequestTargetList */
+		SELECT Y.*
+		FROM (
+		    SELECT Z.*
+		         , DF.DELV_FEE
+		      FROM (
+		        SELECT OD.ORD_NO
+		             , OD.ORD_DTL_NO
+		             , OD.ORD_DTL_STAT
+		             , FN_GET_CODE_NM('G013', OD.ORD_DTL_STAT)  AS ORD_DTL_STAT_NM
+		             , CASE WHEN OD.ORD_DTL_STAT IN ('G013_20', 'G013_30', 'G013_40')
+		                    THEN 'Y'
+		                    ELSE 'N'
+		               END                                      AS ALL_CAN_YN
+		             , O.CUST_NO
+		             , G1.GOODS_CD
+		             , G1.GOODS_NM
+		             , G1.GOODS_TYPE
+		             , FN_GET_CODE_NM('G056', G1.GOODS_TYPE)    AS GOODS_TYPE_NM
+		             , ODI.ORD_DTL_ITEM_SQ
+		             , G2.GOODS_CD                              AS ITEM_CD
+		             , G2.GOODS_NM                              AS ITEM_NM
+		             , ODI.OPT_CD
+		             , ODI.OPT_CD1
+		             , ODI.OPT_CD2
+		             , ODI.ITEM_QTY
+		             , OD.ORD_QTY
+		             , OD.CNCL_RTN_QTY
+		             , CASE WHEN OCD.ORD_REQ_CHG_QTY IS NULL
+		                    THEN 0
+		                    ELSE OCD.ORD_REQ_CHG_QTY * ODI.ITEM_QTY
+		               END                                      AS ORD_REQ_CHG_QTY
+		             , ODI.ITEM_PRICE
+		             , ODI.OPT_ADD_PRICE
+		             , ODI.ORD_AMT
+		             , ODI.CNCL_RTN_AMT
+		             , ODI.CPN1_DC_AMT
+		             , ODI.TMTB1_DC_AMT
+		             , ODI.TMTB2_DC_AMT
+		             , ODI.GOODS_CPN_DC_AMT
+		             , ODI.CART_CPN_DC_AMT
+		             , ODI.PNT_DC_AMT
+		             , ODI.PRE_PNT_DC_AMT
+		             , ODI.GFCD_USE_AMT
+		             , ODI.REAL_ORD_AMT
+		             , OD.SUPPLY_COMP_CD
+		             , FN_GET_SUPPLY_COMP_NM(OD.SUPPLY_COMP_CD) AS SUPPLY_COMP_NM
+		             , DFP.DELV_FEE_CRITE
+		             , CASE DFP.DELV_FEE_CRITE WHEN 'G078_30' THEN 99999999
+		                                       WHEN 'G078_20' THEN 0
+		                                       ELSE DFP.MIN_ORD_AMT
+		                END                                     AS MIN_ORD_AMT
+		             , DFP.DELV_FEE                             AS ORG_DELV_FEE
+		             , DFP.RTN_DELV_FEE
+		             , DFP.RTN_DELV_FEE + DFP.RTN_DELV_FEE      AS EXC_DELV_FEE
+		             , X.CHG_QTY                                AS ORD_CAN_CHG_QTY
+		             , X.OPT_CD                                 AS ORD_CHG_OPT
+		             , VS.OPT_CDS
+		             , VS.OPT_CD2S
+		             , VS.CURR_STOCK_QTYS
+		             , G1.SELF_GOODS_YN
+		             , CASE WHEN G1.SELF_GOODS_YN = 'Y'
+		                    THEN 'WMS'
+		                    ELSE OD.DELV_FEE_CD
+		                     END DELV_FEE_CD
+		             , X.CHG_GB
+		             , (SELECT CASE WHEN BG.DISP_NM_LANG = 'EN'
+		                       THEN BG.BRAND_GROUP_ENM
+		                       ELSE BG.BRAND_GROUP_KNM
+		                       END  BRAND_GROUP_NM
+		                FROM   TB_BRAND BR
+		                INNER  JOIN TB_BRAND_GROUP BG
+		                ON     BR.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
+		                WHERE  1=1
+		                AND    BR.BRAND_CD = G1.BRAND_CD
+		                AND    BG.USE_YN = 'Y') AS BRAND_GROUP_NM
+		             , FN_GET_CODE_NM('G680', X.CHG_GB) AS CHG_GB_NM
+		             , FN_GET_CODE_NM('G685', X.CHG_STAT) AS CHG_STAT_NM
+		             , X.REG_DT
+		          FROM TB_ORDER O
+		         INNER JOIN TB_ORDER_DETAIL OD
+		            ON O.ORD_NO = OD.ORD_NO
+		         INNER JOIN TB_GOODS G1
+		            ON OD.GOODS_CD = G1.GOODS_CD
+		         INNER JOIN TB_ORDER_DETAIL_ITEM ODI
+		            ON OD.ORD_NO = ODI.ORD_NO
+		           AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
+		         INNER JOIN TB_GOODS G2
+		            ON ODI.ITEM_CD = G2.GOODS_CD
+		          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
+		               INNER JOIN TB_ORDER_CHANGE OC
+		                  ON OC.ORD_CHG_SQ = OCD.ORD_CHG_SQ
+		               WHERE 1 = 1
+		                 AND OD.ORD_NO = #{ordNo}
+		                 AND OCD.DEL_YN = 'N'
+		                 AND OCD.CHG_STAT IN ('G685_20', 'G685_21','G685_30', 'G685_31', 'G685_32', 'G685_33', 'G685_34', 'G685_50', 'G685_51')
+		                 AND OC.WD_BF_SEND_YN = 'N'
+		               GROUP BY OCD.ORD_DTL_NO
+		          ) OCD
+		            ON OD.ORD_DTL_NO = OCD.ORD_DTL_NO
+		          LEFT OUTER JOIN TB_DELV_FEE_POLICY DFP
+		            ON OD.DELV_FEE_CD = DFP.DELV_FEE_CD
+		           AND OD.SUPPLY_COMP_CD = DFP.SUPPLY_COMP_CD
+		           AND DFP.USE_YN = 'Y'
+		          LEFT OUTER JOIN (
+		              SELECT GOODS_CD
+		                   , OPT_CD1
+		                   , GROUP_CONCAT(OPT_CD ORDER BY DISP_ORD, OPT_CD2 SEPARATOR ',')                                 AS OPT_CDS
+		                   , GROUP_CONCAT(OPT_CD2 ORDER BY DISP_ORD, OPT_CD2 SEPARATOR ',')                                AS OPT_CD2S
+		                   , GROUP_CONCAT((CURR_STOCK_QTY - BASE_STOCK_QTY) ORDER BY DISP_ORD DESC, OPT_CD2 SEPARATOR ',') AS CURR_STOCK_QTYS
+		                FROM VW_STOCK
+		               WHERE GOODS_CD IN (SELECT ITEM_CD FROM TB_ORDER_DETAIL_ITEM WHERE ORD_NO = #{ordNo})
+		               GROUP BY GOODS_CD
+		                   , OPT_CD1
+		          ) VS
+		            ON ODI.ITEM_CD = VS.GOODS_CD
+		           AND ODI.OPT_CD1 = VS.OPT_CD1
+		          LEFT OUTER JOIN (
+		              SELECT OCD.ORD_DTL_NO
+		                   , OCD.CHG_QTY
+		                   , ODI.OPT_CD
+		                   , ODI.OPT_CD2
+		                   , OC.CHG_GB
+		                   , OCD.CHG_STAT
+		                   , OC.REG_DT
+		                FROM TB_ORDER_CHANGE_DETAIL OCD
+		               INNER JOIN TB_ORDER_CHANGE OC
+		                  ON OC.ORD_CHG_SQ = OCD.ORD_CHG_SQ
+		               INNER JOIN TB_ORDER_DETAIL_ITEM ODI
+		                  ON OCD.ORD_DTL_NO = ODI.ORD_DTL_NO
+		               WHERE OCD.DEL_YN = 'N'
+		                 AND OCD.ORD_CHG_SQ = #{ordChgSq}
+		          ) X
+		            ON ODI.ORD_DTL_NO = X.ORD_DTL_NO
+		           AND ODI.OPT_CD = X.OPT_CD
+		         WHERE 1 = 1
+		<if test="ordDtlStatArr != null and ordDtlStatArr != ''">
+		           AND OD. ORD_DTL_STAT IN
+			<foreach collection="ordDtlStatArr" item="item" index="index"  open="(" close=")" separator=",">
+					#{item}
+			</foreach>
+		</if>
+		<if test="ordDtlNoArr != null and ordDtlNoArr != ''">
+		           AND OD.ORD_DTL_NO IN
+			<foreach collection="ordDtlNoArr" item="item" index="index"  open="(" close=")" separator=",">
+					#{item}
+			</foreach>
+		</if>
+		           AND OD.ORD_NO = #{ordNo}
+		<choose>
+			<when test="chgGb == 'G680_30'">
+		           AND OD.RETURNABLE_YN = 'Y'
+			</when>
+			<when test="chgGb == 'G680_40'">
+		           AND OD.CHANGEABLE_YN = 'Y'
+			</when>
+		</choose>          
+		    ) Z
+		    INNER JOIN (
+		        SELECT X.DELV_FEE_CD
+		             , SUM(X.DELV_FEE) AS DELV_FEE
+		          FROM TB_DELIVERY_FEE X
+		         WHERE 1 = 1
+		           AND X.ORD_NO = #{ordNo}
+		           AND X.DELV_FEE_GB = 'G018_10'
+		         GROUP BY X.DELV_FEE_CD
+		    ) DF
+		    ON Z.DELV_FEE_CD = DF.DELV_FEE_CD
+		    AND Z.DELV_FEE_CD = #{delvFeeCdGrp}
+		) Y
+		 GROUP BY Y.ORD_NO, Y.ORD_DTL_NO, Y.ORD_DTL_STAT, Y.ORD_DTL_STAT_NM, Y.ALL_CAN_YN, Y.GOODS_CD, Y.GOODS_NM, Y.GOODS_TYPE, Y.GOODS_TYPE_NM
+		        , Y.ORD_DTL_ITEM_SQ, Y.ITEM_CD, Y.ITEM_NM, Y.OPT_CD, Y.OPT_CD1, Y.OPT_CD2, Y.ITEM_QTY, Y.ORD_QTY, Y.CNCL_RTN_QTY, Y.ORD_REQ_CHG_QTY
+		        , Y.ITEM_PRICE, Y.OPT_ADD_PRICE, Y.ORD_AMT, Y.CNCL_RTN_AMT, Y.CPN1_DC_AMT, Y.TMTB1_DC_AMT, Y.TMTB2_DC_AMT, Y.GOODS_CPN_DC_AMT
+		        , Y.CART_CPN_DC_AMT, Y.PNT_DC_AMT, Y.PRE_PNT_DC_AMT, Y.GFCD_USE_AMT, Y.REAL_ORD_AMT, Y.DELV_FEE, Y.SUPPLY_COMP_CD, Y.SUPPLY_COMP_NM
+		        , Y.DELV_FEE_CD, Y.DELV_FEE_CRITE, Y.MIN_ORD_AMT, Y.ORG_DELV_FEE, Y.RTN_DELV_FEE, Y.EXC_DELV_FEE, Y.ORD_CAN_CHG_QTY, Y.ORD_CHG_OPT
+		        , Y.OPT_CD2S, Y.CURR_STOCK_QTYS, Y.SELF_GOODS_YN, Y.CHG_GB, Y.BRAND_GROUP_NM, Y.CHG_GB_NM, Y.CHG_STAT_NM, Y.REG_DT
+		 ORDER BY Y.DELV_FEE_CD, Y.ORD_NO, Y.ORD_DTL_NO
+	</select>
+	
+	<!-- 추가배송비 결제여부 조회 -->
+	<select id="getAddDelvFee" parameterType="Order" resultType="Order">
+		/* TscScm.getAddDelvFee */
+		SELECT OC.ADD_PAY_COST 
+		     , P.PAY_STAT
+		     , P.PG_GB
+		     , P.PAY_MEANS
+		     , FN_GET_CODE_NM('G014', P.PAY_MEANS) AS PAY_MEANS_NM
+		FROM   TB_PAYMENT P
+		INNER  JOIN TB_ORDER_CHANGE OC
+		ON     P.ORD_CHG_SQ = OC.ORD_CHG_SQ 
+		WHERE  1=1
+		AND    OC.ORD_CHG_SQ = #{ordChgSq}
+		AND    P.PAY_GB = 'D'
+		AND    P.PAY_STAT NOT IN ('G016_00')
+		LIMIT  1
+	</select>
+	
 </mapper>