이태영 - 20210520 KCP 모바일 테스트 중

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

@@ -354,14 +354,6 @@ public class TsfOrderService {
 					result.setOrdNo(Integer.parseInt(request.getParameter("ordr_idxx")));
 					result.setPayMeans(param.getPayMeans());
 				} else {
-					if(TscConstants.FrontGb.MOB.value().equals(TsfSession.getFrontGb()) && StringUtils.isNotEmpty(request.getParameter("param_opt_3"))) {
-						param.setPgOrdNo(request.getParameter("ordr_idxx"));
-						param.setOrdNo(Integer.parseInt(request.getParameter("param_opt_3")));
-					} else if(TscConstants.FrontGb.PC.value().equals(TsfSession.getFrontGb())) {
-						param.setPgOrdNo(request.getParameter("ordr_idxx"));
-						param.setOrdNo(param.getOrgOrdNo());
-					}
-
 					// 일반 KCP 결제
 					result = coreKcpService.kcpPayRequest(param, request, response);
 				}
@@ -391,11 +383,8 @@ public class TsfOrderService {
 				result.setPayGb(param.getPayGb());
 			}
 
-			result.setPaySq(param.getPaySq());
-			result.setOrdChgSq(param.getOrdChgSq());
-
 			// TB_PAYMENT 등록. 실패시 PG 환불.
-			if(coreOrderDao.insertPayment(result) < 1) {
+			if(coreOrderDao.updatePaymentOrderComplete(result) < 1) {
 				if(TscConstants.PgGb.KCP.value().equals(param.getPgGb()) || TscConstants.PgGb.PAYCO.value().equals(param.getPgGb())) {
 					if(TscConstants.PayMeans.GIFTCARD.value().equals(param.getPayMeans())) {
 						// 상품권 100% 결제 (PG PASS)
@@ -496,17 +485,28 @@ public class TsfOrderService {
 		// TB_PAYMENT 우선 입력
 		Payment prePay = new Payment();
 		prePay.setOrdNo(order.getOrdNo());
-		prePay.setPgGb(order.getPgGb());
 		prePay.setPayMeans(order.getPayMeans());
 		prePay.setPayAmt(order.getPayAmt());
-		prePay.setPayGb(order.getPayGb());
-
+		prePay.setPayStat(TscConstants.PaymentStat.PAYMENT_WAIT.value());
+		prePay.setPgGb(order.getPgGb());
+		prePay.setCustNo(order.getCustNo());
+		prePay.setRegNo(order.getCustNo());
+		prePay.setUpdNo(order.getCustNo());
 
 		// 상품권 100% 결제일 경우 PgGb STYLE24로 변경
-		if(TscConstants.PayMeans.CREDIT_CARD.value().equals(order.getPayMeans())) {prePay.setPgGb(TscConstants.PgGb.ISTYLE.value());}
+		if(TscConstants.PayMeans.GIFTCARD.value().equals(order.getPayMeans())) {prePay.setPgGb(TscConstants.PgGb.ISTYLE.value());}
+
+		// 주문데이터인지, 추가배송비 결제 데이터인지 확인
+		if(order.getOrdChgSq() != null && order.getOrdChgSq() > 0) {
+			prePay.setPayGb("D");
+			prePay.setOrdChgSq(order.getOrdChgSq());
+		} else {
+			prePay.setPayGb("O");
+		}
 
-		// TODO TB_PAYMENT INSERT
+		coreOrderDao.insertPayment(prePay);
 
+		// PG 송부 데이터 세팅
 		Payment payment;
 		order.setFrontGb(TsfSession.getFrontGb());
 		if(TscConstants.PgGb.KAKAO.value().equals(order.getPgGb())) {			// 카카오페이

src/main/webapp/WEB-INF/views/mob/order/OrderFormMob.html

@@ -1257,10 +1257,9 @@ var paymentInfoSet = function() {
 							xhr.setRequestHeader('Content-Type'	, 'application/json');
 						},
 						success 	: function(result) {
-							
 							// 결재정보로드
 							$("#order_info").html(result);
-							$("#order_info input[name=Ret_URL]").val("http:" + _frontUrl + "/order/pay/result/response");
+							$("#order_info input[name=Ret_URL]").val(_frontUrl + "/order/pay/result/response");
 							
 							var pgGb = $("#order_info input[name=pgGb]").val();
 

src/main/webapp/ux/plugins/approval_key.js

@@ -35,17 +35,17 @@
         // 제공되는 jar 파일에 직접 전달된 데이터를 사용할수 있도록 method가 구현 되어 있습니다.
         if(ajax_flag)
         {
-            var url    = "http:" + _frontUrl + "/pg/kcp/approval";
+            var url    = _frontUrl + "/pg/kcp/approval";
             var form = document.order_info;
-            var params = "?site_cd=" + form.site_cd.value
-                       + "&ordr_idxx=" + form.ordr_idxx.value
-                       + "&good_mny=" + form.good_mny.value
-                       + "&pay_method=" + form.pay_method.value
-                       + "&escw_used=" + form.escw_used.value
-                       + "&good_name=" + form.good_name.value
-                       + "&response_type=" + form.response_type.value
-                       + "&Ret_URL=" + form.Ret_URL.value
-            sendRequest( url + params );
+            var params = "?site_cd=" + encodeURIComponent(form.site_cd.value)
+                       + "&ordr_idxx=" + encodeURIComponent(form.ordr_idxx.value)
+                       + "&good_mny=" + encodeURIComponent(form.good_mny.value)
+                       + "&pay_method=" + encodeURIComponent(form.pay_method.value)
+                       + "&escw_used=" + encodeURIComponent(form.escw_used.value)
+                       + "&good_name=" + encodeURIComponent(form.good_name.value)
+                       + "&response_type=" + encodeURIComponent(form.response_type.value)
+                       + "&Ret_URL=" + encodeURIComponent(form.Ret_URL.value)
+            sendRequest(url + params);
             
             ajax_flag = false;
         }