PG점프 임시 커밋

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

@@ -239,13 +239,6 @@ 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")) && "N".equals(cnclReq.getPgStat())) {
-				Order order = new Order();
-				order.setOrdNo(cnclReq.getOrdNo());
-				order.setOrdChgSq(cnclReq.getOrdChgSq());
-				order.setRegNo(userNo);
-				coreNaverPayService.sendNaverPayOrderCancelConfirm(order);
-			}
 		}
 		// 2021.06.09 취소접수철회
 		else if ("cnclReqCancel".equals(cnclReq.getReqGbn())) {

src/main/resources/config/application-tsit.yml

@@ -83,6 +83,20 @@ naverPay:
     payUrl:
         web : test-pay.naver.com
         mob : test-m.pay.naver.com
+    shop.id : istyle24
+    button.key : 3A1578F9-6824-4FCF-AC8D-262318C63227
+    button.pc.js.url : https://test-pay.naver.com/customer/js/naverPayButton.js
+    button.mobile.js.url : https://test-pay.naver.com/customer/js/mobile/naverPayButton.js
+    common.certification.key : s_3799db3bf4af-
+    certification.key: E3122594-C690-4542-B3A0-E74ABD4E8222
+    order.api.url: https://test-api.pay.naver.com/o/customer/api/order/v20/register
+    order.pc.url: https://test-order.pay.naver.com/customer/buy/
+    order.mobile.url: https://test-m.pay.naver.com/o/customer/buy/
+    access.license: 01000100005b15bb8faab722d100d589f34bd64843659e37a168b3617443c4f52a3fda45b8
+    secret.key: AQABAADtZ/jOC1Y3LNsyI0TWwCMvPfrg0sqM9pnxliSegbjSqQ==
+    port.address: http://sandbox.api.naver.com/Checkout/MallService5
+    service.name: MallService5
+    version: 5.0
 
 # 샵링커 API(개발계정)
 shoplinker:

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

@@ -25,7 +25,7 @@
 				<input type="hidden" name="ordNo" 			th:value="${ordNo}"/>
 				<input type="hidden" name="ordChgSq" 		th:value="${ordChgSq}"/>
 				<input type="hidden" name="delvFeeCd" 		th:value="${delvFeeCd}"/>
-				<input type="hidden" name="chgReason" 		value=""/>
+				<input type="hidden" name="chgReason" 		th:value="${orderChangeDetailList[0].chgReason}"/>
 				<input type="hidden" name="chgReasonDesc" 	value=""/>
 				
 				<div id="orderInfoList" style="display:none;">
@@ -119,7 +119,7 @@
 								<select name="selectChgReason" onchange="fnChangeChgReason($(this).val());">
 									<option value="">[선택하세요]</option>
 									<th:block th:each="oneData, status : ${chgReasonList}">
-										<th:block th:if="${oneData.cd} == G686_10 or ${oneData.cd} == G686_20 or ${oneData.cd} == G686_30">
+										<th:block th:if="${ordChgSq > 0} or ${oneData.cd} == G686_10 or ${oneData.cd} == G686_20 or ${oneData.cd} == G686_30">
 											<option th:if="${chgReasonList}"  th:value="|${oneData.cd}|" th:text="|${oneData.cdNm}|"></option>
 										</th:block>
 									</th:block>
@@ -1242,16 +1242,16 @@ $(document).ready(function() {
 	if(pgGb == "NAVER_ORDER") {
 		$("#cnclReqBtn").css("display", "none");
 		$("#cnclCompleteBtn").css("display", "none");
-		$("#orderInfoTitle").append('<span style="color: red; margin-left: 20px;">네이버페이 주문형은 취소 철회시 네이버페이센터에서도 철회해주셔야합니다.</span>');
 	}
 	
 	// 6. 취소사유 선택
 	if (ordChgSq > 0 && chgStat != 'G685_40') {
-		$("select[name='selectChgReason']").val(chgReason);										// 변경사유코드
+		let chgReasonTmp = $('#cancelRequestFrm input[name=chgReason]').val();
+		$("select[name='selectChgReason']").val(chgReasonTmp);										// 변경사유코드
 		$("select[name='selectChgReason']").attr("disabled", "true");							// 변경사유 비활성화
 		$("#chgMemo").text(chgMemo);															// 변경사유메모
 		$("#chgMemo").attr("disabled", "true");													// 변경사유메모 비활성화
-		fnChangeChgReason(chgReason);															// 귀책사유
+		fnChangeChgReason(chgReasonTmp);															// 귀책사유
 	}
 	
 	// 2021.06.21 교환배송미출고대상