jsh77b 5 anni fa
parent
commit
13186177ab

+ 22 - 6
src/main/java/com/style24/front/biz/web/TsfOrderController.java

@@ -482,12 +482,21 @@ public class TsfOrderController extends TsfBaseController {
 	public ModelAndView payResultResponse(Payment param, HttpServletRequest request, HttpServletResponse response) {
 		ModelAndView mav = new ModelAndView();
 
-
+		// TODO 주문정보 업데이트
+		// 1. 주문상태업데이트
+		// 2. 재고처리
+		// 3. 포인트사용처리
+		// 4. 예정포인트적립처리
+		// 5. 쿠폰사용처리
+		// 6. 상품권사용처리
+		
 		// 테스트용 데이터 세팅
 		param.setPaySq(3);
 		param.setCustNo(TsfSession.getInfo().getCustNo() == null ? 0 : TsfSession.getInfo().getCustNo());
 		param.setUpdNo(param.getCustNo());
-
+		
+		
+		// 7. 결재정보등록(TB_PAYMENT)
 		param = orderService.orderPgPayResult(param, request, response);
 
 		mav.addObject("payment", param);
@@ -790,20 +799,27 @@ public class TsfOrderController extends TsfBaseController {
 		
 		order.setFrontGb(TsfSession.getFrontGb());
 		
-		// 2. 주문기본정보등록
+		// TODO
+		// 2. 주문정보 유효성체크 (
+		// 2.1 보유쿠폰체크
+		// 2.2 보유포인트체크
+		// 2.3 상품재고체크
+		// 2.4 보유상품권체크
+		// 2.5 사은품채고체크
+		
+		// 3. 주문기본정보등록
 		coreOrderService.createPreOrder(order);
 		
-		log.info("order.getPayGb()             ::: {}", order.getPayGb());
+		log.info("order.getPgGb()              ::: {}", order.getPgGb());
 		log.info("order.getPayMeans()          ::: {}", order.getPayMeans());
 		log.info("order.getOrdNo()             ::: {}", order.getOrdNo());
 		log.info("order.getGoodsNm()           ::: {}", order.getGoodsNm());
-		log.info("order.getGoodsCnt()          ::: {}", order.getGoodsCnt());
+		log.info("order.getOrdGoodsQty()       ::: {}", order.getOrdGoodsQty());
 		log.info("order.getPayAmt()            ::: {}", order.getPayAmt());
 		log.info("order.getOrdNm()             ::: {}", order.getOrdNm());
 		log.info("order.getOrdPhnno()          ::: {}", order.getOrdPhnno());
 		log.info("order.getCustNo()            ::: {}", order.getCustNo());
 
-
 		// TODO PG 데이터 세팅 처리 (order)
 		// 필수 데이터
 		// pgGb = 결제타입, payMeans = 결제수단, ordNo = 주문번호, goodsNm = 상품명, payAmt = 실결제금액, ordNm = 주문자명, ordPhnno = 휴대폰번호, custNo = 고객번호

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

@@ -354,7 +354,7 @@
 	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none;" name="orderDetailInfo">
 		<tr style="height:30px;">
 			<th>cartSq</th>
-			<th>goodsNm</th>
+			<th style="display:none">goodsNm</th>
 			<th>orgCurrPrice</th>
 			<th>cpn1DcSq</th>
 			<th>cpn1DcAmt</th>
@@ -385,6 +385,7 @@
 				<th:block th:each="goods, i : ${delvAllCart}">
 					<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="orgCurrPrice" 	th:text="${goods.orgCurrPrice}"></td>
 						<td class="cpn1CpnSq" 		th:text="${goods.cpn1CpnSq}"></td>
 						<td class="cpn1DcAmt" 		th:text="${goods.orgCurrPrice} - ${goods.currPrice}"></td>
@@ -720,7 +721,7 @@ $(document).ready( function() {
 	custemerInfoSet(jsonData);
 	
 	// 999. 개발화면정보설정
-	var devTemp = true;
+	var devTemp = false;
 	var arr = []
 	arr[0] = "orderInfo";
 	arr[1] = "freegiftInfo";
@@ -975,6 +976,8 @@ var paymentInfoSet = function(jsonData) {
 					var prePntDcAmtYn		= $("input[name='rdi-beforpoint']:checked").val();
 					var orderDetailList		= [];
 					var delvFeeCdList		= [];
+					var ordGoodsQty			= 0;
+					var goodsNm				= "";
 
 					// 주문상세데이타 생성
 					$(".cartSq").each(function(){
@@ -1005,6 +1008,9 @@ var paymentInfoSet = function(jsonData) {
 							,"delvFeeCd"		: $(this).parent().find(".delvFeeCd").text()
 						}
 						
+						// 상품수
+						ordGoodsQty++;
+						
 						orderDetailList.push(orderDetailData);
 					});
 					
@@ -1036,9 +1042,13 @@ var paymentInfoSet = function(jsonData) {
 						,"delvFeeCdList"		: delvFeeCdList
 						,"shotDelvYn"			: shotDelvYn
 						,"entryNo"				: $("input[name='entryNo']").val()
+						,"pgGb"					: "KCP"
+						,"payMeans"				: "G014_30"
 						,"payAmt"				: $(".realOrdSumAmt").text()
-						,"goodsNm"				: $(".realOrdSumAmt").text()
-						,"goodsCnt"				: $(".realOrdSumAmt").text()
+						,"ordNm"				: $(".custNm").text()
+						,"ordPhnno"				: $(".cellPhnno").text()
+						,"goodsNm"				: $(".goodsNm").eq(0).text()
+						,"ordGoodsQty"			: ordGoodsQty
 					};
 					
 					var orderData = JSON.stringify(orderData);
@@ -1056,8 +1066,8 @@ var paymentInfoSet = function(jsonData) {
 						},
 						success 	: function(result) {
 							// 결재정보로드
-							//$("#order_info").html(result);
-							//jsf__pay(document.order_info);
+							$("#order_info").html(result);
+							jsf__pay(document.order_info);
 						}
 					});
 				});