1122

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

@@ -135,6 +135,16 @@ public interface TscOrderChangeDao {
 	 */
 	int updateOrdFreegiftDel(Order order);
 	
+	/**
+	 * 주문상세이력정보등록 취소신청철회
+	 *
+	 * @param Order - 주문 정보
+	 * @return
+	 * @author jsh77b
+	 * @since 2021. 01. 26
+	 */
+	int createOrderDtlHstCancel(Order order);
+	
 	/**
 	 * 주문변경상세정보 수정(취소신청 철회)
 	 *

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

@@ -274,14 +274,18 @@ public class TscOrderChangeService {
 	public GagaMap cnclReqCancel(GagaMap mav, int userNo) {
 		
 		Order order = new Order();
-		
-		// 1. 주문정보 이력 등록 (TB_ORDER_DETAIL_HST(등록))
-		
-		
-		// 2. 주문변경정보 (TB_ORDER_CHANGE_DTL(수정))
+		order.setOrdNo(mav.getInt("ordNo"));
 		order.setOrdChgSq(mav.getInt("ordChgSq"));
+		order.setOrdDtlStat(TscConstants.OrderChangeStat.CANCEL_CANCEL.value());
+		order.setRegNo(userNo);
+		order.setUpdNo(userNo);
+		
+		// 1. 주문변경정보 (TB_ORDER_CHANGE_DTL(수정))
 		orderChangeDao.updateOrderChangeDtlCancel(order);
 		
+		// 2. 주문정보 이력 등록 (TB_ORDER_DETAIL_HST(등록))
+		orderChangeDao.createOrderDtlHstCancel(order);
+		
 		// To Do List
 		// 3. PG 실행 (취소시 추가결제금액 취소처리)
 		

src/main/java/com/style24/core/support/env/TscConstants.java

@@ -248,6 +248,7 @@ public class TscConstants {
 		PAYMENT_BEFORE_CANCEL("G685_10"),	// 결제전취소
 		CANCEL("G685_20"),					// 취소요청
 		CANCEL_COMPLETE("G685_21"),			// 취소완료
+		CANCEL_CANCEL("G685_22"),			// 취소철회
 
 		EXCHANGE("G685_30"),				// 교환요청
 		EXCHANGE_CANCEL("G685_31"),			// 교환요청 취소

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

@@ -68,7 +68,7 @@
 		AND    OD.ORD_DTL_NO = ODI.ORD_DTL_NO
 		INNER  JOIN TB_GOODS G2
 		ON     ODI.ITEM_CD = G2.GOODS_CD
-		INNER  JOIN (
+		LEFT   OUTER JOIN (
 			SELECT OD.ORD_DTL_NO
 			     , SUM(OCD.CHG_QTY) AS ORD_REQ_CHG_QTY
 			FROM   TB_ORDER_CHANGE_DETAIL OCD
@@ -76,6 +76,7 @@
 			ON     OCD.ORD_DTL_NO = OD.ORD_DTL_NO
 			WHERE  1=1
 			AND    OD.ORD_NO = #{ordNo}
+			AND    OCD.DEL_YN = 'N'
 			AND    OCD.CHG_STAT IN (
 				'G685_20', 'G685_30', 'G685_40'
 			)
@@ -802,17 +803,176 @@
 		)
 	</insert>
 	
-	<!-- 주문변경상세정보 취소 -->
+	<!-- 주문변경상세정보 취소신청철회 -->
 	<update id="updateOrderChangeDtlCancel" parameterType="Order">
 		/* OrderChange.updateOrderChangeDtlCancel */
 		UPDATE TB_ORDER_CHANGE_DETAIL
-		SET    CHG_STAT 	= #{chgStat}
+		SET    CHG_STAT 	= #{ordDtlStat}
+		     , DEL_YN		= 'Y'
 		     , UPD_NO 		= #{updNo}
-		     , UPD_DT 		= #{updDt}
+		     , UPD_DT 		= NOW()
 		WHERE  1=1
 		AND    ORD_CHG_SQ 	= #{ordChgSq}
 	</update>
 	
+	<!-- 주문상세이력정보등록 취소신청철회 -->
+	<insert id="createOrderDtlHstCancel" parameterType="Order">
+	INSERT INTO TB_ORDER_DETAIL_HST (
+		ORD_DTL_NO
+		, ORD_NO
+		, ORD_EXCH_GB
+		, ORD_DTL_STAT
+		, ORG_ORD_DTL_NO
+		, SUPPLY_COMP_CD
+		, GOODS_CD
+		, PRODUCT_NO
+		, PRODUCT_CODE
+		, FORMAL_GB
+		, GOODS_TYPE
+		, LIST_PRICE
+		, CURR_PRICE
+		, DC_RATE
+		, OPT_ADD_PRICE
+		, ORD_QTY
+		, ORD_AMT
+		, CNCL_RTN_QTY
+		, CNCL_RTN_AMT
+		, CPN1_CPN_SQ
+		, CPN1_DC_AMT
+		, TMTB1_SQ
+		, TMTB1_DC_AMT
+		, TMTB2_SQ
+		, TMTB2_DC_AMT
+		, GOODS_CPN_SQ
+		, GOODS_CPN_DC_AMT
+		, CART_CPN_SQ
+		, CART_CPN_DC_AMT
+		, BURDEN_RATE
+		, PNT_DC_AMT
+		, PRE_PNT_DC_AMT
+		, SAVE_PNT_AMT
+		, REAL_ORD_AMT
+		, GFCD_USE_AMT
+		, VENDOR_ID
+		, EXTMALL_ID
+		, AGENT_ORDER_ID
+		, EXTMALL_ORDER_ID
+		, CHANGABLE_YN
+		, CHANGE_FEE_FREE_YN
+		, RETURNABLE_YN
+		, RETURN_FEE_FREE_YN
+		, SOLDOUT_YN
+		, SOLDOUT_MEMO
+		, SOLDOUT_REG_NO
+		, SOLDOUT_REG_DT
+		, DELV_ADDR_SQ
+		, DELV_FEE_CD
+		, SHOT_DELV_YN
+		, GIFT_PACK_YN
+		, MAKE_GOODS_YN
+		, ENTRY_NO
+		, DELV_LOC_CD
+		, DELV_ASSIGN_DT
+		, DELV_ASSIGN_STAT
+		, DSTRBT_NOTE
+		, DELV_STDT
+		, DELV_EDDT
+		, SHIP_COMP_CD
+		, INVOICE_NO
+		, INVOICE_SEND_YN
+		, SELL_STORE_CD
+		, SELL_FEE_RATE
+		, AF_LINK_CD
+		, ITHR_CD
+		, CONTENTS_LOC
+		, PLAN_DTL_SQ
+		, SOCIAL_SQ
+		, REG_NO
+		, REG_DT
+		, UPD_NO
+		, UPD_DT
+		)
+		SELECT OD.ORD_DTL_NO
+			 , OD.ORD_NO
+			 , OD.ORD_EXCH_GB
+			 , OCD.CHG_STAT
+			 , OD.ORG_ORD_DTL_NO
+			 , OD.SUPPLY_COMP_CD
+			 , OD.GOODS_CD
+			 , OD.PRODUCT_NO
+			 , OD.PRODUCT_CODE
+			 , OD.FORMAL_GB
+			 , OD.GOODS_TYPE
+			 , OD.LIST_PRICE
+			 , OD.CURR_PRICE
+			 , OD.DC_RATE
+			 , OD.OPT_ADD_PRICE
+			 , OD.ORD_QTY
+			 , OD.ORD_AMT
+			 , OCD.CHG_QTY 
+			 , OD.CNCL_RTN_AMT
+			 , OD.CPN1_CPN_SQ
+			 , OD.CPN1_DC_AMT
+			 , OD.TMTB1_SQ
+			 , OD.TMTB1_DC_AMT
+			 , OD.TMTB2_SQ
+			 , OD.TMTB2_DC_AMT
+			 , OD.GOODS_CPN_SQ
+			 , OD.GOODS_CPN_DC_AMT
+			 , OD.CART_CPN_SQ
+			 , OD.CART_CPN_DC_AMT
+			 , OD.BURDEN_RATE
+			 , OD.PNT_DC_AMT
+			 , OD.PRE_PNT_DC_AMT
+			 , OD.SAVE_PNT_AMT
+			 , OD.REAL_ORD_AMT
+			 , OD.GFCD_USE_AMT
+			 , OD.VENDOR_ID
+			 , OD.EXTMALL_ID
+			 , OD.AGENT_ORDER_ID
+			 , OD.EXTMALL_ORDER_ID
+			 , OD.CHANGABLE_YN
+			 , OD.CHANGE_FEE_FREE_YN
+			 , OD.RETURNABLE_YN
+			 , OD.RETURN_FEE_FREE_YN
+			 , OD.SOLDOUT_YN
+			 , OD.SOLDOUT_MEMO
+			 , OD.SOLDOUT_REG_NO
+			 , OD.SOLDOUT_REG_DT
+			 , OD.DELV_ADDR_SQ
+			 , OD.DELV_FEE_CD
+			 , OD.SHOT_DELV_YN
+			 , OD.GIFT_PACK_YN
+			 , OD.MAKE_GOODS_YN
+			 , OD.ENTRY_NO
+			 , OD.DELV_LOC_CD
+			 , OD.DELV_ASSIGN_DT
+			 , OD.DELV_ASSIGN_STAT
+			 , OD.DSTRBT_NOTE
+			 , OD.DELV_STDT
+			 , OD.DELV_EDDT
+			 , OD.SHIP_COMP_CD
+			 , OD.INVOICE_NO
+			 , OD.INVOICE_SEND_YN
+			 , OD.SELL_STORE_CD
+			 , OD.SELL_FEE_RATE
+			 , OD.AF_LINK_CD
+			 , OD.ITHR_CD
+			 , OD.CONTENTS_LOC
+			 , OD.PLAN_DTL_SQ
+			 , OD.SOCIAL_SQ
+			 , #{regNo}
+			 , NOW()
+			 , #{updNo}
+			 , NOW()
+		FROM   TB_ORDER_DETAIL OD
+		INNER  JOIN TB_ORDER_CHANGE_DETAIL OCD
+		ON     OD.ORD_DTL_NO = OCD.ORD_DTL_NO 
+		WHERE  1=1
+		AND    OCD.ORD_CHG_SQ = #{ordChgSq}
+		AND    OD.ORD_NO = #{ordNo}
+	</insert>
+	
 	
 	
 </mapper>