주문서 상품쿠폰 오류 수정

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

@@ -532,21 +532,29 @@ public class TsfOrderService {
 		
 		int orderDetailCurrPriceSum 	= 0;
 		int orderDetailRealOrdAmtSum 	= 0;
+		int cpn1DcAmtSum				= 0;
+		int tmtb1DcAmtSum				= 0;
+		int tmtb2DcAmtSum				= 0;
+		int goodsCpnDcAmtSum			= 0;
+		int cartCpnDcAmtSum				= 0;
+		
 		int cartCurrPriceSum 			= 0;
 		int cartRealOrdAmtSum 			= 0;
 		
+		// 주문서화면 금액정보 체크
 		for (Order orderDetail : orderDetailList) {
-			orderDetailCurrPriceSum = orderDetailCurrPriceSum + orderDetail.getCurrPrice();
-			orderDetailRealOrdAmtSum = orderDetailRealOrdAmtSum + orderDetail.getRealOrdAmt();
+			orderDetailCurrPriceSum 	= orderDetailCurrPriceSum + orderDetail.getCurrPrice();
+			orderDetailRealOrdAmtSum 	= orderDetailRealOrdAmtSum + orderDetail.getRealOrdAmt();
 		}
 		
+		// 장바구니 금액정보 체크
 		for (Order orderDetail : cartGoodsList) {
-			cartCurrPriceSum = orderDetailCurrPriceSum + orderDetail.getCurrPrice();
+			cartCurrPriceSum 			= cartCurrPriceSum + orderDetail.getCurrPrice();
 		}
 		
 		// 판매가비교
 		if (orderDetailCurrPriceSum != cartCurrPriceSum) {
-			resultStr = "보유하신 상품쿠폰이 존재하지 않습니다.";
+			resultStr = "금액정보가 잘못 되었습니다.";
 			return resultStr;
 		}
 

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

@@ -132,10 +132,7 @@ public class TsfOrderController extends TsfBaseController {
 	@RequestMapping(value = "/form")
 	public ModelAndView orderForm(HttpServletRequest request, Order order) {
 		ModelAndView mav = new ModelAndView();
-		
-		// TODO
-		// 1.비회주문, 회원 주문 판단 로직,  고객정보 세션 판단
-		// 세션고객정보가 존재하면 회원주문 없으면 비회원 주문
+
 		
 		// 1.1 referer 체크 (order/noMember)
 		String refererStr = "";
@@ -297,9 +294,9 @@ public class TsfOrderController extends TsfBaseController {
 		
 		// 1. 로그인체크 후 custNo 설정
 		if (TsfSession.isLogin()) {
-			order.setCustNo(TsfSession.getInfo().getCustNo()); // 고객번호등록
+			order.setCustNo(TsfSession.getInfo().getCustNo());
 		} else {
-			order.setCustNo(0); // 고객번호등록
+			order.setCustNo(0);
 			order.setJsessionId(TsfSession.getSessionId());
 		}
 		
@@ -341,9 +338,9 @@ public class TsfOrderController extends TsfBaseController {
 		
 		// 1. 로그인체크 후 custNo 설정
 		if (TsfSession.isLogin()) {
-			order.setCustNo(TsfSession.getInfo().getCustNo()); // 고객번호등록
+			order.setCustNo(TsfSession.getInfo().getCustNo());
 		} else {
-			order.setCustNo(0); // 고객번호등록
+			order.setCustNo(0);
 			order.setJsessionId(TsfSession.getSessionId());
 		}
 		
@@ -495,9 +492,9 @@ public class TsfOrderController extends TsfBaseController {
 		
 		// 1. 로그인체크 후 custNo 설정
 		if (TsfSession.isLogin()) {
-			order.setCustNo(TsfSession.getInfo().getCustNo()); // 고객번호등록
+			order.setCustNo(TsfSession.getInfo().getCustNo());
 		} else {
-			order.setCustNo(0); // 고객번호등록
+			order.setCustNo(0);
 			order.setJsessionId(TsfSession.getSessionId());
 		}
 		
@@ -551,9 +548,9 @@ public class TsfOrderController extends TsfBaseController {
 		
 		// 1. 로그인체크 후 custNo 설정
 		if (TsfSession.isLogin()) {
-			order.setCustNo(TsfSession.getInfo().getCustNo()); // 고객번호등록
+			order.setCustNo(TsfSession.getInfo().getCustNo());
 		} else {
-			order.setCustNo(0); // 고객번호등록
+			order.setCustNo(0);
 			order.setJsessionId(TsfSession.getSessionId());
 		}
 		
@@ -600,9 +597,9 @@ public class TsfOrderController extends TsfBaseController {
 		
 		// 1. 로그인체크 후 custNo 설정
 		if (TsfSession.isLogin()) {
-			order.setCustNo(TsfSession.getInfo().getCustNo()); // 고객번호등록
+			order.setCustNo(TsfSession.getInfo().getCustNo());
 		} else {
-			order.setCustNo(0); // 고객번호등록
+			order.setCustNo(0);
 			order.setJsessionId(TsfSession.getSessionId());
 		}
 		
@@ -686,13 +683,13 @@ public class TsfOrderController extends TsfBaseController {
 		
 		// 1. 로그인체크 후 custNo 설정
 		if (TsfSession.isLogin()) {
-			order.setCustNo(TsfSession.getInfo().getCustNo()); // 고객번호등록
+			order.setCustNo(TsfSession.getInfo().getCustNo());
 		} else {
-			order.setCustNo(0); // 고객번호등록
+			order.setCustNo(0);
 			order.setJsessionId(TsfSession.getSessionId());
 		}
 		
-		// 2. 로그인체크 후 정보 설정
+		// 2. TODO 로그인체크 후 정보 설정 자주사용하는 결제정보조회
 		if (TsfSession.isLogin()) {
 			
 		}
@@ -727,12 +724,11 @@ public class TsfOrderController extends TsfBaseController {
 		}
 		
 		order.setFrontGb(TsfSession.getFrontGb());
-		
-		// TODO
+
 		// 2. 주문정보유효성체크
 		String resultStr = orderService.orderValidationCheck(order);
 		
-		// 유효성체크 실패
+		// 주문정보 유효성체크 실패
 		if (!"SUCCESS".equals(resultStr)) {
 			mav.addObject("message", resultStr);
 			mav.setViewName(super.getDeviceViewName("order/OrderEmpty"));

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

@@ -30,7 +30,7 @@
 <!-- 주문금액정보표현 -->
 <form id="orderAmtForm" name="orderAmtForm">
 	<!-- 고객정보 -->
-	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="orderInfo">
+	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="orderInfo" id="orderInfo">
 		<tbody>
 			<tr style="height:30px;">
 				<th>custNm</th>
@@ -65,7 +65,7 @@
 	<!-- //고객정보 -->
 	
 	<!-- 사은품정보 -->
-	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="freegiftInfo">
+	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="freegiftInfo" id="freegiftInfo">
 		<tr style="height:30px;">
 			<th>freegiftValArr</th>
 			<th>freegiftUsePointArr</th>
@@ -82,7 +82,7 @@
 	<!-- //사은품정보 -->
 	
 	<!-- 주문상세금액 -->
-	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="orderDetailInfo">
+	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="orderDetailInfo" id="orderDetailInfo">
 		<tr style="height:30px;">
 			<th>cartSq</th>
 			<th style="display:none">goodsNm</th>
@@ -175,7 +175,7 @@
 	<!-- //주문상세금액 -->
 	
 	<!-- 배송단위목록 -->
-	<table border="1" style="font-size:10px; text-align:center;  margin-top:20px; display:none; width:100%;" name="delvFeeCdInfo">
+	<table border="1" style="font-size:10px; text-align:center;  margin-top:20px; display:none; width:100%;" name="delvFeeCdInfo" id="delvFeeCdInfo">
 		<tr style="height:30px;">
 			<th>supplyCompCd</th>
 			<th>delvFeeCd</th>
@@ -196,7 +196,7 @@
 	<!-- //배송단위목록 -->
 	
 	<!-- 주문금액합계 -->
-	<table border="1" style="font-size:10px; text-align:center;  margin-top:20px; display:none; width:100%;" name="orderSumAmtInfo">
+	<table border="1" style="font-size:10px; text-align:center;  margin-top:20px; display:none; width:100%;" name="orderSumAmtInfo" id="orderSumAmtInfo">
 		<tr style="height:30px;">
 			<th>orgGoodsSumAmt</th>
 			<th>delvSumAmt</th>

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

@@ -32,7 +32,7 @@
 <!-- 주문금액정보표현 -->
 <form id="orderAmtForm" name="orderAmtForm">
 	<!-- 주문자정보 -->
-	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="orderInfo">
+	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="orderInfo" id="orderInfo">
 		<tbody>
 			<tr style="height:30px;">
 				<th>custNm</th>
@@ -65,7 +65,7 @@
 	<!-- //주문자정보 -->
 	
 	<!-- 사은품정보 -->
-	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="freegiftInfo">
+	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="freegiftInfo" id="freegiftInfo">
 		<tr style="height:30px;">
 			<th>freegiftValArr</th>
 			<th>freegiftUsePointArr</th>
@@ -82,7 +82,7 @@
 	<!-- //사은품정보 -->
 	
 	<!-- 주문상세금액 -->
-	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="orderDetailInfo">
+	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="orderDetailInfo" id="orderDetailInfo">
 		<tr style="height:30px;">
 			<th>cartSq</th>
 			<th style="display:none">goodsNm</th>
@@ -175,7 +175,7 @@
 	<!-- //주문상세금액 -->
 	
 	<!-- 배송단위목록 -->
-	<table border="1" style="font-size:10px; text-align:center;  margin-top:20px; display:none; width:100%;" name="delvFeeCdInfo">
+	<table border="1" style="font-size:10px; text-align:center;  margin-top:20px; display:none; width:100%;" name="delvFeeCdInfo" id="delvFeeCdInfo">
 		<tr style="height:30px;">
 			<th>supplyCompCd</th>
 			<th>delvFeeCd</th>
@@ -1111,6 +1111,7 @@ var paymentInfoSet = function() {
 
 					// 주문상세데이타 생성
 					$("#orderDetailInfo .cartSq").each(function(){
+						
 						// 주문상세단위 총알배송여부 변경
 						var orderDetailShotDelvYn = $(this).parent().find(".shotDelvYn").text();
 						if (orderDetailShotDelvYn == "Y") {