jsh77b 5 gadi atpakaļ
vecāks
revīzija
b75c166b58

+ 8 - 9
src/main/java/com/style24/admin/biz/web/TsaOrderChangeController.java

@@ -81,8 +81,8 @@ public class TsaOrderChangeController extends TsaBaseController {
 		order.setOrdDtlStatArr(ordDtlStatArr);
 		
 		// 2. 변경신청된 주문상세번호를 체크 후 있으면 해당 취소가능수량값 업데이트 
-		List<Order> cancelRequestTargetList 		= coreOrderChangeService.getCancelRequestTargetList(order);
-		List<Order> orderChangeDetailList 			= coreOrderChangeService.getOrderChangeDetailList(order);
+		List<Order> cancelRequestTargetList 		= orderChangeService.getCancelRequestTargetList(order);
+		List<Order> orderChangeDetailList 			= orderChangeService.getOrderChangeDetailList(order);
 		Collection<Order> orderInfoList 			= orderService.getOrderInfoList(order);
 		
 		// 3. 화면으로 데이타 전송
@@ -223,8 +223,8 @@ public class TsaOrderChangeController extends TsaBaseController {
 		order.setOrdDtlStatArr(ordDtlStatArr);
 		
 		// 2. 변경신청된 주문상세번호를 체크 후 있으면 해당 취소가능수량값 업데이트 
-		List<Order> cancelRequestTargetList 		= coreOrderChangeService.getCancelRequestTargetList(order);
-		List<Order> orderChangeDetailList 			= coreOrderChangeService.getOrderChangeDetailList(order);
+		List<Order> cancelRequestTargetList 		= orderChangeService.getCancelRequestTargetList(order);
+		List<Order> orderChangeDetailList 			= orderChangeService.getOrderChangeDetailList(order);
 		Collection<Order> orderInfoList 			= orderService.getOrderInfoList(order);
 		
 		// 3. 화면으로 데이타 전송
@@ -325,7 +325,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 		mav.set("ordChgSq"		, cnclReq.getOrdChgSq());
 		
 		// 2.취소요청철회 
-		mav = coreOrderChangeService.rtnReqCancel(mav, userNo);
+		mav = orderChangeService.rtnReqCancel(mav, userNo);
 		
 		return super.ok("성공");
 	}
@@ -572,7 +572,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 		
 		// 2. 환불금액계산
 		// 2021.01.19 취소신청정보를 목록 (주문상세번호, 취소/반품수량) 으로 표현
-		mav = coreOrderRefundService.cnclRtnRefundAmt(cnclReqList);
+		mav = orderRefundService.cnclRtnRefundAmt(cnclReqList);
 		
 		// 3. 주문변경 기본정보 설정
 		mav.set("ordNo"			, cnclReq.getOrdNo());				// 주문번호
@@ -595,8 +595,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 		mav.set("reqGbn"		, cnclReq.getReqGbn());				// 신청구분
 						
 		// 5. 주문변경 DB 등록 (TB_ORDER_CHANGE, TB_ORDER_CHANGE_DETAIL, TB_REFUND)
-		//coreOrderChangeService.cnclReq(mav, userNo);
-		coreOrderChangeService.cnclComplete(mav, userNo);
+		orderChangeService.cnclComplete(mav, userNo);
 		
 		return super.ok("성공");
 	}
@@ -624,7 +623,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 		mav.set("ordChgSq"		, cnclReq.getOrdChgSq());
 		
 		// 2.취소요청철회 
-		mav = coreOrderChangeService.cnclComplete(mav, userNo);
+		mav = orderChangeService.cnclComplete(mav, userNo);
 		
 		return super.ok("성공");
 	}