반품 TO 교환 임시 커밋

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

@@ -636,9 +636,9 @@ public class TscOrderChangeService {
 		String accountNm					= map.getString("accountNm");									// 환불계좌주명
 		String bankCd						= map.getString("bankCd");										// 환불계좌은행코드
 		String reqGbn						= map.getString("reqGbn");										// 신청구분
-		String chgGb						= TscConstants.OrderChangeGb.CANCEL.value(); 						// 취소요청 (공톹코드:G680)
-		String ordDtlStat					= TscConstants.OrderDetailStat.PAYMENT_AFTER_CANCEL.value();		// 주문상세상태
-		String chgStat						= TscConstants.OrderChangeStat.PAYMENT_AFTER_CANCEL.value();		// 주문변경상태
+		String chgGb						= TscConstants.OrderChangeGb.CANCEL.value(); 					// 취소요청 (공톹코드:G680)
+		String ordDtlStat					= TscConstants.OrderDetailStat.PAYMENT_AFTER_CANCEL.value();	// 주문상세상태
+		String chgStat						= TscConstants.OrderChangeStat.PAYMENT_AFTER_CANCEL.value();	// 주문변경상태
 		
 		int payAmt							= map.getInt("spanPayAmt");										// 부분취소 전 결제금액
 		

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

@@ -36,6 +36,7 @@
 		                    THEN 0
 		                    ELSE OCD.ORD_REQ_CHG_QTY * ODI.ITEM_QTY
 		               END                                      AS ORD_REQ_CHG_QTY
+		             , OCD.CHG_GB
 		             , ODI.ITEM_PRICE
 		             , ODI.OPT_ADD_PRICE
 		             , ODI.ORD_AMT
@@ -81,15 +82,18 @@
 		            ON ODI.ITEM_CD = G2.GOODS_CD
 		          LEFT OUTER JOIN (
 		              SELECT OD.ORD_DTL_NO
+		                   , OC.CHG_GB
 		                   , 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')
-		               GROUP BY OCD.ORD_DTL_NO
+		               GROUP BY OCD.ORD_DTL_NO, OC.CHG_GB
 		          ) OCD
 		            ON OD.ORD_DTL_NO = OCD.ORD_DTL_NO
 		          LEFT OUTER JOIN TB_DELV_FEE_POLICY DFP
@@ -159,7 +163,7 @@
 		    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.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.CHG_GB
 		        , 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.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
@@ -2168,6 +2172,7 @@
 		SELECT OC.ORD_CHG_SQ
 		     , OC.CHG_GB
 		     , OCD.CHG_QTY
+		     , OD.ORD_DTL_NO
 		     , ODI.ITEM_CD
 		     , ODI.OPT_CD1
 		     , ODI.OPT_CD2
@@ -2186,7 +2191,9 @@
 		     , DA.RECIP_PHNNO
 		     , DA.DELV_MEMO
 		     , OC.CHG_REASON
-		     , FN_GET_CODE_NM('G689', OC.CHG_REASON) AS CHG_REASON_NM
+		     , CASE OC.CHG_GB WHEN 'G680_40' THEN FN_GET_CODE_NM('G689', OC.CHG_REASON)
+		                      WHEN 'G680_30' THEN FN_GET_CODE_NM('G688', OC.CHG_REASON)
+		        END AS CHG_REASON_NM
 		     , OC.CHG_MEMO
 		     , OC.ADD_PAY_COST
 		  FROM TB_ORDER_CHANGE OC