PG점프 처리 임시 커밋

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

@@ -217,8 +217,9 @@ public class TsaOrderChangeController extends TsaBaseController {
 		map.set("pgTid"						, refundPreInfo.getString("pgTid"));		// PG거래ID
 		map.set("payMeans"					, refundPreInfo.getString("payMeans"));		// 결제수단
 		map.set("pgGb"						, refundPreInfo.getString("pgGb"));			// PG구분
-		map.set("cashAuthNo"				, refundPreInfo.getString("cashAuthNo"));	// 현금영수증 승인번호'
+		map.set("cashAuthNo"				, refundPreInfo.getString("cashAuthNo"));	// 현금영수증 승인번호
 		map.set("chgStat"					, cnclReq.getChgStat());					// 변경상태
+		map.set("pgStat"					, cnclReq.getPgStat());						// PG점프
 
 		// 4. 부분취소 처리 2021.05.13
 		// 2021.06.09 취소접수
@@ -238,7 +239,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 		// 2021.06.09 취소접수승인
 		else if ("cnclReqComplete".equals(cnclReq.getReqGbn())) {
 			result = coreOrderChangeService.approveCancelRequest(cnclReq, userNo);
-			if(StringUtils.isNotBlank(result.getString("pgGb")) && TscConstants.PgGb.NAVER_ORDER.value().equals(result.getString("pgGb"))) {
+			if(StringUtils.isNotBlank(result.getString("pgGb")) && TscConstants.PgGb.NAVER_ORDER.value().equals(result.getString("pgGb")) && "N".equals(cnclReq.getPgStat())) {
 				Order order = new Order();
 				order.setOrdNo(cnclReq.getOrdNo());
 				order.setOrdChgSq(cnclReq.getOrdChgSq());

src/main/webapp/WEB-INF/views/order/CnclReqForm.html

@@ -1142,7 +1142,7 @@ var fnCnclReq = function (reqGbn) {
 		,"chgStat"					: chgStat
 		,"wdGb"						: wdGb
 		,"addPayCost"				: addPayCost
-		//,"pgStat"					: $('#pgStat').is(':checked') ? 'Y' : 'N'
+		,"pgStat"					: $('#pgStat').is(':checked') ? 'Y' : 'N'
 	}
 
 	// 주문번호, 취소사유, 취소메모, (취소, 반품, 교환 신청 정보 목록), 환불계좌