어드민 주문 전체 취소 처리 커밋

src/main/java/com/style24/admin/biz/web/TsaOrderChangeController.java

@@ -265,20 +265,33 @@ public class TsaOrderChangeController extends TsaBaseController {
 		}
 		// 취소완료
 		else {
-			result = coreOrderChangeService.partialCancel(map, userNo);
-			
+			String allCanYn = refundPreInfo.getString("allCanYn");
+
+			if ("Y".equals(allCanYn)) {
+				cnclReq.setChgGb(TscConstants.OrderChangeGb.CANCEL.value());
+				cnclReq.setPgStat("N");
+				cnclReq.setRegNo(userNo);
+				cnclReq.setUpdNo(userNo);
+
+				// 전체 취소 처리
+				Integer ordChgSq = coreOrderChangeService.allCnclComplete(cnclReq);
+				result.setInt("ordChgSq", ordChgSq);
+			} else {
+				result = coreOrderChangeService.partialCancel(map, userNo);
+			}
+
 			String pgGb = map.getString("pgGb");
-			
+
 			if (TscConstants.PgGb.NAVER_ORDER.value().equals(pgGb)) {
 				List<Order> cancelOrderRefundList 	= (List<Order>) map.get("cancelOrderRefundList");
 
 				for(Order vo : cancelOrderRefundList) {
-					
+
 					try {
 						// 2021.07.30 수정
 						if (vo.getOrdCanChgQty() > 0) {
 							Order order = coreNaverPayService.getOrderDetailInfoFromOrdDtlNo(vo);
-							
+
 							if ("O".equals(order.getOrdExchGb())) {
 								// 취소 완료
 								if ("scm".equals(env.getProperty("server.site.name"))) {
@@ -300,11 +313,11 @@ public class TsaOrderChangeController extends TsaBaseController {
 									// coreNaverPayService.sendNaverPayRejectExchange(exception, userNo);        // 교환반려
 									addUrl = "/naverpay/send/reject/exchange?ordDtlNo=" + order.getOrdDtlNo() + "&userNo=" + userNo;
 									coreNaverPayService.sendScmServerForNaverpay(addUrl);                        // 교환 반려
-	
+
 									// coreNaverPayService.sendNaverPaySoldoutReturnReq(param, userNo);				// 품절반품접수
 									addUrl = "/naverpay/send/soldout/return/req?ordDtlNo=" + order.getOrdDtlNo() + "&userNo=" + userNo;
 									coreNaverPayService.sendScmServerForNaverpay(addUrl);                            // 품절반품접수
-	
+
 									// coreNaverPayService.sendNaverPayReturnComplete(exception, userNo);		// 반품완료
 									addUrl = "/naverpay/send/return/complete?ordDtlNo=" + order.getOrdDtlNo() + "&userNo=" + userNo;
 									coreNaverPayService.sendScmServerForNaverpay(addUrl);                        // 반품완료