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

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

@@ -112,9 +112,7 @@ public class TscOrderChangeService {
 	public List<Order> getOrderChangeDetailList(Order order) {
 		return orderChangeDao.getOrderChangeDetailList(order);
 	}
-	
-	
-	
+
 	/**
 	 * 취소신청철회 (admin)
 	 * @param Order
@@ -131,6 +129,7 @@ public class TscOrderChangeService {
 		order.setOrdDtlStat(TscConstants.OrderChangeStat.CANCEL_CANCEL.value());
 		order.setRegNo(userNo);
 		order.setUpdNo(userNo);
+		order.setDelYn("Y");
 		
 		// 1. 주문변경정보 (TB_ORDER_CHANGE_DTL(수정))
 		orderChangeDao.updateOrderChangeDtlCancel(order);
@@ -159,7 +158,7 @@ public class TscOrderChangeService {
 		//userNo = userNo;
 		
 		// 2. 취소요정정보목록
-		List<Order> cancelReqList		 	= (List<Order>) mav.get("cnclRtnList");				// 취소요청 목록
+		//List<Order> cancelReqList		 	= (List<Order>) mav.get("cnclRtnList");				// 취소요청 목록
 		List<Order> cancelOrderRefundList 	= (List<Order>) mav.get("cancelOrderRefundList");	// 취소환불금액 목록 (주문상세단품 단위)
 		List<Order> cancelDelvRefundList 	= (List<Order>) mav.get("cancelDelvRefundList");	// 취소환불배송금액 목록 (DELV_FEE_CD 단위)
 				
@@ -181,8 +180,8 @@ public class TscOrderChangeService {
 			cancelOrderRefundPo.setUpdNo(userNo);
 			
 			// 2020.01.05 추후 무통장입금전 전체 취소시 분기 로직 추가 예정
-			// 2021.01.26 취소완료일때실행
-			if ("cnclComplete".equals(reqGbn)) {
+			// 2021.01.26 취소완료, 취소신청완료(취소승인) 일때실행
+			if ("cnclComplete".equals(reqGbn) || "cnclReqComplete".equals(reqGbn)) {
 				if ("Y".equals(allCanYn)) {
 					cancelOrderRefundPo.setOrdDtlStat(TscConstants.OrderDetailStat.PAYMENT_BEFORE_CANCEL.value()); 	// 결제전주문취소 (공통코드:G685)
 				} else {
@@ -193,9 +192,9 @@ public class TscOrderChangeService {
 			// 4.1 취소수량이 존재하면 주문상세단품정보 수정 및 주문상세단품이력정보 등록
 			if (cancelOrderRefundPo.getOrdCanChgQty() > 0) {
 				
-				// 2021.01.26 취소완료일때실행
+				// 2021.01.26 취소완료, 취소신청완료(취소승인) 일때실행
 				// 4.2 주문상세단품정보수정 (TB_ORDER_DETAIL_ITEM)
-				if ("cnclComplete".equals(reqGbn)) {
+				if ("cnclComplete".equals(reqGbn) || "cnclReqComplete".equals(reqGbn)) {
 					orderChangeDao.updateOrderDetailItem(cancelOrderRefundPo);
 				
 				
@@ -253,7 +252,10 @@ public class TscOrderChangeService {
 				orderChange.setChgerEmail(chgerEmail);
 				orderChange.setChgerRtnMemo("");
 				
-				orderChangeDao.createOrderChange(orderChange);
+				// 2021.01.26 취소완료, 취소신청 일때실행
+				if ("cnclComplete".equals(reqGbn) || "cnclReq".equals(reqGbn)) {
+					orderChangeDao.createOrderChange(orderChange);
+				}
 				
 				// 5.3 주문상세단위 취소정보
 				for (int j=0 ; j<cancelOrderDetailList.size() ; j++) {
@@ -264,9 +266,9 @@ public class TscOrderChangeService {
 					// 5.3.0 DEVL_FEE_CD 단위로 주문상세 정보 처리
 					if (obj.getDelvFeeCd().equals(vo.getDelvFeeCd())) {
 						
-						// 2021.01.26 취소완료일때실행
+						// 2021.01.26 취소완료, 취소신청완료 일때실행
 						// 2020.01.05 추후 무통장입금전 전체 취소시 분기로직 추가 예정
-						if ("cnclComplete".equals(reqGbn)) {
+						if ("cnclComplete".equals(reqGbn) || "cnclReqComplete".equals(reqGbn)) {
 							if ("Y".equals(allCanYn)) {
 								vo.setOrdDtlStat(TscConstants.OrderDetailStat.PAYMENT_BEFORE_CANCEL.value()); 	// 결제전주문취소
 							} else {
@@ -279,9 +281,9 @@ public class TscOrderChangeService {
 						// 5.3.1 주문변경상세정보 이력등록
 						orderChangeDao.createOrderDetailHstCnclRtn(vo);
 						
-						// 2021.01.26 취소완료일때실행
+						// 2021.01.26 취소완료, 취소신청완료 일때실행
 						// 5.3.2 주문변경상세정보 수정
-						if ("cnclComplete".equals(reqGbn)) {
+						if ("cnclComplete".equals(reqGbn) || "cnclReqComplete".equals(reqGbn)) {
 							orderChangeDao.updateOrderDetail(vo);
 						}
 						
@@ -297,18 +299,34 @@ public class TscOrderChangeService {
 						// 2021.01.26 취소완료일때실행
 						if ("cnclComplete".equals(reqGbn)) {
 							changeDetailPo.setChgStat(TscConstants.OrderChangeStat.CANCEL_COMPLETE.value()); 	// 취소완료
-						} else {
+							orderChangeDao.createOrderChangeDetail(changeDetailPo);
+						}
+						// 2021.01.26 취소신청완료일때실행
+						else if ("cnclReqComplete".equals(reqGbn)) {
+							Order order = new Order();
+							order.setOrdNo(mav.getInt("ordNo"));
+							order.setOrdChgSq(mav.getInt("ordChgSq"));
+							order.setOrdDtlStat(TscConstants.OrderChangeStat.CANCEL_COMPLETE.value());
+							order.setUpdNo(userNo);
+							order.setDelYn("N");
+							orderChangeDao.updateOrderChangeDtlCancel(order);
+						}
+						// 2021.01.26 취소신청일때실행
+						else {
 							changeDetailPo.setChgStat(TscConstants.OrderChangeStat.CANCEL.value()); 			// 취소신청
+							orderChangeDao.createOrderChangeDetail(changeDetailPo);
 						}
-						
-						orderChangeDao.createOrderChangeDetail(changeDetailPo);
 					}
 				}
 				
-				// 2021.01.26 취소완료일때실행
+				// 2021.01.26 취소완료, 취소신청완료 일때실행
 				// 5.31 상품재고원복 (TB_SELL_QTY 등록(취소,반품))
+				orderChange.setSellGb("11");
 				if ("cnclComplete".equals(reqGbn)) {
-					orderChange.setSellGb("11");
+					orderChangeDao.createSellQty(orderChange);
+				} else if ("cnclReqComplete".equals(reqGbn)) {
+					orderChange.setOrdNo(mav.getInt("ordNo"));
+					orderChange.setOrdChgSq(mav.getInt("ordChgSq"));
 					orderChangeDao.createSellQty(orderChange);
 				}
 				
@@ -337,8 +355,8 @@ public class TscOrderChangeService {
 				paymentOrder.setRegNo(userNo);
 				paymentOrder.setUpdNo(userNo);
 				
-				// 2021.01.26 취소완료일때실행
-				if ("cnclComplete".equals(reqGbn)) {
+				// 2021.01.26 취소완료, 취소신청완료 일때실행
+				if ("cnclComplete".equals(reqGbn) || "cnclReqComplete".equals(reqGbn)) {
 					orderChangeDao.createPayment(paymentOrder);
 				}
 				
@@ -364,7 +382,10 @@ public class TscOrderChangeService {
 				refundOrder.setRaNm(mav.get("accountNm").toString());
 				refundOrder.setRaBank(mav.get("bankCd").toString());
 				
-				orderChangeDao.createRefund(refundOrder);
+				// 2021.01.26 취소완료, 취소신청 일때실행
+				if ("cnclComplete".equals(reqGbn) || "cnclReq".equals(reqGbn)) {
+					orderChangeDao.createRefund(refundOrder);
+				}
 				
 				// 5.6 결제금액이 무료배송금액보다 작으면 배송비 신규 등록
 				if (obj.getAddDelvFee() > 0) {
@@ -381,8 +402,8 @@ public class TscOrderChangeService {
 					delvFeeOrder.setRegNo(userNo);
 					delvFeeOrder.setUpdNo(userNo);
 					
-					// 2021.01.26 취소완료일때실행
-					if ("cnclComplete".equals(reqGbn)) {
+					// 2021.01.26 취소완료, 취소신청완료일때실행
+					if ("cnclComplete".equals(reqGbn) || "cnclReqComplete".equals(reqGbn)) {
 						orderChangeDao.createDeliveryFee(delvFeeOrder);
 					}
 				}

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

@@ -866,7 +866,7 @@
 		/* OrderChange.updateOrderChangeDtlCancel */
 		UPDATE TB_ORDER_CHANGE_DETAIL
 		SET    CHG_STAT 	= #{ordDtlStat}
-		     , DEL_YN		= 'Y'
+		     , DEL_YN		= #{delYn}
 		     , UPD_NO 		= #{updNo}
 		     , UPD_DT 		= NOW()
 		WHERE  1=1