card007 5 лет назад
Родитель
Сommit
84ef8ca892

+ 52 - 2
src/main/java/com/style24/front/biz/web/TsfOrderController.java

@@ -965,7 +965,7 @@ public class TsfOrderController extends TsfBaseController {
 	}
 
 	/**
-	 * 카카오페이 결제 승인 처리
+	 * 네이버페이 결제 승인 처리
 	 *
 	 * @param Order
 	 * @return GagaMap
@@ -976,7 +976,7 @@ public class TsfOrderController extends TsfBaseController {
 	@ResponseBody
 	public GagaMap approveNaverPayment(@RequestBody Order order) {
 		GagaMap result = new GagaMap();
-log.info("order >>> {}", order);
+
 		if (TsfSession.getInfo().getCustNo() == null) {
 			order.setCustNo(0);
 		} else {
@@ -989,4 +989,54 @@ log.info("order >>> {}", order);
 		return result;
 	}
 
+	/**
+	 * 네이버페이 결제 조회
+	 *
+	 * @param Order
+	 * @return GagaMap
+	 * @author card007
+	 * @since 2021. 03. 09
+	 */
+	@RequestMapping(value = "/naver/payment/order")
+	@ResponseBody
+	public GagaMap naverPaymentOrder(@RequestBody Order order) {
+		GagaMap result = new GagaMap();
+
+		if (TsfSession.getInfo().getCustNo() == null) {
+			order.setCustNo(0);
+		} else {
+			order.setCustNo(TsfSession.getInfo().getCustNo());
+		}
+
+		result.set("naverPay", naverPayService.getNaverPaymentOrder(order));
+		result.set("status", GagaResponseStatus.SUCCESS.getCode());
+
+		return result;
+	}
+
+	/**
+	 * 네이버페이 결제 취소
+	 *
+	 * @param Order
+	 * @return GagaMap
+	 * @author card007
+	 * @since 2021. 03. 09
+	 */
+	@RequestMapping(value = "/naver/payment/cancel")
+	@ResponseBody
+	public GagaMap cancelNaverPayment(@RequestBody Order order) {
+		GagaMap result = new GagaMap();
+
+		if (TsfSession.getInfo().getCustNo() == null) {
+			order.setCustNo(0);
+		} else {
+			order.setCustNo(TsfSession.getInfo().getCustNo());
+		}
+
+		result.set("naverPay", naverPayService.cancelNaverPayment(order));
+		result.set("status", GagaResponseStatus.SUCCESS.getCode());
+
+		return result;
+	}
+
 }

+ 29 - 17
src/main/webapp/WEB-INF/views/web/order/OrderFormWeb.html

@@ -248,51 +248,63 @@
 			});
 		}
 
-		// 카카오페이 결제 승인 요청
+		// 네이버페이 결제 승인 요청
 		var fnNaverPaymentRequest = function(paymentId) {
-			console.log(paymentId);
-			$('#order_info').append('<input type=hidden name="paymentId" value="' + paymentId + '" />');
+			$('#order_info').append('<input type=hidden name="pgTid" value="' + paymentId + '" />');
 
 			let url = '/order/naver/payment/approve';
 			let data = {};
-			data.paymentId = $('#order_info input[name=paymentId]').val();
+			data.pgTid = $('#order_info input[name=pgTid]').val();
 
 			let jsonData = JSON.stringify(data);
-			
-			console.log(jsonData);
 
 			gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
 				console.log('====== naverPaymentRequest ======');
 				console.log(result.payment);
 				console.log(' ');
-				//fnKakaoPaymentOrder();
+				fnNaverPaymentOrder();
 			});
 			
 			return true;
 		}
 		
-		// 카카오페이 결제 정보 조회
-		var fnKakaoPaymentOrder = function() {
-			let url = '/order/kakao/payment/order';
+		// 네이버페이 결제 정보 조회
+		var fnNaverPaymentOrder = function() {
+			let url = '/order/naver/payment/order';
 			let data = {};
 			data.pgTid = $('#order_info input[name=pgTid]').val();
 			
 			let jsonData = JSON.stringify(data);
 			
 			gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-				console.log('====== kakaoPaymentOrder ======');
+				console.log('====== naverPaymentOrder ======');
 				console.log(result.kakaoPay);
 				console.log(' ');
-				fnCancelKakaoPayment();
+				fnCancelNaverPayment();
 			});
 			
 			return true;
 		}
-		// paymentId
-		// cancelReason
-		// allCanYn
-		// cnclRtnAmt
-		// cancelRequester
+
+		// 네이버페이 결제 취소
+		var fnCancelNaverPayment = function() {
+			let url = '/order/naver/payment/cancel';
+			let data = {};
+			data.pgTid = $('#order_info input[name=pgTid]').val();
+			data.cancelRequester = '1';
+			data.cancelReason = '고객변심';
+			data.cnclRtnAmt = 1000;
+			//data.allCanYn = 'Y';
+			
+			let jsonData = JSON.stringify(data);
+			
+			gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
+				console.log('====== naverPaymentCancel ======');
+				console.log(result.kakaoPay);
+				console.log(' ');
+				
+			});
+		}
 	</script>
 
 	<input type="button" id="kakaoBtn" value="카카오테스트버튼" style="width:200px; height:200px;"/>