jsh77b 5 лет назад
Родитель
Сommit
15376695e5

+ 10 - 0
src/main/java/com/style24/front/biz/dao/TsfOrderDao.java

@@ -98,4 +98,14 @@ public interface TsfOrderDao {
 	 */
 	int getCustFirstOrderCount(Coupon coupon);
 	
+	/**
+	 * 회원보유쿠폰체크
+	 * 
+	 * @param order
+	 * @return int
+	 * @author jsh77b
+	 * @since 2021.03.12
+	 */
+	int getCheckCustCpnSq(Order order);
+	
 }

+ 124 - 2
src/main/java/com/style24/front/biz/service/TsfOrderService.java

@@ -24,6 +24,7 @@ import com.style24.core.biz.service.TscNaverPayService;
 import com.style24.core.support.env.TscConstants;
 import com.style24.front.biz.dao.TsfOrderDao;
 import com.style24.persistence.domain.Coupon;
+import com.style24.persistence.domain.GoodsStock;
 import com.style24.persistence.domain.KakaoPay;
 import com.style24.persistence.domain.NaverPay;
 import com.style24.persistence.domain.Order;
@@ -31,8 +32,6 @@ import com.style24.persistence.domain.Payment;
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.web.parameter.GagaMap;
-
 /**
  * 주문 Service
  *
@@ -57,6 +56,9 @@ public class TsfOrderService {
 	
 	@Autowired
 	private TscNaverPayService coreNaverPayService;
+	
+	@Autowired
+	private TsfGoodsService goodsService;
 
 	/**
 	 * 마이페이지 검색 기간 영역 설정
@@ -381,4 +383,124 @@ public class TsfOrderService {
 	 */
 	public int getCustFirstOrderCount(Coupon coupon) { return orderDao.getCustFirstOrderCount(coupon); }
 	
+	
+	
+	/**
+	 * 주문정보유효성체크
+	 * @param Order
+	 * @return Order
+	 * @author jsh77b
+	 * @since 2021. 03. 09
+	 */
+	public void orderValidationCheck(Order order) {
+		// 1. 주문상세체크
+		Collection<Order> orderDetailList = order.getOrderDetailList();
+		
+		String goodsCd		= "";
+		String goodsType	= "";
+		String itemCd 		= "";
+		String optCd 		= "";
+		int goodsQty		= 0;
+		int custCpnSq		= 0;
+		int usPntAmt		= 0;
+		int usGfcdAmt		= 0;
+		
+		for (Order orderDetail : orderDetailList) {
+			
+			// 2.1 상품 재고 확인
+			GoodsStock checkParam = new GoodsStock();
+			
+			for (int i=0 ; i<orderDetail.getItemCdArr().length ; i++) {
+				goodsCd 	= orderDetail.getGoodsCd();
+				goodsType	= orderDetail.getGoodsType();
+				itemCd 		= orderDetail.getItemCdArr()[i];
+				optCd 		= orderDetail.getOptCdArr()[i];
+				goodsQty	= orderDetail.getGoodsQty();
+								
+				checkParam.setGoodsCd(goodsCd);
+				checkParam.setItemCd(itemCd);
+				checkParam.setOptCd(optCd); 
+				checkParam.setGoodsQty(goodsQty);
+				checkParam.setGoodsType(goodsType);
+				String stockResult = goodsService.getCheckStock(checkParam);
+				
+				if (!"SUCCESS".equals(stockResult)) {
+					throw new IllegalArgumentException(stockResult);
+				}
+			}
+			
+			// 2.2 보유 상품쿠폰체크
+			custCpnSq = orderDetail.getGoodsCpnSq();
+			if (custCpnSq > 0) {
+				orderDetail.setCustCpnSq(custCpnSq);
+				orderDetail.setCustNo(order.getCustNo());
+				if (orderDao.getCheckCustCpnSq(orderDetail) < 1) {
+					throw new IllegalArgumentException("보유하신 상품쿠폰이 존재하지 않습니다.");
+				}
+			}
+			
+			// 2.3 보유 장바구니쿠폰체크
+			custCpnSq = orderDetail.getCartCpnSq();
+			if (custCpnSq > 0) {
+				orderDetail.setCustCpnSq(custCpnSq);
+				orderDetail.setCustNo(order.getCustNo());
+				if (orderDao.getCheckCustCpnSq(orderDetail) < 1) {
+					throw new IllegalArgumentException("보유하신 장바구니쿠폰이 존재하지 않습니다.");
+				}
+			}
+			
+			// 2.4 사용포인트금액등록(구매사용포인트)
+			usPntAmt = usPntAmt + orderDetail.getPntDcAmt();
+			
+			// 2.5 상품권사용금액등록
+			usGfcdAmt = usGfcdAmt + orderDetail.getGfcdUseAmt();
+		}
+		
+		// 2.6 사용포인트금액등록(사은품사용포인트)
+		int usePoint = 0;
+		if (order.getFreegiftUsePointArr().length > 0) {
+			for (int i=0 ; i<order.getFreegiftUsePointArr().length ; i++) {
+				usePoint = Integer.parseInt(order.getFreegiftUsePointArr()[i]);
+				if (usePoint > 0) {
+					usPntAmt = usPntAmt + usePoint;
+				}
+			}
+		}
+		
+		// 3. 보유포인트금액 > 포인트사용금액 체크
+		int rmPntAmt = coreOrderDao.getCustPointInfo(order);
+		if (rmPntAmt < usPntAmt) {
+			throw new IllegalArgumentException("보유하신 포인트 금액이 부족합니다.");
+		}
+		
+		// 4. 보유상품권금액 > 상품권사용금액 체크
+		int rmGfcdAmt = coreOrderDao.getGiftcardInfo(order);
+		if (rmGfcdAmt < usGfcdAmt) {
+			throw new IllegalArgumentException("보유하신 상품권 금액이 부족합니다.");
+		}
+		
+		// 5. 장바구니 보유쿠폰 체크 (배송목록체크)
+		Collection<Order> delvFeeCdList = order.getDelvFeeCdList();
+		for (Order delvFeeCd : delvFeeCdList) {
+			if (delvFeeCd.getDelvCpnSq() > 0) {
+				custCpnSq = delvFeeCd.getDelvCpnSq();
+				if (custCpnSq > 0) {
+					delvFeeCd.setCustCpnSq(custCpnSq);
+					delvFeeCd.setCustNo(order.getCustNo());
+					if (orderDao.getCheckCustCpnSq(delvFeeCd) < 1) {
+						throw new IllegalArgumentException("보유하신 배송비쿠폰이 존재하지 않습니다.");
+					}
+				}
+			}
+		}
+		
+
+		// TODO 5. 사은품채고체크
+		
+	}
+	
+	
+	
+	
+	
 }

+ 11 - 24
src/main/java/com/style24/front/biz/web/TsfOrderController.java

@@ -58,12 +58,6 @@ public class TsfOrderController extends TsfBaseController {
 	@Autowired
 	private TsfCartService cartService;
 
-	@Autowired
-	private TscKakaoPayService kakaoPayService;
-
-	@Autowired
-	private TscNaverPayService naverPayService;
-
 	@Autowired
 	private Environment env;
 	
@@ -493,14 +487,10 @@ public class TsfOrderController extends TsfBaseController {
 		order.setFrontGb(TsfSession.getFrontGb());
 		
 		// TODO
-		// 2. 주문정보 유효성체크 (
-		// 2.1 보유쿠폰체크
-		// 2.2 보유포인트체크
-		// 2.3 상품재고체크
-		// 2.4 보유상품권체크
-		// 2.5 사은품채고체크
-		
-		// 3. 주문기본정보등록
+		// 2. 주문정보유효성체크
+		orderService.orderValidationCheck(order);
+		
+		// 3. 주문기본정보등록(주문접수)
 		coreOrderService.createPreOrder(order);
 		
 		log.info("order.getPgGb()              ::: {}", order.getPgGb());
@@ -515,6 +505,7 @@ public class TsfOrderController extends TsfBaseController {
 		log.info("order.getFreegiftValArr()    ::: {}", order.getFreegiftValArr());
 		log.info("order.getFreegiftValArr()    ::: {}", order.getFreegiftValArr());
 		log.info("order.getFreegiftSqArr()     ::: {}", order.getFreegiftSqArr());
+		
 		for(int i = 0 ; i < order.getFreegiftGoodsArr().length ; i++) {
 			log.info("order.getFreegiftGoodsArr()  ::: {}", order.getFreegiftGoodsArr()[i]);
 		}
@@ -536,15 +527,11 @@ public class TsfOrderController extends TsfBaseController {
 		*/
 
 		Payment payment = orderService.setPgDataInfo(order);
-
-		mav.addObject("payment", payment);
-		mav.addObject("orderDetailList", order.getOrderDetailList());
-		//model.addAttribute("payment", payment);
-
+		mav.addObject("payment"				, payment);
+		mav.addObject("orderDetailList"		, order.getOrderDetailList());
 		mav.setViewName(super.getDeviceViewName("pg/kcpOrder"));
 
 		return mav;
-		//return super.getDeviceViewName("pg/kcpOrder");
 	}
 	
 	/**
@@ -579,6 +566,8 @@ public class TsfOrderController extends TsfBaseController {
 		
 		order.setOrdNo(param.getOrdNo());
 		order.setSellGb("10");
+		order.setPgGb(param.getPgGb());
+		order.setPayMeans(param.getPayMeans());
 		
 		// TODO 3. 주문정보 업데이트
 		coreOrderService.updateOrderInfo(order);
@@ -613,10 +602,8 @@ public class TsfOrderController extends TsfBaseController {
 		log.info("order.getOrdNo() ::: {}", order.getOrdNo());
 		
 		// TODO 주문정보조회
-
-		//mav.addObject("payment", order);
-
-		mav.setViewName(super.getDeviceViewName("pg/kcpOrder"));
+		mav.addObject("payment", order);
+		mav.setViewName(super.getDeviceViewName("order/OrderComplete"));
 		return mav;
 	}
 

+ 13 - 1
src/main/java/com/style24/front/biz/web/TsfPgController.java

@@ -5,12 +5,14 @@ import java.io.PrintWriter;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.style24.core.biz.service.TscOrderService;
+import com.style24.persistence.domain.Order;
 import com.style24.persistence.domain.Payment;
 
 import lombok.extern.slf4j.Slf4j;
@@ -19,6 +21,9 @@ import lombok.extern.slf4j.Slf4j;
 @RequestMapping("/pg")
 @Slf4j
 public class TsfPgController {
+	
+	@Autowired
+	private TscOrderService coreOrderService;
 
 	/**
 	 * 주문페이지
@@ -48,6 +53,13 @@ public class TsfPgController {
 			log.info("CHECK op_cd		::::: {}", request.getParameter("op_cd")		);	// 13이 오면 입금이 잘못된 경우로 취소 노티가 온다고함. 13이 아닌 경우에만 진행해야할듯함.
 			log.info("CHECK cash_a_no	::::: {}", request.getParameter("cash_a_no")	);	// 현금영수증 승인번호
 			log.info("CHECK cash_no		::::: {}", request.getParameter("cash_no")	);	// 현금영수증 거래번호
+			
+			// TODO 2021.03.15 jsh77b 무통장입금 결제완료 처리
+			Order order = new Order();
+			order.setOrdNo(Integer.parseInt(request.getParameter("order_no")));
+			order.setCustNo(0);
+			coreOrderService.updateOrderInfoVBank(order);
+			
 		} catch(Exception e) {
 			result = "9999";		// 실패. return 하지 말것.
 		}

+ 12 - 1
src/main/java/com/style24/persistence/mybatis/shop/TsfOrder.xml

@@ -352,11 +352,22 @@
 	
 	<!-- 고객 특정기간 구매 건수 -->
 	<select id="getCustFirstOrderCount" parameterType="Coupon" resultType="int">
-		/* TscOrder.getCustFirstOrderCount */
+		/* TsfOrder.getCustFirstOrderCount */
 		SELECT COUNT(*) 
 		FROM TB_ORDER
 		WHERE CUST_NO = #{custNo}
 		AND ORD_DT BETWEEN CONCAT(#{buyStdt}, '000000') and CONCAT(#{buyEddt}, '235959')
 	</select>
 	
+	<!-- 보유쿠폰체크 -->
+	<select id="getCheckCustCpnSq" parameterType="Order" resultType="int">
+		/* TsfOrder.getCustCpnSqCheck */
+		SELECT COUNT(1)
+		FROM   TB_CUST_COUPON
+		WHERE  1=1
+		AND    CUST_CPN_SQ = #{custCpnSq}
+		AND    CUST_NO = #{custNo}
+		AND    USED_DT IS NULL
+	</select>
+	
 </mapper>

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

@@ -34,7 +34,7 @@
 <form id="payForm" name="payForm">
 
 	<!-- 주문고객정보 -->
-	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none;" name="orderInfo">
+	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none;" name="orderInfo" id="orderInfo">
 		<tbody>
 			<tr style="height:30px;">
 				<th>custNm</th>
@@ -78,10 +78,17 @@
 	</table>
 
 	<!-- 주문상세금액 -->
-	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none;" name="orderDetailInfo">
+	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none;" name="orderDetailInfo" id="orderDetailInfo">
 		<tr style="height:30px;">
 			<th>cartSq</th>
 			<th style="display:none">goodsNm</th>
+			<th>goodsCd</th>
+			<th>goodsType</th>
+			<th>itemCd</th>
+			<th>optCd</th>
+			<th style="display:none">optCd1</th>
+			<th style="display:none">optCd2</th>
+			<th style="display:none">itemQtyr</th>
 			<th>orgCurrPrice</th>
 			<th>cpn1DcSq</th>
 			<th>cpn1DcAmt</th>
@@ -113,6 +120,13 @@
 					<tr style="height:30px;">
 						<td class="cartSq" 			th:text="${goods.cartSq}"></td>
 						<td class="goodsNm" 		th:text="${goods.goodsNm}" style="display:none"></td>
+						<td class="goodsCd"			th:text="${goods.goodsCd}"></td>
+						<td class="goodsType"		th:text="${goods.goodsType}"></td>
+						<td class="itemCd"			th:text="${goods.itemCd}"></td>
+						<td class="optCd"			th:text="${goods.optCd}"></td>
+						<td class="optCd1"			th:text="${goods.optCd1}" style="display:none"></td>
+						<td class="optCd2"			th:text="${goods.optCd2}" style="display:none"></td>
+						<td class="itemQtyr"		th:text="${goods.itemQtyr}" style="display:none"></td>
 						<td class="orgCurrPrice" 	th:text="${goods.orgCurrPrice}"></td>
 						<td class="cpn1CpnSq" 		th:text="${goods.cpn1CpnSq}"></td>
 						<td class="cpn1DcAmt" 		th:text="${goods.orgCurrPrice} - ${goods.currPrice}"></td>
@@ -156,7 +170,7 @@
 	</table>
 
 	<!-- 배송단위목록 -->
-	<table border="1" style="font-size:10px; text-align:center;  margin-top:20px; display:none;" name="delvFeeCdInfo">
+	<table border="1" style="font-size:10px; text-align:center;  margin-top:20px; display:none;" name="delvFeeCdInfo" id="delvFeeCdInfo">
 		<tr style="height:30px;">
 			<th>supplyCompCd</th>
 			<th>delvFeeCd</th>
@@ -176,7 +190,7 @@
 	</table>
 
 	<!-- 주문금액합계 -->
-	<table border="1" style="font-size:10px; text-align:center;  margin-top:20px; display:none;" name="orderSumAmtInfo">
+	<table border="1" style="font-size:10px; text-align:center;  margin-top:20px; display:none;" name="orderSumAmtInfo" id="orderSumAmtInfo">
 		<tr style="height:30px;">
 			<th>orgGoodsSumAmt</th>
 			<th>delvSumAmt</th>
@@ -421,6 +435,8 @@ var cpnApplyTemp		= false;
 var jsonObj 			= {};
 var jsonData			= null;
 
+var pgGb				= "";  
+
 // 컨텐츠 호출
 $(document).ready( function() {
 	
@@ -448,7 +464,7 @@ $(document).ready( function() {
 	custemerInfoSet(jsonData);
 	
 	// 999. 개발화면정보설정
-	var devTemp = true;
+	var devTemp = false;
 	var arr = []
 	arr[0] = "orderInfo";
 	arr[1] = "freegiftInfo";
@@ -489,9 +505,9 @@ var custemerInfoSet = function(jsonData) {
 				$("#custemerInfo").html(result);
 
 				// 고객정보설정
-				$(".custNm").text($("input[name='custNm'").val());
-				$(".email").text($("input[name='email'").val());
-				$(".cellPhnno").text($("input[name='cellPhnno'").val());
+				$(".custNm").text($("input[name='custNm']").val());
+				$(".email").text($("input[name='email']").val());
+				$(".cellPhnno").text($("input[name='cellPhnno']").val());
 			}
 			// 1.2 배송정보로드
 			deliveryAddrInfoSet(jsonData);
@@ -518,12 +534,12 @@ var deliveryAddrInfoSet = function(jsonData) {
 				$("#deliveryAddrInfo").html(result);
 				
 				// 배송정보설정
-				$(".recipZipcode").text($("input[name='recipZipcode'").val());
-				$(".recipBaseAddr").text($("input[name='recipBaseAddr'").val());
-				$(".recipDtlAddr").text($("input[name='recipDtlAddr'").val());
-				$(".delvMemo").text($("input[name='delvMemo'").val());
-				$(".foreignBuyYn").text($("input[name='foreignBuyYn'").val());
-				$(".orderMadeYn").text($("input[name='orderMadeYn'").val());
+				$(".recipZipcode").text($("input[name='recipZipcode']").val());
+				$(".recipBaseAddr").text($("input[name='recipBaseAddr']").val());
+				$(".recipDtlAddr").text($("input[name='recipDtlAddr']").val());
+				$(".delvMemo").text($("input[name='delvMemo']").val());
+				$(".foreignBuyYn").text($("input[name='foreignBuyYn']").val());
+				$(".orderMadeYn").text($("input[name='orderMadeYn']").val());
 			}
 			
 			// 1.3 총알배송가능 지역, 총알배송 가능 시간 체크(초기로드정보)
@@ -701,13 +717,23 @@ var paymentInfoSet = function(jsonData) {
 					// 사은품정보
 					var freegiftValArr 		= $(".freegiftValArr").text().split(",");
 					var prePntDcAmtYn		= $("input[name='rdi-beforpoint']:checked").val();
+					var paynormal			= $("input[name='rdi-paynormal']:checked").val();
 					var orderDetailList		= [];
 					var delvFeeCdList		= [];
 					var ordGoodsQty			= 0;
 					var goodsNm				= "";
+					
+					if (paynormal == null || paynormal == '') {
+						alert("결제수단을 선택해 주세요.");
+						return false;
+					}
+					
+					var paynormalArr		= paynormal.split("|");
+					var pgGb				= paynormalArr[0];
+					var payMeans			= paynormalArr[1];
 
 					// 주문상세데이타 생성
-					$(".cartSq").each(function(){
+					$("#orderDetailInfo .cartSq").each(function(){
 						var orderDetailData = {
 							"cartSq"			: $(this).text()
 							,"currPrice"		: $(this).parent().find(".orgCurrPrice").text()
@@ -733,6 +759,11 @@ var paymentInfoSet = function(jsonData) {
 							,"foreignBuyYn"		: $(this).parent().find(".foreignYn").text()
 							,"makeGoodsYn"		: $(this).parent().find(".orderMadeYn").text()
 							,"delvFeeCd"		: $(this).parent().find(".delvFeeCd").text()
+							,"goodsCd"			: $(this).parent().find(".goodsCd").text()
+							,"itemCdArr"		: $(this).parent().find(".itemCd").text().split(",")
+							,"optCdArr"			: $(this).parent().find(".optCd").text().split(",")
+							,"itemQtyArr"		: $(this).parent().find(".itemQtyr").text().split(",")
+							,"goodsType"		: $(this).parent().find(".goodsType").text()
 						}
 						
 						// 상품수
@@ -742,7 +773,7 @@ var paymentInfoSet = function(jsonData) {
 					});
 					
 					// 주문배송업체정보 생성
-					$(".delvFeeCd").each(function(){
+					$("#delvFeeCdInfo .delvFeeCd").each(function(){
 						var delvFeeCdData = {
 							"delvFeeCd"			: $(this).text()
 							,"supplyCompCd"		: $(this).parent().find(".supplyCompCd").text()
@@ -769,8 +800,8 @@ var paymentInfoSet = function(jsonData) {
 						,"delvFeeCdList"		: delvFeeCdList
 						,"shotDelvYn"			: shotDelvYn
 						,"entryNo"				: $("input[name='entryNo']").val()
-						,"pgGb"					: "KCP"
-						,"payMeans"				: "G014_30"
+						,"pgGb"					: pgGb
+						,"payMeans"				: payMeans // 네이버페이, 카카오페이
 						,"payAmt"				: $(".realOrdSumAmt").text()
 						,"ordNm"				: $(".custNm").text()
 						,"ordPhnno"				: $(".cellPhnno").text()
@@ -779,6 +810,7 @@ var paymentInfoSet = function(jsonData) {
 						,"freegiftValArr"		: $(".freegiftValArr").text().split(",")
 						,"freegiftSqArr"		: $(".freegiftSqArr").text().split(",")
 						,"freegiftGoodsArr"		: $(".freegiftGoodsArr").text().split(",")
+						,"freegiftUsePointArr"	: $(".freegiftUsePointArr").text().split(",")
 					};
 					
 					var orderData = JSON.stringify(orderData);
@@ -797,9 +829,16 @@ var paymentInfoSet = function(jsonData) {
 						success 	: function(result) {
 							// 결재정보로드
 							$("#order_info").html(result);
-							jsf__pay(document.order_info);
-							//fnKakaoPaymentReady();
-							//fnNaverPaymentReady();
+							
+							var pgGb = $("#order_info input[name=pgGb]").val();
+							
+							if (pgGb == "NAVFER") {
+								fnNaverPaymentReady();
+							} else if (pgGb == "KAKAO") {
+								fnKakaoPaymentReady();
+							} else if (pgGb == "KCP") {
+								jsf__pay(document.order_info);
+							}
 						}
 					});
 				});

+ 10 - 7
src/main/webapp/WEB-INF/views/web/order/OrderPaymentInfoWeb.html

@@ -144,23 +144,23 @@
 				<div class="paymethod_box" style="display: none;">
 					<ul class="sel_method">
 						<li>
-							<input type="radio" name="rdi-paynormal" id="rdi-paynormal1" value=""> 
+							<input type="radio" name="rdi-paynormal" id="rdi-paynormal1" value="KCP|G014_30"> 
 							<label for="rdi-paynormal1"><span>신용카드</span></label>
 						</li>
 						<li>
-							<input type="radio" name="rdi-paynormal" id="rdi-paynormal2" value=""> 
+							<input type="radio" name="rdi-paynormal" id="rdi-paynormal2" value="KCP|G014_10"> 
 							<label for="rdi-paynormal2"><span>실시간계좌이체</span></label>
 						</li>
 						<li>
-							<input type="radio" name="rdi-paynormal" id="rdi-paynormal3" value=""> 
+							<input type="radio" name="rdi-paynormal" id="rdi-paynormal3" value="KCP|G014_20"> 
 							<label for="rdi-paynormal3"><span>무통장입금</span></label>
 						</li>
 						<li>
-							<input type="radio" name="rdi-paynormal" id="rdi-paynormal4" value=""> 
+							<input type="radio" name="rdi-paynormal" id="rdi-paynormal4" value="KCP|G014_60"> 
 							<label for="rdi-paynormal4"><span>휴대폰 결제</span></label>
 						</li>
 						<li>
-							<input type="radio" name="rdi-paynormal" id="rdi-paynormal5" value=""> 
+							<input type="radio" name="rdi-paynormal" id="rdi-paynormal5" value="KAKAO|G014_99"> 
 							<label for="rdi-paynormal5">
 								<span>
 									<em class="sr-only">카카오페이 결제</em>
@@ -169,7 +169,7 @@
 							</label>
 						</li>
 						<li>
-							<input type="radio" name="rdi-paynormal" id="rdi-paynormal6" value=""> 
+							<input type="radio" name="rdi-paynormal" id="rdi-paynormal6" value="NAVER|G014_99"> 
 							<label for="rdi-paynormal6">
 								<span>
 									<em class="sr-only">네이버페이 결제</em>
@@ -178,7 +178,7 @@
 							</label>
 						</li>
 						<li>
-							<input type="radio" name="rdi-paynormal" id="rdi-paynormal7" value=""> 
+							<input type="radio" name="rdi-paynormal" id="rdi-paynormal7" value="PAYCO|G014_30"> 
 							<label for="rdi-paynormal7">
 								<span>
 									<em class="sr-only">페이코 결제</em>
@@ -276,6 +276,9 @@ $(document).ready( function() {
 	if (dispYn == "Y") {
 		$("#paymentInfo .fold_head").addClass("on");
 		$("#paymentInfo .fold_cont").css("display", "block");
+		$("#rdi-paymethod-normal").attr("checked", "checked");
+		$(".radio_blk").eq(1).addClass("on");
+		$(".radio_blk").eq(1).find(".paymethod_box").show();
 	}
 });
 </script>