회수상품상보,금액정보노출 vo 변수 추가

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

@@ -170,5 +170,18 @@ public class Withdraw extends TscBaseDomain {
 	private String[] optCd1Arr;		// 옵션코드
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] optCd2Arr;		// 옵션코드
-
+	
+	// 2021.12.03 금액추가
+	private int ordAmt;
+	private int cnclRtnAmt;
+	private int cpn1DcAmt;
+	private int tmtb1DcAmt;
+	private int tmtb2DcAmt;
+	private int goodsCpnDcAmt;
+	private int cartCpnDcAmt;
+	private int prePntDcAmt;
+	private int pntDcAmt;
+	private int savePntAmt;
+	private int realOrdAmt;
+	private int gfcdUseAmt;
 }

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

@@ -679,17 +679,17 @@
 		         , Y.ORD_DTL_NO
 		         , Y.GOODS_CD
 		    FROM (
-		    SELECT O.ORD_NO                                 -- 주문번호
-		         , OCD.ORD_DTL_NO                           -- 주문상세번호
-		         , OD.GOODS_CD                              -- 상품코드
-		    FROM   TB_ORDER_CHANGE OC          
-		    JOIN   TB_ORDER_CHANGE_DETAIL OCD ON OC.ORD_CHG_SQ  = OCD.ORD_CHG_SQ 
-		    JOIN   TB_ORDER_DETAIL OD         ON OCD.ORD_DTL_NO = OD.ORD_DTL_NO
-		    JOIN   TB_ORDER O                 ON OD.ORD_NO      = O.ORD_NO
-		    JOIN   TB_GOODS G                 ON OD.GOODS_CD     = G.GOODS_CD
-		    JOIN   TB_DELIVERY_LOC D          ON OD.DELV_LOC_CD = D.DELV_LOC_CD AND OD.SUPPLY_COMP_CD = D.SUPPLY_COMP_CD
-		    JOIN   TB_ORDER_DETAIL_ITEM ODI   ON OD.ORD_DTL_NO  = ODI.ORD_DTL_NO
-		    WHERE  1=1 
+		        SELECT O.ORD_NO                                 -- 주문번호
+		             , OCD.ORD_DTL_NO                           -- 주문상세번호
+		             , OD.GOODS_CD                              -- 상품코드
+		        FROM   TB_ORDER_CHANGE OC          
+		        JOIN   TB_ORDER_CHANGE_DETAIL OCD ON OC.ORD_CHG_SQ  = OCD.ORD_CHG_SQ 
+		        JOIN   TB_ORDER_DETAIL OD         ON OCD.ORD_DTL_NO = OD.ORD_DTL_NO
+		        JOIN   TB_ORDER O                 ON OD.ORD_NO      = O.ORD_NO
+		        JOIN   TB_GOODS G                 ON OD.GOODS_CD     = G.GOODS_CD
+		        JOIN   TB_DELIVERY_LOC D          ON OD.DELV_LOC_CD = D.DELV_LOC_CD AND OD.SUPPLY_COMP_CD = D.SUPPLY_COMP_CD
+		        JOIN   TB_ORDER_DETAIL_ITEM ODI   ON OD.ORD_DTL_NO  = ODI.ORD_DTL_NO
+		        WHERE  1=1 
 			<include refid="getWithdrawDirectiveCondition_sql"/>
 			) Y
 			GROUP  BY Y.ORD_NO
@@ -928,9 +928,9 @@
 	<update id="updateReRecallOrder" parameterType="Withdraw" >
 		/* TsaWithdraw.updateReRecallOrder */
 		UPDATE TB_ORDER_CHANGE_DETAIL SET
-		  CHG_STAT = #{chgStat}
-		, UPD_NO   = #{updNo}
-		, UPD_DT   = NOW()
+		       CHG_STAT = #{chgStat}
+		     , UPD_NO   = #{updNo}
+		     , UPD_DT   = NOW()
 		WHERE ORD_CHG_SQ = #{ordChgSq} 
 	</update>
 
@@ -938,157 +938,193 @@
 	<update id="updateReRecallOrderChange" parameterType="Withdraw" >
 		/* TsaWithdraw.updateReRecallOrderChange */
 		UPDATE TB_ORDER_CHANGE SET 
-			  WD_SHIP_STATE = '99'
-			, UPD_NO        = #{updNo}
-			, UPD_DT        = NOW()
+		       WD_SHIP_STATE = '99'
+		     , UPD_NO        = #{updNo}
+		     , UPD_DT        = NOW()
 		WHERE ORD_CHG_SQ = #{ordChgSq} 
-
-
 	</update>
 	
 	<!-- 회수예외 사유변경 목록 -->
 	<select id="getWithdrawExceptionChangeList" parameterType="WithdrawExc" resultType="WithdrawExc">
 		/* TsaWithdraw.getWithdrawExceptionChangeList */
-		SELECT 
-			  A.ORD_CHG_SQ 
-			, C.ORD_NO 
-			, B.ORD_DTL_NO
-			, FN_GET_CODE_NM('G685', B.CHG_STAT)  AS CHG_STAT_NM
-			, A.REG_DT 
-			, A.CHGER_NM 
-			, A.CHGER_PHNNO 
-			, (SELECT G.GOODS_NM FROM TB_GOODS G WHERE G.GOODS_CD = C.ITEM_CD) AS GOODS_NM
-			, C.ITEM_CD  AS GOODS_CD 
-			, D.SKU_VALUE AS OPT_CD 
-			, B.CHG_QTY 
-			, IFNULL((SELECT GROUP_CONCAT(ADMIN_MEMO ORDER BY RECALL_EXCEPTION_MEMO_NO ) 
-						FROM TB_ORDER_RECALL_EXCEPTION_MEMO M WHERE M.RECALL_EXCEPTION_NO = D.RECALL_EXCEPTION_NO  AND ADMIN_MEMO !='.'),'-') AS ADMIN_MEMO -- WMS메시지
-			, A.CHG_GB 
-			, A.CHG_REASON 
-			, A.CHG_MEMO
-			, P.DELV_FEE
-			, P.RTN_DELV_FEE 
-			, B.CHG_STAT
-			, A.WD_GB 
-			, OD.DELV_FEE_CD 
-			, (SELECT O.CUST_NO FROM TB_ORDER O WHERE O.ORD_NO = OD.ORD_NO) AS CUST_NO
+		SELECT A.ORD_CHG_SQ 
+		     , C.ORD_NO 
+		     , B.ORD_DTL_NO
+		     , FN_GET_CODE_NM('G685', B.CHG_STAT)  AS CHG_STAT_NM
+		     , A.REG_DT 
+		     , A.CHGER_NM 
+		     , A.CHGER_PHNNO 
+		     , (SELECT G.GOODS_NM FROM TB_GOODS G WHERE G.GOODS_CD = C.ITEM_CD) AS GOODS_NM
+		     , C.ITEM_CD  AS GOODS_CD 
+		     , D.SKU_VALUE AS OPT_CD 
+		     , B.CHG_QTY 
+		     , IFNULL((SELECT GROUP_CONCAT(ADMIN_MEMO ORDER BY RECALL_EXCEPTION_MEMO_NO ) 
+		               FROM   TB_ORDER_RECALL_EXCEPTION_MEMO M 
+		               WHERE  M.RECALL_EXCEPTION_NO = D.RECALL_EXCEPTION_NO  
+		               AND    ADMIN_MEMO !='.'),'-') AS ADMIN_MEMO -- WMS메시지
+		     , A.CHG_GB 
+		     , A.CHG_REASON 
+		     , A.CHG_MEMO
+		     , P.DELV_FEE
+		     , P.RTN_DELV_FEE 
+		     , B.CHG_STAT
+		     , A.WD_GB 
+		     , OD.DELV_FEE_CD 
+		     , (SELECT O.CUST_NO FROM TB_ORDER O WHERE O.ORD_NO = OD.ORD_NO) AS CUST_NO
 		  FROM TB_ORDER_CHANGE A
-		  JOIN TB_ORDER_CHANGE_DETAIL B ON A.ORD_CHG_SQ = B.ORD_CHG_SQ 
-		  JOIN TB_ORDER_DETAIL       OD ON B.ORD_DTL_NO = OD.ORD_DTL_NO 
-		  JOIN TB_ORDER_DETAIL_ITEM   C ON OD.ORD_DTL_NO  = C.ORD_DTL_NO  
-		  JOIN TB_ORDER_RECALL_EXCEPTION_ITEM D ON C.ORD_DTL_NO = D.ORDER_DTL_NO 
-		  JOIN TB_DELV_FEE_POLICY     P ON OD.DELV_FEE_CD = P.DELV_FEE_CD 
-		                                  AND OD.SUPPLY_COMP_CD = P.SUPPLY_COMP_CD 
+		  JOIN TB_ORDER_CHANGE_DETAIL B           ON A.ORD_CHG_SQ = B.ORD_CHG_SQ 
+		  JOIN TB_ORDER_DETAIL       OD           ON B.ORD_DTL_NO = OD.ORD_DTL_NO 
+		  JOIN TB_ORDER_DETAIL_ITEM   C           ON OD.ORD_DTL_NO  = C.ORD_DTL_NO  
+		  JOIN TB_ORDER_RECALL_EXCEPTION_ITEM D   ON C.ORD_DTL_NO = D.ORDER_DTL_NO 
+		  JOIN TB_DELV_FEE_POLICY     P           ON OD.DELV_FEE_CD = P.DELV_FEE_CD AND OD.SUPPLY_COMP_CD = P.SUPPLY_COMP_CD 
 		 WHERE A.ORD_CHG_SQ = #{ordChgSq}
 	</select>
 	
 	<!-- 주문변경사유 변경 -->
 	<update id="updateChangeReason" parameterType="WithdrawExc" >
 		/* TsaWithdraw.updateChangeReason */
-		UPDATE TB_ORDER_CHANGE SET
-			  CHG_REASON   = #{chgReason} 
-			, ADD_PAY_COST = CASE WHEN #{chgReason} IN ('G688_10','G689_10') THEN #{addPayCost} ELSE 0 END 
-			, CHG_MEMO     = #{chgMemo}
-			, UPD_NO       = #{updNo}
-			, UPD_DT       = NOW()
-		WHERE ORD_CHG_SQ  = #{ordChgSq}
+		UPDATE TB_ORDER_CHANGE 
+		SET    CHG_REASON   = #{chgReason} 
+		     , ADD_PAY_COST = CASE WHEN #{chgReason} IN ('G688_10','G689_10') THEN #{addPayCost} ELSE 0 END 
+		     , CHG_MEMO     = #{chgMemo}
+		     , UPD_NO       = #{updNo}
+		     , UPD_DT       = NOW()
+		WHERE  ORD_CHG_SQ  = #{ordChgSq}
 	</update>
 	
 	<!-- 주문변경상세상태변경 -->
 	<update id="updateChangeStat" parameterType="WithdrawExc" >
 		/* TsaWithdraw.updateChangeStat */
-		UPDATE TB_ORDER_CHANGE_DETAIL SET
-			  CHG_STAT = #{chgStat}
-			, UPD_NO   = #{updNo}
-			, UPD_DT   = NOW()
-		WHERE ORD_CHG_SQ = #{ordChgSq}
-		  AND ORD_DTL_NO = #{ordDtlNo}
-  
+		UPDATE TB_ORDER_CHANGE_DETAIL 
+		SET    CHG_STAT = #{chgStat}
+		     , UPD_NO   = #{updNo}
+		     , UPD_DT   = NOW()
+		WHERE  ORD_CHG_SQ = #{ordChgSq}
+		AND    ORD_DTL_NO = #{ordDtlNo}
 	</update>	
 	
 	<!-- 환불컨펌상세 목록  -->
 	<select id="getRefundDetailList" parameterType="Withdraw" resultType="Withdraw">
 		/* TsaWithdraw.getRefundDetailList */
-		SELECT
-				  CASE WHEN A.WD_GB ='W' THEN '회수요청' ELSE '직접배송' END AS WD_GB_NM -- 회수구분 
-				, B.CHG_STAT  
-				, CASE WHEN F.ARRIVAL_DT IS NULL THEN  DATE_FORMAT(F.REG_DT, '%Y-%m-%d') ELSE DATE_FORMAT(F.ARRIVAL_DT, '%Y-%m-%d') END AS ARRIVAL_DT-- 도착일자 
-				, FN_GET_CODE_NM('G688', A.CHG_REASON) AS CHG_REASON_NM   -- 최종요청사유 G688
-				, A.CHG_REASON
-				, CASE WHEN A.CHG_REASON = 'G688_10' THEN '고객' ELSE '회사' END AS CHG_REASON_TEXT -- 귀책사유 
-				, F.ENCLOSE_FEE  -- 동봉비 
-				, F.COD_FEE      -- 착불비
-				, IFNULL((SELECT P.PAY_AMT FROM TB_PAYMENT P WHERE P.ORD_CHG_SQ = A.ORD_CHG_SQ AND P.PAY_GB ='D' AND P.PAY_STAT = 'G016_30'),0) AS ADD_PAY_COST -- 추가결제비용 
-				, IFNULL(A.CHG_MEMO, '') AS CHG_MEMO     -- 클레임메모 
-				, IFNULL(F.WD_MEMO,'') AS WD_MEMO      -- WMS회수메모 
-				, A.WD_GB  -- 회수구분(W:회수요청, D:직접배송) 
-				, E.ORD_NO -- 주문번호
-				, D.ORD_DTL_NO -- 주문상세번호 
-				, (SELECT S.GOODS_NM FROM TB_GOODS S WHERE S.GOODS_CD = C.GOODS_CD) AS GOODS_NM -- 상품명
-				, D.ITEM_CD  AS GOODS_CD -- 상품코드
-				, D.OPT_CD
-				, D.OPT_CD1 -- 옵션1 
-				, D.OPT_CD2 -- 옵션2
-				-- , B.CHG_QTY * D.ITEM_QTY AS CHG_QTY-- 신청수량 
-				, B.CHG_QTY AS CHG_QTY-- 신청수량 
-				, G.WD_QTY -- 회수수량 
-				, CASE WHEN B.CHG_STAT = 'G685_60' THEN '환불완료' ELSE '환불대기' END AS WD_STAT  -- 환불컨펌상태 
-				, CASE WHEN B.CHG_STAT = 'G685_60' THEN 'Y' ELSE 'N' END AS WD_STAT_YN   
-				, A.ORD_CHG_SQ -- 주분변경번호 환불컨펌  
-				, DATE_FORMAT(G.REG_DT, '%Y-%m-%d') AS REG_DT  -- 등록일 
-				, E.MALL_GB 
- 				-- , (SELECT SUM((OD.ORD_QTY - OD.CNCL_RTN_QTY) * DI.ITEM_QTY)  FROM TB_ORDER_DETAIL OD JOIN TB_ORDER_DETAIL_ITEM DI ON OD.ORD_NO = DI.ORD_NO AND OD.ORD_DTL_NO = DI.ORD_DTL_NO WHERE OD.ORD_NO= E.ORD_NO AND OD.ORD_DTL_STAT NOT IN ('G013_00','G013_97','G013_98','G013_99')) AS  TOTAL_ORD_QTY -- 주문 총수량  
-				, (SELECT SUM(OD.ORD_QTY) FROM TB_ORDER_DETAIL OD WHERE OD.ORD_NO= E.ORD_NO) AS  TOTAL_ORD_QTY -- 주문 총수량
-				, CASE WHEN (SELECT COUNT(*) FROM TB_ORDER_RECALL_EXCEPTION_ITEM EI  WHERE EI.ORDER_DTL_NO = D.ORD_DTL_NO AND EI.REASON_CODE IN('09','11')) > 0 THEN 'Y' ELSE 'N' END AS DELV_EXPN_YN
-				, CA.RA_NO AS ACCOUNT_NO 
-				, CA.RA_NM AS ACCOUNT_NM 
-				, CA.RA_BANK AS BANK_CD 
-				, E.ORD_NM 	
-				, C.DELV_ADDR_SQ
-				, F.WD_INVOICE_NO 
-				, (SELECT R.REFUND_AMT FROM TB_REFUND R WHERE R.ORD_NO = E.ORD_NO AND R.ORD_CHG_SQ = A.ORD_CHG_SQ ) AS REFUND_AMT
-				, E.CUST_NO
-				, P.PG_GB
-				, FN_GET_CODE_NM('G014', P.PAY_MEANS) AS PAY_MEANS_NM
-				, P.CARD_NM
-				, C.DELV_FEE_CD
+		SELECT CASE WHEN A.WD_GB ='W' 
+		            THEN '회수요청' 
+		            ELSE '직접배송' 
+		            END AS WD_GB_NM -- 회수구분 
+		     , B.CHG_STAT  
+		     , CASE WHEN F.ARRIVAL_DT IS NULL 
+		            THEN DATE_FORMAT(F.REG_DT, '%Y-%m-%d') 
+		            ELSE DATE_FORMAT(F.ARRIVAL_DT, '%Y-%m-%d') 
+		            END AS ARRIVAL_DT-- 도착일자 
+		     , FN_GET_CODE_NM('G688', A.CHG_REASON) AS CHG_REASON_NM   -- 최종요청사유 G688
+		     , A.CHG_REASON
+		     , CASE WHEN A.CHG_REASON = 'G688_10' 
+		            THEN '고객' 
+		            ELSE '회사' 
+		            END AS CHG_REASON_TEXT -- 귀책사유 
+		     , F.ENCLOSE_FEE  -- 동봉비 
+		     , F.COD_FEE      -- 착불비
+		     , IFNULL((SELECT P.PAY_AMT 
+		               FROM   TB_PAYMENT P 
+		               WHERE  P.ORD_CHG_SQ = A.ORD_CHG_SQ 
+		               AND    P.PAY_GB ='D' 
+		               AND    P.PAY_STAT = 'G016_30'),0) AS ADD_PAY_COST -- 추가결제비용 
+		     , IFNULL(A.CHG_MEMO, '') AS CHG_MEMO     -- 클레임메모 
+		     , IFNULL(F.WD_MEMO,'') AS WD_MEMO      -- WMS회수메모 
+		     , A.WD_GB  -- 회수구분(W:회수요청, D:직접배송) 
+		     , E.ORD_NO -- 주문번호
+		     , D.ORD_DTL_NO -- 주문상세번호 
+		     , (SELECT S.GOODS_NM 
+		        FROM   TB_GOODS S 
+		        WHERE  S.GOODS_CD = C.GOODS_CD) AS GOODS_NM -- 상품명
+		     , D.ITEM_CD  AS GOODS_CD -- 상품코드
+		     , D.OPT_CD
+		     , D.OPT_CD1 -- 옵션1 
+		     , D.OPT_CD2 -- 옵션2 
+		     , B.CHG_QTY -- 신청수량 
+		     , G.WD_QTY -- 회수수량 
+		     , CASE WHEN B.CHG_STAT = 'G685_60' 
+		            THEN '환불완료' 
+		            ELSE '환불대기' 
+		            END AS WD_STAT  -- 환불컨펌상태 
+		     , CASE WHEN B.CHG_STAT = 'G685_60' 
+		            THEN 'Y' 
+		            ELSE 'N' END AS WD_STAT_YN   
+		     , A.ORD_CHG_SQ -- 주분변경번호 환불컨펌  
+		     , DATE_FORMAT(G.REG_DT, '%Y-%m-%d') AS REG_DT  -- 등록일 
+		     , E.MALL_GB   
+		     , (SELECT SUM(OD.ORD_QTY) 
+		        FROM   TB_ORDER_DETAIL OD 
+		        WHERE  OD.ORD_NO= E.ORD_NO) AS  TOTAL_ORD_QTY -- 주문 총수량
+		     , CASE WHEN (SELECT COUNT(1) 
+		                  FROM   TB_ORDER_RECALL_EXCEPTION_ITEM EI  
+		                  WHERE  EI.ORDER_DTL_NO = D.ORD_DTL_NO 
+		                  AND    EI.REASON_CODE IN('09','11')) > 0 
+		            THEN 'Y' 
+		            ELSE 'N' 
+		            END AS DELV_EXPN_YN
+		     , CA.RA_NO AS ACCOUNT_NO 
+		     , CA.RA_NM AS ACCOUNT_NM 
+		     , CA.RA_BANK AS BANK_CD 
+		     , E.ORD_NM 	
+		     , C.DELV_ADDR_SQ
+		     , F.WD_INVOICE_NO 
+		     , (SELECT R.REFUND_AMT 
+		        FROM   TB_REFUND R 
+		        WHERE  R.ORD_NO = E.ORD_NO 
+		        AND    R.ORD_CHG_SQ = A.ORD_CHG_SQ ) AS REFUND_AMT
+		     , E.CUST_NO
+		     , P.PG_GB
+		     , FN_GET_CODE_NM('G014', P.PAY_MEANS) AS PAY_MEANS_NM
+		     , P.CARD_NM
+		     , C.DELV_FEE_CD
+		     , D.ORD_AMT
+		     , D.CNCL_RTN_AMT
+		     , D.CPN1_DC_AMT
+		     , D.TMTB1_DC_AMT
+		     , D.TMTB2_DC_AMT
+		     , D.GOODS_CPN_DC_AMT
+		     , D.CART_CPN_DC_AMT
+		     , D.PNT_DC_AMT
+		     , D.PRE_PNT_DC_AMT
+		     , D.SAVE_PNT_AMT
+		     , D.REAL_ORD_AMT
+		     , D.GFCD_USE_AMT
 		  FROM TB_ORDER_CHANGE A
-		  JOIN TB_ORDER_CHANGE_DETAIL B ON B.ORD_CHG_SQ = A.ORD_CHG_SQ 
-		  JOIN TB_ORDER_DETAIL C ON C.ORD_DTL_NO = B.ORD_DTL_NO 
-		  JOIN TB_ORDER_DETAIL_ITEM D ON D.ORD_NO = C.ORD_NO AND D.ORD_DTL_NO = C.ORD_DTL_NO 
-		  JOIN TB_ORDER E             ON E.ORD_NO = C.ORD_NO 
-		  JOIN TB_WITHDRAW F ON F.ORD_CHG_SQ = A.ORD_CHG_SQ
-		  JOIN TB_PAYMENT P ON E.ORD_NO = P.ORD_NO AND P.PAY_GB = 'O' AND P.PAY_STAT = 'G016_30'
-		  LEFT OUTER JOIN TB_WITHDRAW_DETAIL G ON G.WD_INVOICE_NO = F.WD_INVOICE_NO AND G.ORD_CHG_SQ = F.ORD_CHG_SQ AND D.ITEM_CD = G.GOODS_CD AND D.OPT_CD1 = G.OPT_CD1  AND D.OPT_CD2 = G.OPT_CD2 
-		  LEFT OUTER JOIN TB_REFUND CA ON CA.ORD_NO = E.ORD_NO AND CA.ORD_CHG_SQ = A.ORD_CHG_SQ
-		 WHERE A.ORD_CHG_SQ  = #{ordChgSq}
+		  JOIN TB_ORDER_CHANGE_DETAIL B           ON B.ORD_CHG_SQ = A.ORD_CHG_SQ 
+		  JOIN TB_ORDER_DETAIL C                  ON C.ORD_DTL_NO = B.ORD_DTL_NO 
+		  JOIN TB_ORDER_DETAIL_ITEM D             ON D.ORD_NO = C.ORD_NO AND D.ORD_DTL_NO = C.ORD_DTL_NO 
+		  JOIN TB_ORDER E                         ON E.ORD_NO = C.ORD_NO 
+		  JOIN TB_WITHDRAW F                      ON F.ORD_CHG_SQ = A.ORD_CHG_SQ
+		  JOIN TB_PAYMENT P                       ON E.ORD_NO = P.ORD_NO AND P.PAY_GB = 'O' AND P.PAY_STAT = 'G016_30'
+		  LEFT OUTER JOIN TB_WITHDRAW_DETAIL G    ON G.WD_INVOICE_NO = F.WD_INVOICE_NO AND G.ORD_CHG_SQ = F.ORD_CHG_SQ AND D.ITEM_CD = G.GOODS_CD AND D.OPT_CD1 = G.OPT_CD1  AND D.OPT_CD2 = G.OPT_CD2 
+		  LEFT OUTER JOIN TB_REFUND CA            ON CA.ORD_NO = E.ORD_NO AND CA.ORD_CHG_SQ = A.ORD_CHG_SQ
+		 WHERE 1=1
+		   AND A.ORD_CHG_SQ  = #{ordChgSq}
 		   AND A.CHG_GB = 'G680_30' -- 반품요청
-		   AND B.CHG_STAT IN('G685_33','G685_60')		
+		   AND B.CHG_STAT IN('G685_33','G685_60')
 	</select>	
 	
 	<!-- 주문변경번호 상세 조회  -->
 	<select id="getOrdChgDtlList" parameterType="Withdraw" resultType="Withdraw">
 		/* TsaWithdraw.getOrdChgDtlList */
-		SELECT  
-			  ORD_CHG_SQ 
-			, ORD_DTL_NO 
-			, CHG_STAT 
-		FROM TB_ORDER_CHANGE_DETAIL
-		WHERE ORD_CHG_SQ = #{ordChgSq}
-		  AND DEL_YN     = 'N'
+		SELECT ORD_CHG_SQ 
+		     , ORD_DTL_NO 
+		     , CHG_STAT 
+		FROM   TB_ORDER_CHANGE_DETAIL
+		WHERE  ORD_CHG_SQ = #{ordChgSq}
+		AND    DEL_YN     = 'N'
 	</select>	
 		
 	<!-- 반품알림톡 정보 조회  -->
 	<select id="getRefundInfo" parameterType="Withdraw" resultType="Withdraw">
 		/* TsaWithdraw.getRefundInfo */
-		SELECT
-			  D.ORD_NO 
-			, D.CUST_NO 
-			, D.ORD_PHNNO 
-			, D.ORD_NM 
-			, (SELECT GOODS_NM FROM TB_GOODS WHERE GOODS_CD= MAX(C.GOODS_CD))  AS GOODS_NM
-			, COUNT(C.GOODS_CD) -1 AS GOODS_CNT
-			, E.REFUND_AMT 
+		SELECT D.ORD_NO 
+		     , D.CUST_NO 
+		     , D.ORD_PHNNO 
+		     , D.ORD_NM 
+		     , (SELECT GOODS_NM FROM TB_GOODS WHERE GOODS_CD= MAX(C.GOODS_CD))  AS GOODS_NM
+		     , COUNT(C.GOODS_CD) -1 AS GOODS_CNT
+		     , E.REFUND_AMT 
 		  FROM TB_ORDER_CHANGE A
 		  JOIN TB_ORDER_CHANGE_DETAIL B ON A.ORD_CHG_SQ = B.ORD_CHG_SQ 
 		  JOIN TB_ORDER_DETAIL C        ON B.ORD_DTL_NO = C.ORD_DTL_NO 
@@ -1096,40 +1132,44 @@
 		  JOIN TB_REFUND       E        ON E.ORD_NO     = D.ORD_NO AND E.ORD_CHG_SQ = A.ORD_CHG_SQ 
 		 WHERE A.ORD_CHG_SQ = #{ordChgSq}
 		   AND B.DEL_YN ='N'
-		 GROUP BY D.ORD_NO, D.CUST_NO, D.ORD_PHNNO, D.ORD_NM, E.REFUND_AMT  
-		 
- 
+		 GROUP BY D.ORD_NO
+		     , D.CUST_NO
+		     , D.ORD_PHNNO
+		     , D.ORD_NM
+		     , E.REFUND_AMT
 	</select>			
 	
 	<!-- 회수철회알림톡 정보 조회  -->
 	<select id="getWithdrawInfo" parameterType="Withdraw" resultType="Withdraw">
 		/* TsaWithdraw.getWithdrawInfo */
-		SELECT
-			  D.ORD_NO 
-			, D.CUST_NO 
-			, A.CHGER_PHNNO AS ORD_PHNNO 
-			, A.CHGER_NM    AS ORD_NM 
-			, (SELECT GOODS_NM FROM TB_GOODS WHERE GOODS_CD= MAX(C.GOODS_CD))  AS GOODS_NM
-			, COUNT(C.GOODS_CD) -1 AS GOODS_CNT
-			, CONCAT(A.CHGER_BASE_ADDR,' ', A.CHGER_DTL_ADDR) AS CHGER_BASE_ADDR 
+		SELECT D.ORD_NO 
+		     , D.CUST_NO 
+		     , A.CHGER_PHNNO AS ORD_PHNNO 
+		     , A.CHGER_NM    AS ORD_NM 
+		     , (SELECT GOODS_NM FROM TB_GOODS WHERE GOODS_CD= MAX(C.GOODS_CD))  AS GOODS_NM
+		     , COUNT(C.GOODS_CD) -1 AS GOODS_CNT
+		     , CONCAT(A.CHGER_BASE_ADDR,' ', A.CHGER_DTL_ADDR) AS CHGER_BASE_ADDR 
 		  FROM TB_ORDER_CHANGE A
 		  JOIN TB_ORDER_CHANGE_DETAIL B ON A.ORD_CHG_SQ = B.ORD_CHG_SQ 
 		  JOIN TB_ORDER_DETAIL C        ON B.ORD_DTL_NO = C.ORD_DTL_NO 
 		  JOIN TB_ORDER        D        ON C.ORD_NO     = D.ORD_NO 
 		 WHERE A.ORD_CHG_SQ = #{ordChgSq}
 		   AND B.DEL_YN ='N'
-		 GROUP BY D.ORD_NO, D.CUST_NO, D.ORD_PHNNO, D.ORD_NM, A.CHGER_BASE_ADDR, A.CHGER_DTL_ADDR
-		
+		 GROUP BY D.ORD_NO
+		     , D.CUST_NO
+		     , D.ORD_PHNNO
+		     , D.ORD_NM
+		     , A.CHGER_BASE_ADDR
+		     , A.CHGER_DTL_ADDR
 	</select>			
 	
 	<!-- 회수예외 처리완료-->
 	<update id="updateCsMemo" parameterType="WithdrawExc" >
 		/* TsaWithdraw.updateCsMemo */
-		UPDATE TB_ORDER_RECALL_EXCEPTION SET
-		  CS_ADD_FEE     = #{csAddFee}
-		, CS_MEMO        = #{csMemo}
-		WHERE RECALL_EXCEPTION_NO = #{recallExceptionNo}
-
+		UPDATE TB_ORDER_RECALL_EXCEPTION 
+		SET    CS_ADD_FEE     = #{csAddFee}
+		     , CS_MEMO        = #{csMemo}
+		WHERE  RECALL_EXCEPTION_NO = #{recallExceptionNo}
 	</update>	
 		
 </mapper>

src/main/webapp/WEB-INF/views/withdraw/RefundDetailForm.html

@@ -205,61 +205,6 @@
 							</tr>
 						</tbody>
 					</table>
-					
-					<!-- 
-					<h4>환불예정금액</h4>
-					<table class="frmStyle">
-						<colgroup>
-							<col style="width:20%;"/>
-							<col style="width:30%;"/>
-							<col style="width:20%;"/>
-							<col style="width:30%;"/>
-						</colgroup>
-						<tbody>
-							<tr>
-								<th>총 결제 금액</th>
-								<td colspan="3"><span id="spanPayAmt"></span>원 (상품 실결제 금액 : <span id="spanSumRealOrdAmt"></span>원, 배송금액 : <span id="spanSumDeliveryFee"></span>원, 배송비쿠폰할인금액: <span id="spanDelvCpnDcAmt"></span>원)</td>
-							</tr>
-							<tr>
-								<th>주문 상품 금액</th>
-								<td><span id="spanOrdAmt"></span>원</td>
-								<th>취소 상품 금액</th>
-								<td><span id="spanCnclRtnAmt"></span>원</td>
-							</tr>
-							<tr>
-								<th>취소 사용 포인트</th>
-								<td colspan="3"><span id="spanTotPntDcAmt"></span>원 (고객 포인트 : <span id="spanPntDcAmt"></span>원 + 상품 선포인트 : <span id="spanPrePntDcAmt"></span>원) </td>
-							</tr>
-							<tr>
-								<th>취소 사용 쿠폰금액</th>
-								<td colspan="3"><span id="spanCpnDcAmt"></span>원 (즉시할인쿠폰 : <span id="spanCpn1DcAmt"></span>원 + 상품쿠폰 : <span id="spanGoodsCpnDcAmt"></span>원 + 장바구니쿠폰 : <span id="spanCartCpnDcAmt"></span>원)</td>
-							</tr>
-							<tr>
-								<th>취소 다다익선 금액</th>
-								<td colspan="3"><span id="spanTmtbDcAmt"></span>원 (수량할인 : <span id="spanTmtb1DcAmt"></span>원 + 금액할인 : <span id="spanTmtb2DcAmt"></span>원)</td>
-							</tr>
-							
-							<tr>
-								<th>취소 고객 상품권 금액</th>
-								<td><span id="spanGfcdUseAmt"></span>원</td>
-								<th>추가 반품배송 금액</th>
-								<td><span id="spanTotRtnDelvFee"></span>원</td>
-							</tr>
-							
-							<tr>
-								<th>취소 상품 실결제 금액</th>
-								<td><span id="spanRealCnclRtnAmt"></span>원</td>
-								<th>추가 배송 금액</th>
-								<td><span id="spanTotDeliveryFee"></span>원</td>
-							</tr>
-
-							<tr>
-								<th>환불 금액 합계</th>
-								<td colspan="3"><span id="spanRefundAmt"></span>원</td>
-							</tr>
-						</tbody>
-					</table>
-					 -->
 				</div>
 				
 				<div>
@@ -292,25 +237,25 @@
 	var returnOrderInfo;
 
 	var columnDefsDetail = [
-		{headerName: "주문변경번호", 	field: "ordChgSq",	width: 100, minWidth: 100, cellClass: 'text-center'},
-		{headerName: "주문번호", 		field: "ordNo", 	width: 100, minWidth: 100, cellClass: 'text-center',
+		{headerName: "주문변경번호", 		field: "ordChgSq",		width: 100, minWidth: 100, cellClass: 'text-center'},
+		{headerName: "주문번호", 			field: "ordNo", 		width: 100, minWidth: 100, cellClass: 'text-center',
 			cellRenderer: function(params) {
 				return "<a href=\"javascript:void(0);\" onclick=\"cfnOpenOrderDetailPopup('" + params.value + "');\">" + params.value + "</a>";
 			}
 		},
-		{headerName: "상품명", 		field: "goodsNm",	width: 150, minWidth: 100},
-		{headerName: "상품코드", 		field: "goodsCd", 	width: 120, minWidth: 100, cellClass: 'text-center',
+		{headerName: "상품명", 			field: "goodsNm",		width: 150, minWidth: 100},
+		{headerName: "상품코드", 			field: "goodsCd", 		width: 120, minWidth: 100, cellClass: 'text-center',
 			cellRenderer: function(params) {
 				return "<a href=\"javascript:void(0);\" onclick=\"cfnOpenGoodsDetailPopup('U','" + params.value + "','');\">" + params.value + "</a>";
 			}
 		},
-		{headerName: "SKUCODE", 	field: "optCd", 	width: 100, minWidth: 100, cellClass: 'text-center'},
-		{headerName: "옵션1", 		field: "optCd1", 	width: 60, minWidth: 100, cellClass: 'text-center'},
-		{headerName: "옵션2", 		field: "optCd2", 	width: 60, minWidth: 100, cellClass: 'text-center'},
-		{headerName: "신청수량", 		field: "chgQty", 	width: 80, minWidth: 100, cellClass: 'text-center'},
-		{headerName: "회수수량", 		field: "wdQty", 	width: 80, minWidth: 100, cellClass: 'text-center'},
-		{headerName: "회수처리상태", 	field: "wdStat",	width: 120, minWidth: 100, cellClass: 'text-center'},
-		{headerName: "회수처리", 		field: "chgStat",	width: 120, minWidth: 100, cellClass: 'text-center'
+		{headerName: "SKUCODE", 		field: "optCd", 		width: 100, minWidth: 100, cellClass: 'text-center'},
+		{headerName: "옵션1", 			field: "optCd1", 		width: 60, minWidth: 100, cellClass: 'text-center'},
+		{headerName: "옵션2", 			field: "optCd2", 		width: 60, minWidth: 100, cellClass: 'text-center'},
+		{headerName: "신청수량", 			field: "chgQty", 		width: 80, minWidth: 100, cellClass: 'text-center'},
+		{headerName: "회수수량", 			field: "wdQty", 		width: 80, minWidth: 100, cellClass: 'text-center'},
+		{headerName: "회수처리상태", 		field: "wdStat",		width: 120, minWidth: 100, cellClass: 'text-center'},
+		{headerName: "회수처리", 			field: "chgStat",		width: 120, minWidth: 100, cellClass: 'text-center'
 			, cellRenderer : function(params) {
 				if (params.data.wdStatYn == 'N') {
 					if (params.data.wdQty > 0) {
@@ -323,15 +268,111 @@
 				}
 			}
 		},
-		{headerName: "주문상세번호", 	field: "ordDtlNo", 	width: 100, minWidth: 100, cellClass: 'text-center'},
-		{headerName: "등록일", 		field: "regDt", 	width: 100, minWidth: 100, cellClass: 'text-center'}
-		
+		{headerName: "주문상세번호", 		field: "ordDtlNo", 		width: 100, minWidth: 100, cellClass: 'text-center'},
+		{
+			headerName		: "주문금액"
+			, field			: "ordAmt"
+			, width			: 80
+			, cellClass		: 'text-right'
+			, cellRenderer	: function (params) {
+				return params.value.addComma();
+			}
+		},
+		{
+			headerName		: "취소금액"
+			, field			: "cnclRtnAmt"
+			, width			: 80
+			, cellClass		: 'text-right'
+			, cellRenderer	: function (params) {
+				return params.value.addComma();
+			}
+		},
+		{
+			headerName		: "즉시할인금액"
+			, field			: "cpn1DcAmt"
+			, width			: 80
+			, cellClass		: 'text-right'
+			, cellRenderer	: function (params) {
+				return params.value.addComma();
+			}
+		},
+		{
+			headerName		: "다다익선1금액"
+			, field			: "tmtb1DcAmt"
+			, width			: 80
+			, cellClass		: 'text-right'
+			, cellRenderer	: function (params) {
+				return params.value.addComma();
+			}
+		},
+		{
+			headerName		: "다다익선2금액"
+			, field			: "tmtb2DcAmt"
+			, width			: 80
+			, cellClass		: 'text-right'
+			, cellRenderer	: function (params) {
+				return params.value.addComma();
+			}
+		},
+		{
+			headerName		: "상품쿠폰금액"
+			, field			: "goodsCpnDcAmt"
+			, width			: 80
+			, cellClass		: 'text-right'
+			, cellRenderer	: function (params) {
+				return params.value.addComma();
+			}
+		},
+		{
+			headerName		: "장바구니쿠폰금액"
+			, field			: "cartCpnDcAmt"
+			, width			: 80
+			, cellClass		: 'text-right'
+			, cellRenderer	: function (params) {
+				return params.value.addComma();
+			}
+		},
+		{
+			headerName		: "선포인트금액"
+			, field			: "prePntDcAmt"
+			, width			: 80
+			, cellClass		: 'text-right'
+			, cellRenderer	: function (params) {
+				return params.value.addComma();
+			}
+		},
+		{
+			headerName		: "포인트금액"
+			, field			: "pntDcAmt"
+			, width			: 80
+			, cellClass		: 'text-right'
+			, cellRenderer	: function (params) {
+				return params.value.addComma();
+			}
+		},
+		{
+			headerName		: "실결제금액"
+			, field			: "realOrdAmt"
+			, width			: 80
+			, cellClass		: 'text-right'
+			, cellRenderer	: function (params) {
+				return params.value.addComma();
+			}
+		},
+		{
+			headerName		: "상품권금액"
+			, field			: "gfcdUseAmt"
+			, width			: 80
+			, cellClass		: 'text-right'
+			, cellRenderer	: function (params) {
+				return params.value.addComma();
+			}
+		},
+		{headerName: "등록일", 			field: "regDt", 		width: 100, minWidth: 100, cellClass: 'text-right'}
 	];
 	
 	// Get withDrawDetailGridOptions
 	var withdrawDetailGridOptions = gagaAgGrid.getGridOptions(columnDefsDetail);
-	//withdrawDetailGridOptions.rowSelection = 'multiple';
-	
 	var isCustomer = true;
 
 	/*************************************************************************
@@ -339,6 +380,7 @@
 	**************************************************************************/
 	var initFlag = '';
 	var fnRefundDetailSearch = function() {
+		
 		//initFlag = Init;
 		var params = {};
 		params.ordChgSq = ordChgSq;
@@ -671,13 +713,15 @@
 					} 
 					// 직접배송
 					else {
-						if(Number(codFee) > 0){
+						if (Number(codFee) > 0) {
 							codFeeAmt = Number(codFee);
 							codFeeYn  = "Y";
 						}
-						if(Number(enCloseFee) > 0){
+						
+						if (Number(enCloseFee) > 0) {
 							enCloseFeeYn = "Y";
 						}
+						
 						// 2021.07.02 환불컨펌 환불금액계산
 						// 환불금액  = (취소상품실결제금액 + 동봉비 + 추가결제비) - (추가배송비 + 착불비)
 						//reFundInfo.spanRefundAmt = (reFundInfo.spanRealCnclRtnAmt + Number(enCloseFee) - Number(addPaycose)) - (spanTotDeliveryFee + Number(codeFee);
@@ -876,7 +920,11 @@
 		// Create a agGrid
 		gagaAgGrid.createGrid('refundGridList', withdrawDetailGridOptions);
 		$('#divRefundInfo2').hide();
+		
+		// 회수 상세내역 조회
 		fnRefundDetailSearch();
+		
+		//
 		fnChangePgStat();
 	});