네이버페이 임시 커밋

src/main/java/com/style24/front/biz/service/TsfOrderService.java

@@ -347,7 +347,7 @@ public class TsfOrderService {
 	public int updateOrderDisplayYn(Order order) { return orderDao.updateOrderDisplayYn(order); }
 
 	public Payment setPgDataInfo(Order order) {
-		Payment payment = new Payment();
+		Payment payment;
 		if(TscConstants.PgGb.KAKAO.value().equals(order.getPgGb())) {			// 카카오페이
 			KakaoPay kakaoPay = coreKakaoPayService.kakaoPaymentReady(order);
 			payment = coreKakaoPayService.setKakaoOrderData(kakaoPay, order);

src/main/java/com/style24/front/biz/web/TsfOrderController.java

@@ -791,7 +791,7 @@ public class TsfOrderController extends TsfBaseController {
 		order.setFrontGb(TsfSession.getFrontGb());
 		
 		// 2. 주문기본정보등록
-		coreOrderService.createPreOrder(order);
+		// coreOrderService.createPreOrder(order);
 		
 		
 
@@ -812,6 +812,7 @@ public class TsfOrderController extends TsfBaseController {
 		payAmt = 결제금액
 		======================
 		*/
+
 		Payment payment = orderService.setPgDataInfo(order);
 
 		mav.addObject("payment", payment);
@@ -823,36 +824,11 @@ public class TsfOrderController extends TsfBaseController {
 		//return super.getDeviceViewName("pg/kcpOrder");
 	}
 
-	/**
-	 * 카카오페이 결제준비 처리
-	 *
-	 * @param Order
-	 * @return KakaoPay
-	 * @author card007
-	 * @since 2021. 03. 03
-	 */
-	@RequestMapping(value = "/kakao/payment/ready")
-	@ResponseBody
-	public GagaMap kakaoPaymentReady(@RequestBody Order order) {
-		GagaMap result = new GagaMap();
-
-		if (TsfSession.getInfo().getCustNo() == null) {
-			order.setCustNo(0);
-		} else {
-			order.setCustNo(TsfSession.getInfo().getCustNo());
-		}
-
-		result.set("kakaoPay", kakaoPayService.kakaoPaymentReady(order));
-		result.set("status", GagaResponseStatus.SUCCESS.getCode());
-
-		return result;
-	}
-
 	/**
 	 * 카카오페이 결제 요청 처리
 	 *
-	 * @param Order
-	 * @return GagaMap
+	 * @param String
+	 * @return ModelAndView
 	 * @author card007
 	 * @since 2021. 03. 04
 	 */
@@ -869,7 +845,7 @@ public class TsfOrderController extends TsfBaseController {
 	}
 
 	/**
-	 * 카카오페이 결제 승인 처리
+	 * 카카오페이 결제 승인 처리 (삭제예졍)
 	 *
 	 * @param Order
 	 * @return GagaMap
@@ -888,26 +864,7 @@ public class TsfOrderController extends TsfBaseController {
 	}
 
 	/**
-	 * 카카오페이 결제 조회
-	 *
-	 * @param Order
-	 * @return GagaMap
-	 * @author card007
-	 * @since 2021. 03. 04
-	 */
-	@RequestMapping(value = "/kakao/payment/order")
-	@ResponseBody
-	public GagaMap kakaoPaymentOrder(@RequestBody Payment payment) {
-		GagaMap result = new GagaMap();
-
-		result.set("kakaoPay", kakaoPayService.getKakaoPaymentOrder(payment));
-		result.set("status", GagaResponseStatus.SUCCESS.getCode());
-
-		return result;
-	}
-
-	/**
-	 * 카카오페이 결제 취소
+	 * 카카오페이 결제 취소 (삭제예정)
 	 *
 	 * @param Order
 	 * @return GagaMap
@@ -928,8 +885,8 @@ public class TsfOrderController extends TsfBaseController {
 	/**
 	 * 네이버페이 결제 요청 처리
 	 *
-	 * @param Order
-	 * @return GagaMap
+	 * @param String
+	 * @return ModelAndView
 	 * @author card007
 	 * @since 2021. 03. 04
 	 */
@@ -946,32 +903,7 @@ public class TsfOrderController extends TsfBaseController {
 	}
 
 	/**
-	 * 네이버페이 결제준비 처리
-	 *
-	 * @param Order
-	 * @return NaverPay
-	 * @author card007
-	 * @since 2021. 03. 07
-	 */
-	@RequestMapping(value = "/naver/payment/ready")
-	@ResponseBody
-	public GagaMap naverPaymentReady(@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.naverPaymentReady(order));
-		result.set("status", GagaResponseStatus.SUCCESS.getCode());
-
-		return result;
-	}
-
-	/**
-	 * 네이버페이 결제 승인 처리
+	 * 네이버페이 결제 승인 처리 (삭제예졍)
 	 *
 	 * @param Order
 	 * @return GagaMap
@@ -990,26 +922,7 @@ public class TsfOrderController extends TsfBaseController {
 	}
 
 	/**
-	 * 네이버페이 결제 조회
-	 *
-	 * @param Order
-	 * @return GagaMap
-	 * @author card007
-	 * @since 2021. 03. 09
-	 */
-	@RequestMapping(value = "/naver/payment/order")
-	@ResponseBody
-	public GagaMap naverPaymentOrder(@RequestBody Payment payment) {
-		GagaMap result = new GagaMap();
-
-		result.set("naverPay", naverPayService.getNaverPaymentOrder(payment));
-		result.set("status", GagaResponseStatus.SUCCESS.getCode());
-
-		return result;
-	}
-
-	/**
-	 * 네이버페이 결제 취소
+	 * 네이버페이 결제 취소 (삭제예정)
 	 *
 	 * @param Order
 	 * @return GagaMap

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

@@ -69,42 +69,33 @@
 <!-- card007 -->
 	<script th:inline="javascript">
 		$(document).on("click", "#kakaoBtn", function() {
+			let data = {};
+			data.pgGb = "KAKAO";
+			data.ordNo = 1000;
+			data.goodsNm = '아이스타일24 테스트 상품';
+			data.payAmt = 30000;
+			data.ordGoodsQty = [[${goodsTotCnt}]];
+			
+			let jsonData = JSON.stringify(data);
 			$.ajax({
 				type: "POST",
 				url : '/order/create/preOrder',
 				dataType : 'html',
-				data : {
-					pgGb			: "KAKAO"
-					, custNo		: [[${sessionInfo.custNo}]]
-					, ordNo			: 1000
-					, goodsNm		: "상품 테스트"
-					, payAmt		: 30000
-					, ordGoodsQty	: [[${goodsTotCnt}]]
+				data : jsonData,
+				beforeSend : function(xhr, settings) {
+					xhr.setRequestHeader("AJAX"			, "true");
+					xhr.setRequestHeader('Accept'		, 'application/json');
+					xhr.setRequestHeader('Content-Type'	, 'application/json');
+					gagajf.showProgressbar(true);
 				},
 				error : function(e) {
-					console.log(e.responseText);
+					mcxDialog.alert(e.responseText);
 				},
 				success : function(result) {
 					$("#order_info").html(result);
 					fnKakaoPaymentReady();
 				}
 			});
-			//let url = '/order/create/preOrder';
-			//let data = {};
-			//data.pgGb = 'KAKAO';
-			//data.ordNo = 1000;
-			//data.custNo = [[${sessionInfo.custNo}]];
-			//data.goodsNm = '상품 테스트';
-			//data.ordGoodsQty = [[${goodsTotCnt}]];
-			//data.payAmt = 30000;
-			//
-			//let jsonData = JSON.stringify(data);
-			//
-			//gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-			//	$("#order_info").html(result);
-			//	console.log(result);
-			//	fnKakaoPaymentReady();
-			//});
 		});
 
 		// 카카오페이 결제준비 처리
@@ -136,63 +127,55 @@
 				console.log('====== kakaoPaymentRequest ======');
 				console.log(result.payment);
 				console.log(' ');
-				fnKakaoPaymentOrder();
-			});
-
-			return true;
-		}
-
-		// 카카오페이 결제 정보 조회 (테스트용 호출)
-		var fnKakaoPaymentOrder = function() {
-			let url = '/order/kakao/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(result.kakaoPay);
-				console.log(' ');
-				fnCancelKakaoPayment();
+				
+				let tag = '<input type="button" id="buyBtn" value="KCP테스트버튼" style="width:200px; height:70px; background-color: #fd4801; color: white; border: unset;"/>\n';
+				tag += '<input type="button" id="kakaoCancelBtn" value="카카오취소테스트버튼" style="width:200px; height:70px; background-color: #fffa00; color: black; border: unset;"/>\n';
+				tag += '<input type="button" id="naverBtn" value="네이버테스트버튼" style="width:200px; height:70px; background-color: lawngreen; color: black; border: unset;"/>';
+				$('#kakaoBtn').parent().html(tag);
 			});
 
 			return true;
 		}
 
 		// 카카오페이 결제 취소 (테스트용 호출)
-		var fnCancelKakaoPayment = function() {
+		$(document).on("click", "#kakaoCancelBtn", function() {
 			let url = '/order/kakao/payment/cancel';
 			let data = {};
 			data.pgTid = $('#order_info input[name=pgTid]').val();
-			data.payAmt = 1000;
-
+			data.payAmt = 30000;
+			
 			let jsonData = JSON.stringify(data);
-
+			
 			gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
 				console.log('====== kakaoPaymentCancel ======');
 				console.log(result.kakaoPay);
 				console.log(' ');
-
+				
 			});
-		}
-
+		});
 	</script>
 
 	<!-- =========== 네이버페이 ============= -->
 	<script th:inline="javascript">
 		$(document).on("click", "#naverBtn", function() {
+			let data = {};
+			data.pgGb = "NAVER";
+			data.ordNo = 1000;
+			data.goodsNm = '아이스타일24 테스트 상품';
+			data.payAmt = 1000;
+			data.ordGoodsQty = [[${goodsTotCnt}]];
+			
+			let jsonData = JSON.stringify(data);
 			$.ajax({
 				type: "POST",
 				url : '/order/create/preOrder',
 				dataType : 'html',
-				data : {
-					pgGb			: "NAVER"
-					, custNo		: [[${sessionInfo.custNo}]]
-					, ordNo			: 1000
-					, goodsNm		: "상품 테스트"
-					, payAmt		: 1000
-					, ordGoodsQty	: [[${goodsTotCnt}]]
+				data : jsonData,
+				beforeSend : function(xhr, settings) {
+					xhr.setRequestHeader("AJAX"			, "true");
+					xhr.setRequestHeader('Accept'		, 'application/json');
+					xhr.setRequestHeader('Content-Type'	, 'application/json');
+					gagajf.showProgressbar(true);
 				},
 				error : function(e) {
 					mcxDialog.alert(e.responseText);
@@ -202,21 +185,6 @@
 					fnNaverPaymentReady();
 				}
 			});
-			//let url = '/order/create/preOrder';
-			//let data = {};
-			//data.pgGb = 'NAVER';
-			//data.ordNo = 1000;
-			//data.custNo = [[${sessionInfo.custNo}]];
-			//data.goodsNm = "상품 테스트";
-			//data.ordGoodsQty = [[${goodsTotCnt}]];
-			//data.payAmt = 30000;
-			//
-			//let jsonData = JSON.stringify(data);
-			//
-			//gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-			//	$("#order_info").html(result);
-			//	fnNaverPaymentReady();
-			//});
 		});
 		
 		// 네이버페이 결제준비 처리
@@ -224,7 +192,6 @@
 			let naverPayUrl = 'https://' + [[${@environment.getProperty('naverPay.payUrl.web')}]];
 			let reserveId = $('#order_info input[name=reserveId]').val();
 			let url = naverPayUrl + '/payments/' + reserveId;
-			console.log(url);
 			let option = 'width=750, height=' + $(window).height();
 			
 			window.open(url, 'naverPaymentPopup', option);
@@ -250,33 +217,20 @@
 			gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
 				console.log('====== naverPaymentRequest ======');
 				console.log(result.payment);
+				mcxDialog.alert('네이버페이 결제가 완료 되었습니다.<br />'+result.payment);
 				console.log(' ');
-				fnNaverPaymentOrder();
+				
+				let tag = '<input type="button" id="buyBtn" value="KCP테스트버튼" style="width:200px; height:70px; background-color: #fd4801; color: white; border: unset;"/>\n';
+				tag += '<input type="button" id="kakaoBtn" value="카카오테스트버튼" style="width:200px; height:70px; background-color: #fffa00; color: black; border: unset;"/>\n';
+				tag += '<input type="button" id="naverCancelBtn" value="네이버취소테스트버튼" style="width:200px; height:70px; background-color: lawngreen; color: black; border: unset;"/>';
+				$('#kakaoBtn').parent().html(tag);
 			});
 
 			return true;
 		}
-		
-		// 네이버페이 결제 정보 조회 (테스트용 호출)
-		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('====== naverPaymentOrder ======');
-				console.log(result.naverPay);
-				console.log(' ');
-				fnCancelNaverPayment();
-			});
-			
-			return true;
-		}
 
 		// 네이버페이 결제 취소 (테스트용 호출)
-		var fnCancelNaverPayment = function() {
+		$(document).on("click", "#naverCancelBtn", function() {
 			let url = '/order/naver/payment/cancel';
 			let data = {};
 			data.pgTid = $('#order_info input[name=pgTid]').val();
@@ -286,16 +240,16 @@
 			data.paySq = 1234;
 			data.custNo = [[${sessionInfo.custNo}]];
 			data.updNo = [[${sessionInfo.custNo}]];
-
+			
 			let jsonData = JSON.stringify(data);
-
+			
 			gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
 				console.log('====== naverPaymentCancel ======');
 				console.log(result.naverPay);
+				mcxDialog.alert('네이버페이 결제취소가 완료 되었습니다.<br />'+result.naverPay);
 				console.log(' ');
 			});
-		}
-
+		});
 	</script>
 <!-- // card007 -->