충돌수정

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

@@ -19,7 +19,6 @@ import com.gagaframework.web.rest.server.GagaResponseStatus;
 import com.style24.core.biz.dao.TscOrderChangeDao;
 import com.style24.core.biz.dao.TscOrderDao;
 import com.style24.core.support.env.TscConstants;
-import com.style24.core.support.env.TscConstants.OrderCancelReason;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.core.support.util.CryptoUtils;
 import com.style24.persistence.domain.DeliveryFee;
@@ -841,7 +840,7 @@ public class TscOrderChangeService {
 		orderChangeDao.createOrderChangeDetailHstForAllCancel(orderChange);
 
 		// 3. 주문정보 이력 등록 (TB_ORDER_DETAIL_HST(등록))
-		//orderChangeDao.createOrderDtlHstCancel(order);
+		// orderChangeDao.createOrderDtlHstCancel(order);
 
 		// 4. PG 실행 (취소시 추가결제금액 취소처리)
 		Collection<Order> paymentList = orderChangeDao.getAddDeliveryFeePayment(orderChange);
@@ -1086,7 +1085,7 @@ public class TscOrderChangeService {
 			orderChangeDao.createOrderDetailItemForExchange(ordDtlItem);
 
 			// 9. TB_ORDER_DETAIL_ITEM_HST 등록 교환신청시에 등록하지 않음
-			//orderChangeDao.createOrderDetailItemHstForExchange(ordDtlItem);
+			// orderChangeDao.createOrderDetailItemHstForExchange(ordDtlItem);
 		}
 
 		// 10. TB_SELL_QTY 등록
@@ -1167,10 +1166,8 @@ public class TscOrderChangeService {
 			// 3-3. TB_ORDER_DETAIL_ITEM 상태값 변경
 			// orderChangeDao.updateOrderDetailItemForExchangeCancel(exchangeCancel);
 
-		// 3-5. TB_ORDER_CHANGE_DETAIL 상태값 변경 및 DEL_YN Y로 업데이트
-		orderChangeDao.updateOrderChangeDtlCancel(exchangeCancel);
-		// 3-4. TB_ORDER_DETAIL_ITEM_HST 생성 사용하지않음
-		//orderChangeDao.createOrderDetailItemHstForExchangeCancel(exchangeCancel);
+			// 3-4. TB_ORDER_DETAIL_ITEM_HST 생성 사용하지않음
+			// orderChangeDao.createOrderDetailItemHstForExchangeCancel(exchangeCancel);
 
 			// 3-5. TB_ORDER_CHANGE_DETAIL 상태값 변경 및 DEL_YN Y로 업데이트
 			orderChangeDao.updateOrderChangeDtlCancel(exchangeCancel);
@@ -4013,6 +4010,7 @@ public class TscOrderChangeService {
 	 * @author card007
 	 * @since 2021. 03. 30
 	 */
+	@SuppressWarnings("unchecked")
 	@Transactional("shopTxnManager")
 	public GagaMap returnReq(OrderChange orderChange) {
 		// 2. 환불 사전 정보 조회
@@ -4054,6 +4052,7 @@ public class TscOrderChangeService {
 		GagaMap map = returnRequest(result);
 
 		return map;
+	}
 
 	/**
 	 * 마이페이지 회수지 수정