Browse Source

주문서개발중

jsh77b 5 years ago
parent
commit
157eb4f93a

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

@@ -793,8 +793,15 @@ public class TsfOrderController extends TsfBaseController {
 		// 2. 주문기본정보등록
 		coreOrderService.createPreOrder(order);
 		
-		
-
+		log.info("order.getPayGb()             ::: {}", order.getPayGb());
+		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.getPayAmt()            ::: {}", order.getPayAmt());
+		log.info("order.getOrdNm()             ::: {}", order.getOrdNm());
+		log.info("order.getOrdPhnno()          ::: {}", order.getOrdPhnno());
+		log.info("order.getCustNo()            ::: {}", order.getCustNo());
 
 
 		// TODO PG 데이터 세팅 처리 (order)

+ 1 - 1
src/main/webapp/WEB-INF/views/web/order/OrderDeliveryAddrInfoWeb.html

@@ -98,7 +98,7 @@
 							</div>
 							<div class="info_box overs1">
 								<div class="input_wrap">
-									<input type="text" class="form_control err" maxlength="13" placeholder="P로 시작하는 13자리">
+									<input type="text" name="entryNo" class="form_control err" maxlength="13" placeholder="P로 시작하는 13자리" value="abcde12345qwe">
 									<!-- 유효하지 않은 개인통관고유부호 일때 class명 'err' 추가 -->
 								</div>
 								<div class="t_err">개인통관고유부호가 유효하지 않습니다.</div>

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

@@ -348,6 +348,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>orgCurrPrice</th>
 			<th>cpn1DcSq</th>
 			<th>cpn1DcAmt</th>
@@ -984,16 +985,17 @@ var paymentInfoSet = function(jsonData) {
 							,"tmtb2Sq"			: $(this).parent().find(".tmtb2Sq").text()
 							,"tmtb2DcAmt"		: $(this).parent().find(".tmtb2DcAmt").text()
 							,"goodsCpnSq"		: $(this).parent().find(".goodsCpnSq").text()
-							,"goodsCpnDCAmt"	: $(this).parent().find(".goodsCpnDCAmt").text()
+							,"goodsCpnDcAmt"	: $(this).parent().find(".goodsCpnDcAmt").text()
 							,"cartCpnSq"		: $(this).parent().find(".cartCpnSq").text()
-							,"carrtCpnDCAmt"	: $(this).parent().find(".cartCpnDCAmt").text()
+							,"cartCpnDcAmt"		: $(this).parent().find(".cartCpnDcAmt").text()
 							,"prePntDcAmt"		: $(this).parent().find(".prePntDcAmt1").text()
 							,"pntDcAmt"			: $(this).parent().find(".pntDcAmt1").text()
 							,"gfcdUseAmt"		: $(this).parent().find(".gfcdUseAmt1").text()
+							,"realOrdAmt"		: $(this).parent().find(".realOrdAmt1").text()
 							,"savePntAmt"		: $(this).parent().find(".savePntAmt1").text()
 							,"shotDelvYn"		: $(this).parent().find(".shotDelvYn").text()
 							,"foreignBuyYn"		: $(this).parent().find(".foreignYn").text()
-							,"orderMadeYn"		: $(this).parent().find(".orderMadeYn").text()
+							,"makeGoodsYn"		: $(this).parent().find(".orderMadeYn").text()
 							,"delvFeeCd"		: $(this).parent().find(".delvFeeCd").text()
 						}
 						
@@ -1026,6 +1028,11 @@ var paymentInfoSet = function(jsonData) {
 						,"prePntDcAmtYn"		: prePntDcAmtYn
 						,"orderDetailList"		: orderDetailList
 						,"delvFeeCdList"		: delvFeeCdList
+						,"shotDelvYn"			: shotDelvYn
+						,"entryNo"				: $("input[name='entryNo']").val()
+						,"payAmt"				: $(".realOrdSumAmt").text()
+						,"goodsNm"				: $(".realOrdSumAmt").text()
+						,"goodsCnt"				: $(".realOrdSumAmt").text()
 					};
 					
 					var orderData = JSON.stringify(orderData);
@@ -1048,9 +1055,7 @@ var paymentInfoSet = function(jsonData) {
 						}
 					});
 				});
-				
-				
-				
+
 				// 1.8 할인영역 설정
 				dcAmtInfoSet(jsonData);
 			}
@@ -1274,6 +1279,9 @@ var dcAmtInfoSet = function(jsonData) {
 					// 금액전체계산
 					custCpnSumAmtCal();
 				});
+				
+				// 금액계산초기화
+				custCpnSumAmtCal();
 			}
 		}
 	});
@@ -1697,13 +1705,13 @@ var custCpnSumAmtCal = function() {
 		cpnDcSumAmt			= cpnDcSumAmt + (goodsCpnDcAmt + cartCpnDcAmt);
 		prePntDcSumAmt		= prePntDcSumAmt + prePntDcAmt1;
 		
-		var ordAmt			= ((orgCurrPrice - cpn1DcAmt) + optAddPrice) * goodsQty;
+		var ordAmt			= ((orgCurrPrice +  - cpn1DcAmt) + optAddPrice) * goodsQty;
 		ordSumAmt			= ordSumAmt + ordAmt;
 		
 		// 선포인트사용여부
 		// 할인금액합계 = 다다익선수량금액 + 다다익선금액금액 + 상품쿠폰금액 + 장바구니금액 + 선포인트금액
 		if (prePntDcAmtYn == "Y") {
-			dcSumAmt		= tmtb1DcAmt + tmtb2DcAmt + goodsCpnDcAmt + cartCpnDcAmt + prePntDcAmt1;			
+			dcSumAmt		= tmtb1DcAmt + tmtb2DcAmt + goodsCpnDcAmt + cartCpnDcAmt + prePntDcAmt1;
 		} else {
 			dcSumAmt		= tmtb1DcAmt + tmtb2DcAmt + goodsCpnDcAmt + cartCpnDcAmt;
 		}