Merge remote-tracking branch 'origin/jsh77b' into order

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

@@ -458,6 +458,7 @@ public class TscOrderChangeService {
 				
 		// 3. 변경신청정보
 		int ordNo 			= Integer.parseInt(mav.getString("ordNo").toString());				// 주문번호
+		int ordChgSq		= Integer.parseInt(mav.getString("ordChgSq").toString());			// 주문변경번호
 		String chgReason 	= mav.getString("chgReason").toString();							// 변경사유
 		String chgMemo 		= mav.getString("chgMemo").toString();								// 변경메모
 		String allCanYn		= mav.getString("allCanYn").toString();								// 무통장입금전 전체취소 여부
@@ -605,6 +606,36 @@ public class TscOrderChangeService {
 		return mav;
 	}
 	
+	/**
+	 * 반품신청철회 (admin)
+	 * @param Order
+	 * @return Order
+	 * @author jsh77b
+	 * @since 2021. 01. 19
+	 */
+	@Transactional("shopTxnManager")
+	public GagaMap rtnReqCancel(GagaMap mav, int userNo) {
+		
+		Order order = new Order();
+		order.setOrdNo(mav.getInt("ordNo"));
+		order.setOrdChgSq(mav.getInt("ordChgSq"));
+		order.setOrdDtlStat(TscConstants.OrderChangeStat.RETURN_CANCEL.value());
+		order.setRegNo(userNo);
+		order.setUpdNo(userNo);
+		order.setDelYn("Y");
+		
+		// 1. 주문변경정보 (TB_ORDER_CHANGE_DTL(수정))
+		orderChangeDao.updateOrderChangeDtlCancel(order);
+		
+		// 2. 주문정보 이력 등록 (TB_ORDER_DETAIL_HST(등록))
+		orderChangeDao.createOrderDtlHstCancel(order);
+		
+		// TODO
+		// 3. PG 실행 (취소시 추가결제금액 취소처리)
+		
+		return mav;
+	}
+	
 	/**
 	 * 반품완료
 	 * @param Order