주문서개발중

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

@@ -246,27 +246,35 @@ public class TsfOrderController extends TsfBaseController {
 		
 		// 2. 로그인체크 후 고객정보 설정
 		if (TsfSession.isLogin()) {
-			// 2.1 주문고객 정보조회
-			deliveryAddrInfo = coreOrderService.getDeliveryAddrInfo(order);
-			
-			if (deliveryAddrInfo.getDelvAddrNm() == null || "".equals(deliveryAddrInfo.getDelvAddrNm())) {
-				deliveryAddrInfo.setDelvAddrNm(deliveryAddrInfo.getCustNm());
-			}
-			
-			if (deliveryAddrInfo.getRecipZipcode() == null || "".equals(deliveryAddrInfo.getRecipZipcode())) {
-				deliveryAddrInfo.setRecipZipcode("00000");
-			}
-			
-			if (deliveryAddrInfo.getRecipBaseAddr() == null || "".equals(deliveryAddrInfo.getRecipBaseAddr())) {
-				deliveryAddrInfo.setRecipBaseAddr("기본주소정보없음");
-			}
 			
-			if (deliveryAddrInfo.getRecipDtlAddr() == null || "".equals(deliveryAddrInfo.getRecipDtlAddr())) {
-				deliveryAddrInfo.setRecipDtlAddr("상세주소정보없음");
-			}
+			// 2.1 주문고객 배송지정보조회
+			Collection<Order> deliveryAddrList = coreOrderService.getDeliveryAddrInfo(order);
+			int index = 0;
 			
-			if (deliveryAddrInfo.getDelvMemo() == null || "".equals(deliveryAddrInfo.getDelvMemo())) {
-				deliveryAddrInfo.setDelvMemo("직접받고 부재시 문 앞");
+			for (Order deliveryAddr : deliveryAddrList) {
+				// 회원 배송지 번호가 존재하면 실행
+				if (order.getCustDelvAddrSq() > 0) {
+					if (order.getCustDelvAddrSq() == deliveryAddr.getCustDelvAddrSq()) {
+						deliveryAddrInfo = deliveryAddr;
+					}
+				}
+				// 회원 배송지 번가 존재하지 않으면 기본배송지 설정
+				else {
+					if (index == 0) {
+						deliveryAddrInfo = deliveryAddr;
+					
+						if (deliveryAddrInfo.getRecipZipcode() == null || "".equals(deliveryAddrInfo.getRecipZipcode())) {
+							deliveryAddrInfo.setDelvAddrNm(deliveryAddrInfo.getCustNm());
+							deliveryAddrInfo.setRecipZipcode("00000");
+							deliveryAddrInfo.setRecipBaseAddr("기본주소정보없음");
+							deliveryAddrInfo.setRecipDtlAddr("상세주소정보없음");
+							deliveryAddrInfo.setDelvMemo("직접받고 부재시 문 앞");
+							deliveryAddrInfo.setRecipNm(deliveryAddrInfo.getCustNm());
+						}
+					}
+				}
+				
+				index++;
 			}
 		} else {
 			// 2.1 주문고객 정보조회			
@@ -670,6 +678,18 @@ public class TsfOrderController extends TsfBaseController {
 	public ModelAndView delvAddrChangePop(Order order) {
 		
 		ModelAndView mav = new ModelAndView();
+		
+		// 1. 로그인체크 후 custNo 설정
+		if (TsfSession.isLogin()) {
+			order.setCustNo(TsfSession.getInfo().getCustNo()); // 고객번호등록
+		} else {
+			order.setCustNo(0);
+		}
+		
+		// 1.0 주문고객 배송지정보조회
+		Collection<Order> deliveryAddrList = coreOrderService.getDeliveryAddrInfo(order);
+		
+		mav.addObject("deliveryAddrList", deliveryAddrList);	// 배송지정보
 		mav.setViewName(super.getDeviceViewName("order/OrderDelvAddrChangePop"));
 		
 		return mav;
@@ -685,9 +705,31 @@ public class TsfOrderController extends TsfBaseController {
 	 */
 	@ResponseBody
 	@RequestMapping(value = "/delvAddrModifyPop")
-	public ModelAndView delvAddrModifyPop(Order order) {
+	public ModelAndView delvAddrModifyPop(@RequestBody Order order) {
 		
 		ModelAndView mav = new ModelAndView();
+		Order deliveryAddrInfo = new Order();
+		
+		// 2. 로그인체크 후 고객정보 설정
+		if (TsfSession.isLogin()) {
+			order.setCustNo(TsfSession.getInfo().getCustNo()); // 고객번호등록
+			
+			// 2.1 주문고객 배송지정보조회
+			Collection<Order> deliveryAddrList = coreOrderService.getDeliveryAddrInfo(order);
+			
+			log.info("order.getCustDelvAddrSq() ::: {} " ,order.getCustDelvAddrSq());
+			
+			for (Order deliveryAddr : deliveryAddrList) {
+				// 회원 배송지 번호가 존재하면 실행
+				if (order.getCustDelvAddrSq() > 0) {
+					if (order.getCustDelvAddrSq() == deliveryAddr.getCustDelvAddrSq()) {
+						deliveryAddrInfo = deliveryAddr;
+					}
+				}
+			}
+		} 
+		
+		mav.addObject("deliveryAddrInfo", deliveryAddrInfo);						// 배송지정보
 		mav.setViewName(super.getDeviceViewName("order/OrderDelvAddrModifyPop"));
 		
 		return mav;
@@ -711,6 +753,29 @@ public class TsfOrderController extends TsfBaseController {
 		return mav;
 	}
 	
+	/**
+	 * 배송지정보추가
+	 *
+	 * @param
+	 * @return
+	 * @author jsh77b
+	 * @since 2021. 02. 17
+	 */
+	@ResponseBody
+	@PostMapping(value = "/createCustDeliveryAddr")
+	public String createDeliveryAddr(@RequestBody Order order) {
+		// 1. 로그인체크 후 custNo 설정
+		if (TsfSession.isLogin()) {
+			order.setCustNo(TsfSession.getInfo().getCustNo()); // 고객번호등록
+		} else {
+			order.setCustNo(0);
+		}
+		
+		coreOrderService.createCustDeliveryAddr(order);
+		
+		return message.getMessage("SUCC_0001");
+	}
+	
 	/**
 	 * 배송지메모변경팝업
 	 *
@@ -729,6 +794,8 @@ public class TsfOrderController extends TsfBaseController {
 		return mav;
 	}
 	
+	
+	
 	/**
 	 * 사은품안내팝업
 	 *
@@ -743,9 +810,6 @@ public class TsfOrderController extends TsfBaseController {
 		
 		ModelAndView mav = new ModelAndView();
 		
-		
-		
-		
 		mav.setViewName(super.getDeviceViewName("order/OrderFreegiftInfoPop"));
 		
 		return mav;

src/main/webapp/WEB-INF/views/web/common/fragments/FooterWeb.html

@@ -100,6 +100,8 @@
 		</div>
 	</div>
 	<!-- head end -->
+		
+	<div id="zipcode_layer" style="z-index:9999; position: fixed;left: 50%; top: 50%; transform: translate(-50%, -50%);"></div>
 
 <script th:inline="javascript">
 /*<![CDATA[*/
@@ -115,6 +117,86 @@
 /*]]>*/
 </script>
 
+<script th:inline="javascript">
+/*<![CDATA[*/
+var element_layer = document.getElementById('zipcode_layer');
+var cfnGetDaumRoadAddr = function(data) {
+	// 팝업에서 검색결과 항목을 클릭했을 때 실행할 코드를 작성하는 부분입니다.
+	// 예제를 참고하여 다양한 활용법을 확인해 보세요.
+	// 팝업에서 검색결과 항목을 클릭했을때 실행할 코드를 작성하는 부분
+
+	// 도로명 주소의 노출 규칙에 따라 주소를 조합한다.
+	// 내려오는 변수가 값이 없는 경우엔 공백('') 값을 가지므로, 이를 참고하여 분기한다.
+	let fullRoadAddr = data.roadAddress; // 도로명 주소 변수
+	let extraRoadAddr = ''; // 도로명 조합형 주소 변수
+
+	// 법정동명이 있을 경우 추가한다. (법정리는 제외)
+	// 법정동의 경우 마지막 문자가 "동/로/가"로 끝난다.
+	if (data.bname !== '' && /[동|로|가]$/g.test(data.bname)) {
+		extraRoadAddr += data.bname;
+	}
+
+	// 건물명이 있고, 공동주택일 경우 추가한다.
+	if (data.buildingName !== '' && data.apartment === 'Y') {
+		extraRoadAddr += (extraRoadAddr !== '' ? ', ' + data.buildingName : data.buildingName);
+	}
+	
+	// 도로명, 지번 조합형 주소가 있을 경우, 괄호까지 추가한 최종 문자열을 만든다.
+	if (extraRoadAddr !== '') {
+		extraRoadAddr = ' (' + extraRoadAddr + ')';
+	}
+	
+	// 도로명, 지번 주소의 유무에 따라 해당 조합형 주소를 추가한다.
+	if (fullRoadAddr !== '') {
+		fullRoadAddr += extraRoadAddr;
+	}
+	
+	return fullRoadAddr;
+}
+
+var cfnOpenDaumAddr = function(daumZip) {
+	if ($('html').hasClass('is-ie')) {
+		daumZip.open();
+	} else {
+		daumZip.embed(element_layer);
+		
+		// iframe을 넣은 element를 보이게 한다.
+		element_layer.style.display = 'block';
+
+		// iframe을 넣은 element의 위치를 화면의 가운데로 이동시킨다.
+		cfnInitLayerPosition();
+	}
+}
+
+var cfnCloseDaumAddr = function() {
+	// iframe을 넣은 element를 안보이게 한다.
+	element_layer.style.display = 'none';
+}
+
+// 브라우저의 크기 변경에 따라 레이어를 가운데로 이동시키고자 하실때에는
+// resize이벤트나, orientationchange이벤트를 이용하여 값이 변경될때마다 아래 함수를 실행 시켜 주시거나,
+// 직접 element_layer의 top,left값을 수정해 주시면 됩니다.
+var cfnInitLayerPosition = function() {
+	let width = 420; //우편번호서비스가 들어갈 element의 width
+	let height = 470; //우편번호서비스가 들어갈 element의 height
+	let borderWidth = 1; //샘플에서 사용하는 border의 두께
+
+	// 위에서 선언한 값들을 실제 element에 넣는다.
+	element_layer.style.width = width + 'px';
+	element_layer.style.height = height + 'px';
+	element_layer.style.border = borderWidth + 'px solid';
+	
+	// 실행되는 순간의 화면 너비와 높이 값을 가져와서 중앙에 뜰 수 있도록 위치를 계산한다.
+	/*
+	element_layer.style.left = (((window.innerWidth || document.documentElement.clientWidth) - width) / 2 - borderWidth) + 'px';
+	element_layer.style.top = (((window.innerHeight || document.documentElement.clientHeight) - height) / 2 - borderWidth) + 'px';
+	*/
+	
+	// 다음 레이어 적용
+	$("#__daum__layer_1").css("z-index", 3000);
+}
+/*]]>*/
+</script>
 </footer>
 
 </html>

src/main/webapp/WEB-INF/views/web/common/fragments/HeadWeb.html

@@ -38,6 +38,8 @@
 	<script src="/ux/pc/js/jquery.ui.datepicker.monthyearpicker.js"></script>
 	<script src="/ux/plugins/jquery.serializeObject.min.js"></script>
 	<script src="/ux/plugins/mcxdialog/mcxdialog_ui.js"></script>
+	
+	<script type="text/javascript" src="https://ssl.daumcdn.net/dmaps/map_js_init/postcode.v2.js"></script>
 
 	<!-- Global site tag (gtag.js) - Google Analytics -->
 <!-- 	<script async src="https://www.googletagmanager.com/gtag/js?id=UA-168660512-1"></script> -->

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

@@ -15,7 +15,7 @@
  -->
 
 <!-- 할인/혜택 사용 -->
-<div class="fold_head on">
+<div class="fold_head">
 	<a href="javascript:void(0)">
 		<div>
 			<div class="fold_tit">
@@ -33,7 +33,7 @@
 		</div>
 	</a>
 </div>
-<div class="fold_cont" style="display: block;">
+<div class="fold_cont" style="display: none;">
 	<div class="area_seldiscount">
 		<dl>
 			<div>

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

@@ -14,26 +14,25 @@
  *******************************************************************************
  -->
 <!-- 배송지정보 -->
-<input type="hidden" name="delvMemo" th:value="${deliveryAddrInfo.delvMemo}">
+<input type="hidden" name="recipZipcode" 	th:value="${deliveryAddrInfo.recipZipcode}"/>
+<input type="hidden" name="recipBaseAddr" 	th:value="${deliveryAddrInfo.recipBaseAddr}"/>
+<input type="hidden" name="recipDtlAddr" 	th:value="${deliveryAddrInfo.recipDtlAddr}"/>
+<input type="hidden" name="delvMemo" 		th:value="${deliveryAddrInfo.delvMemo}"/>
+<input type="hidden" name="foreignBuyYn" 	th:value="${order.foreignBuyYn}"/>
+<input type="hidden" name="orderMadeYn" 	th:value="${order.orderMadeYn}"/>
+
 <div class="fold_head">
 	<a href="javascript:void(0)">
 		<div>
 			<div class="fold_tit">
 				<span>배송지 정보</span>
 			</div>
-			<div class="data" th:text="${deliveryAddrInfo.recipBaseAddr} + '   ' + ${deliveryAddrInfo.recipDtlAddr}"></div>
+			<div class="data" id="recipAddr" th:text="${deliveryAddrInfo.recipBaseAddr} + '   ' + ${deliveryAddrInfo.recipDtlAddr}"></div>
 		</div>
 	</a>
 </div>
 <div class="fold_cont" style="display: none;">
 	<div class="area_receiveinfo">
-		<input type="hidden" name="recipZipcode" 	th:value="${deliveryAddrInfo.recipZipcode}"/>
-		<input type="hidden" name="recipBaseAddr" 	th:value="${deliveryAddrInfo.recipBaseAddr}"/>
-		<input type="hidden" name="recipDtlAddr" 	th:value="${deliveryAddrInfo.recipDtlAddr}"/>
-		<input type="hidden" name="delvMemo" 		th:value="${deliveryAddrInfo.delvMemo}"/>
-		<input type="hidden" name="foreignBuyYn" 	th:value="${order.foreignBuyYn}"/>
-		<input type="hidden" name="orderMadeYn" 	th:value="${order.orderMadeYn}"/>
-		
 		<dl>
 			<div>
 				<dt>
@@ -42,8 +41,10 @@
 				<dd>
 					<th:block th:text="${deliveryAddrInfo.delvAddrNm}"></th:block>
 					<span class="icon_tag"> 
-						<em class="tag gray">기본 배송지</em> 
-						<th:block th:if="${order.shotDelvUseYn} == 'Y'"> 
+						<th:block th:if="${deliveryAddrInfo.defaultYn} == 'Y'">
+							<em class="tag gray">기본 배송지</em>
+						</th:block> 
+						<th:block th:if="${order.shotDelvUseYn} == 'Y'">
 							<em class="tag primary_line">총알배송</em>
 						</th:block>
 					</span>
@@ -87,35 +88,29 @@
 					<dd>
 						<div class="form_field">
 							<div>
-								<input type="radio" name="rdi-overseas"
-									id="rdi-overs1" value="" checked=""> <label
-									for="rdi-overs1"><span>받는사람 개인통관고유부호</span></label>
+								<input type="radio" name="rdi-overseas" id="rdi-overs1" value="" checked=""> 
+								<label for="rdi-overs1"><span>받는사람 개인통관고유부호</span></label>
 							</div>
 							<div>
-								<input type="radio" name="rdi-overseas"
-									id="rdi-overs2" value=""> <label
-									for="rdi-overs2"><span>입력 안 함</span></label>
+								<input type="radio" name="rdi-overseas" id="rdi-overs2" value=""> 
+								<label for="rdi-overs2"><span>입력 안 함</span></label>
 							</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" class="form_control err" maxlength="13" placeholder="P로 시작하는 13자리">
 									<!-- 유효하지 않은 개인통관고유부호 일때 class명 'err' 추가 -->
 								</div>
 								<div class="t_err">개인통관고유부호가 유효하지 않습니다.</div>
 								<!-- 유효하지 않은 개인통관고유부호 일때 노출 -->
 								<div class="agree_overs">
 									<input id="chk-overs-agr" type="checkbox" checked="">
-									<label for="chk-overs-agr"><span>위
-											정보는 원활한 통관을 위해 수집 및 판매자에게 제공하며,계속 사용하도록 안전하게
-											STYLE24에서 저장 / 관리 합니다.&nbsp;&nbsp;<em
-											class="tmark_required">(필수)</em>
-									</span></label>
+									<label for="chk-overs-agr">
+										<span>위 정보는 원활한 통관을 위해 수집 및 판매자에게 제공하며,계속 사용하도록 안전하게 STYLE24에서 저장 / 관리 합니다.&nbsp;&nbsp;<em class="tmark_required">(필수)</em></span>
+									</label>
 								</div>
 							</div>
 							<div class="info_box overs2" style="display: none;">
-								<p>개인통관고유부호를 입력하지 않아도 관세사무소에서 개인정보 확인을 위해 별도 연락을
-									드릴 예정입니다.</p>
+								<p>개인통관고유부호를 입력하지 않아도 관세사무소에서 개인정보 확인을 위해 별도 연락을 드릴 예정입니다.</p>
 							</div>
 						</div>
 						<div class="info_txt">
@@ -137,18 +132,17 @@
 			<div class="form_field">
 				<div class="agree_custom">
 					<input id="chk-custom-agr1" type="checkbox" checked="">
-					<label for="chk-custom-agr1"><span>고객님께서
-							주문하신 상품에는 주문제작상품이 포함되어 있습니다.<br>주문제작상품에 대한 안내를
-							확인하였으며 배송에 동의합니다.&nbsp;&nbsp;<em
-							class="tmark_required">(필수)</em>
-					</span></label>
+					<label for="chk-custom-agr1">
+						<span>고객님께서 주문하신 상품에는 주문제작상품이 포함되어 있습니다.<br>주문제작상품에 대한 안내를 확인하였으며 배송에 동의합니다.&nbsp;&nbsp;
+							<em class="tmark_required">(필수)</em>
+						</span>
+					</label>
 				</div>
 			</div>
 			<div class="info_txt">
 				<ul>
 					<li>주문 제작 상품은 주문 후 제작이 진행되며, 제작 완료 후 배송이 시작됩니다.</li>
-					<li>주문 제작 상품의 특성상 주문 완료 후 취소/교환이 불가능합니다. (상품 하자에 한해
-						가능)</li>
+					<li>주문 제작 상품의 특성상 주문 완료 후 취소/교환이 불가능합니다. (상품 하자에 한해 가능)</li>
 				</ul>
 			</div>
 		</div>

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

@@ -1,4 +1,3 @@
-<!-- 배송지추가 팝업 -->
 <div class="modal-dialog" role="document">
 	<div class="modal-content">
 		<div class="modal-header">
@@ -6,91 +5,179 @@
 		</div>
 		<div class="modal-body">
 			<div class="pop_cont">
-				<div class="area_adrsinfo">
-					<div class="form_field">
-						<label class="input_label sr-only">이름(주문자명)</label>
-						<div class="ui_col_12">
-							<div class="input_wrap">
-								<input type="text" name="userName" placeholder="이름(주문자명)" id="txtName">
+				<form class="form_wrap form_full" name="deliveryAddrForm" id="deliveryAddrForm">
+					<div class="area_adrsinfo">
+						<h6>배송지 정보</h6>
+						<div class="default_addrs">
+							<div class="form_field">
+								<input id="chk-default-addrs" type="checkbox" name="defaultYn" checked="">
+								<label for="chk-default-addrs"><span>기본 배송지로 등록</span></label>
 							</div>
 						</div>
-					</div>
-					<div class="form_field">
-						<label class="input_label sr-only">휴대폰 번호</label>
-						<div class="ui_col_12">
-							<div class="input_wrap">
-								<input type="text" name="userPhone" placeholder="휴대폰 번호" id="userPhone">
+						<div class="form_field">
+							<label class="input_label sr-only">받는 분</label>
+							<div class="ui_col_12">
+								<div class="input_wrap">
+									<input type="text" name="recipNm" placeholder="받는 분">
+								</div>
 							</div>
 						</div>
-					</div>
-					<div class="form_field">
-						<label class="input_label sr-only">배송주소</label>
-						<div class="ui_col_12">
-							<div class="input_wrap">
-								<input type="text" name="userNumber" placeholder="배송주소" id="">
-								<button type="button" class="btn btn_dark btn_default btn_postcode">
-									<span>우편번호 찾기</span>
-								</button>
+						<div class="form_field">
+							<label class="input_label sr-only">휴대폰 번호</label>
+							<div class="ui_col_12">
+								<div class="input_wrap">
+									<input type="text" name="recipPhnno" placeholder="휴대폰 번호" >
+								</div>
+							</div>
+						</div>
+						<div class="form_field">
+							<label class="input_label sr-only">배송주소</label>
+							<div class="ui_col_12">
+								<div class="input_wrap">
+									<input type="text" name="recipZipcode" placeholder="우편번호">
+									<button type="button" class="btn btn_dark btn_sm" onclick="fnOpenDaumAddr();">
+										<span>우편번호 찾기</span>
+									</button>
+								</div>
+							</div>
+						</div>
+						<div class="form_field">
+							<label class="input_label sr-only">기본주소</label>
+							<div class="ui_col_12">
+								<div class="input_wrap">
+									<input type="text" name="recipBaseAddr" placeholder="상세주소">
+								</div>
+							</div>
+						</div>
+						<div class="form_field">
+							<label class="input_label sr-only">상세주소</label>
+							<div class="ui_col_12">
+								<div class="input_wrap">
+									<input type="text" name="recipDtlAddr" placeholder="상세주소">
+								</div>
 							</div>
 						</div>
 					</div>
-					<!-- 주소 출력 -->
-					<div class="adress">
-						<dl>
+					<div class="area_request">
+						<h6>배송요청 사항</h6>
+						<div class="form_field">
 							<div>
-								<dt>
-									<span>도로명</span>
-								</dt>
-								<dd>서울시 영등포구 은행로 11, 일신빌딩 8층</dd>
+								<input type="radio" name="rdi-request1" id="rdi-request11" value="문앞"> 
+								<label for="rdi-request11"><span>문앞</span></label>
 							</div>
 							<div>
-								<dt>
-									<span>지번</span>
-								</dt>
-								<dd>서울특별시 영등포구 여의도동 15-15 일신빌딩 8층</dd>
+								<input type="radio" name="rdi-request1" id="rdi-request12" value="직접받고 부재시 문 앞" checked=""> 
+								<label for="rdi-request12"><span>직접받고 부재시 문 앞</span></label>
 							</div>
-						</dl>
-					</div>
-					<!-- //주소 출력 -->
-				</div>
-				<div class="area_request">
-					<h6>배송요청 사항</h6>
-					<div class="form_field">
-						<div>
-							<input type="radio" name="rdi-request1" id="rdi-request11" value="" checked=""> 
-							<label for="rdi-request11"><span>문앞</span></label>
-						</div>
-						<div>
-							<input type="radio" name="rdi-request1" id="rdi-request12" value="" checked=""> 
-							<label for="rdi-request12"><span>직접받고 부재시 문 앞</span></label>
-						</div>
-						<div>
-							<input type="radio" name="rdi-request1" id="rdi-request13" value="" checked="">
-							 <label for="rdi-request13"><span>경비실</span></label>
-						</div>
-						<div>
-							<input type="radio" name="rdi-request1" id="rdi-request14" value="" checked=""> 
-							<label for="rdi-request14"><span>택배함</span></label>
-						</div>
-						<div>
-							<input type="radio" name="rdi-request1" id="rdi-request15"value="" checked=""> 
-							<label for="rdi-request15"><span>기타사항</span></label>
-							<div class="info_box">
-								<div class="input_wrap">
-									<input type="text" class="form_control" maxlength="30" placeholder="보관장소만 입력">
-									<p>보관 장소 외 다른 내용 입력시 통보없이 삭제 될 수 있습니다.</p>
+							<div>
+								<input type="radio" name="rdi-request1" id="rdi-request13" value="경비실"> 
+								<label for="rdi-request13"><span>경비실</span></label>
+							</div>
+							<div>
+								<input type="radio" name="rdi-request1" id="rdi-request14" value="택배함"> 
+								<label for="rdi-request14"><span>택배함</span></label>
+							</div>
+							<div>
+								<input type="radio" name="rdi-request1" id="rdi-request15" value="기타사항"> 
+								<label for="rdi-request15"><span>기타사항</span></label>
+								<div class="info_box">
+									<div class="input_wrap">
+										<input type="text" class="form_control" maxlength="30" placeholder="보관장소만 입력">
+										<p>보관 장소 외 다른 내용 입력시 통보없이 삭제 될 수 있습니다.</p>
+									</div>
 								</div>
 							</div>
 						</div>
 					</div>
-				</div>
-				<div class="btn_group_block">
-					<button class="btn btn_dark btn_block">
-						<span>배송지 등록</span>
-					</button>
-				</div>
+					<div class="btn_group_block">
+						<button type="button" class="btn btn_dark btn_block" id="btn_delivery_addr_save">
+							<span>배송지 등록</span>
+						</button>
+					</div>
+				</form>
 			</div>
 		</div>
 	</div>
 </div>
-<!-- //배송지추가 팝업 -->
+<a href="#close-modal" rel="modal:close" id="adrsAddPop_close" class="close-modal">Close</a>
+
+<script th:inline="javascript">
+// 우편번호 DAUM을 이용한 우편번호 팝업 레이어
+var fnOpenDaumAddr = function() {
+	let daumZip = new daum.Postcode({
+		oncomplete: function(data) {
+			$('#deliveryAddrForm input[name=recipZipcode]').val(data.zonecode);
+			$('#deliveryAddrForm input[name=recipBaseAddr]').val(cfnGetDaumRoadAddr(data));
+			$('#deliveryAddrForm input[name=recipDtlAddr]').focus();
+			cfnCloseDaumAddr();
+		},
+		width: '100%'
+	});
+	
+	cfnOpenDaumAddr(daumZip);
+}
+
+// 배송지등록버튼
+$("#btn_delivery_addr_save").on("click", function(){
+	// 기본배송지여부
+	var defaultYn = "N";
+	if ($("#deliveryAddrForm input[name=defaultYn]").is(":checked")) {
+		defaultYn = "Y";
+	}
+	
+	// 배송지정보설정
+	var jsonObj = {
+		"defaultYn"			: defaultYn
+		, "recipNm"			: $("#deliveryAddrForm input[name=recipNm]").val()
+		, "recipPhnno"		: $("#deliveryAddrForm input[name=recipPhnno]").val()
+		, "recipZipcode"	: $("#deliveryAddrForm input[name=recipZipcode]").val()
+		, "recipBaseAddr"	: $("#deliveryAddrForm input[name=recipBaseAddr]").val()
+		, "recipDtlAddr"	: $("#deliveryAddrForm input[name=recipDtlAddr]").val()
+		, "delvMemo"		: $("#deliveryAddrForm input[name=rdi-request1]:checked").parent().find('span').text()
+	}
+	
+	var jsonData = JSON.stringify(jsonObj);jsonObj
+	
+	$.ajax( {
+		type		: "POST",
+		url 		: '/order/createCustDeliveryAddr',
+		data		: jsonData,
+		dataType 	: 'html',
+		beforeSend : function(xhr, settings) {
+			xhr.setRequestHeader("AJAX"			, "true");
+			xhr.setRequestHeader('Accept'		, 'application/json');
+			xhr.setRequestHeader('Content-Type'	, 'application/json');
+			gagajf.showProgressbar(true);
+		},
+		success 	: function(result) {
+			
+			// 배송지변경팝업호출
+			$.ajax( {
+				type		: "POST",
+				url 		: '/order/delvAddrChangePop',
+				data		: jsonData,
+				dataType 	: 'html',
+				beforeSend : function(xhr, settings) {
+					xhr.setRequestHeader("AJAX"			, "true");
+					xhr.setRequestHeader('Accept'		, 'application/json');
+					xhr.setRequestHeader('Content-Type'	, 'application/json');
+					gagajf.showProgressbar(true);
+				},
+				success 	: function(result) {
+					$("#adrsAddPop").html(result);
+					$("#adrsAddPop").modal("show");
+				}
+			});	
+		}
+	});
+});
+</script>
+
+
+
+
+
+
+
+
+

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

@@ -1,4 +1,5 @@
 <!-- 배송지변경 팝업 -->
+<form name="delvAddrChangeForm" id="delvAddrChangeForm">
 <div class="modal-dialog" role="document">
 	<div class="modal-content">
 		<div class="modal-header">
@@ -7,76 +8,129 @@
 		<div class="modal-body">
 			<div class="pop_cont">
 				<ul>
-					<li>
-						<div class="adrs_box">
-							<dl>
-								<div>
-									<dt><span class="sr-only">배송지명</span></dt>
-									<dd>홍길동 
-										<span class="icon_tag"> 
-											<em class="tag_stype1">기본 배송지</em>
-											<em class="tag_stype2">총알배송</em>
-										</span>
-									</dd>
-								</div>
-								<div>
-									<dt><span class="sr-only">배송주소</span></dt>
-									<dd>서울시 영등포구 은행로 11,8층(여의도동,일신빌딩)</dd>
-								</div>
-								<div>
-									<dt><span class="sr-only">휴대폰 번호</span></dt>
-									<dd>010-1234-5647</dd>
-								</div>
-								<div>
-									<dt>배송요청 사항</dt>
-									<dd>직접받고 부재 시 문앞</dd>
-								</div>
-								<button class="btn btn_default btn_sm" id="btn_addrModify_pop">
-									<span>수정</span>
-								</button>
-								<button class="btn btn_dark btn_sm" id="">
-									<span>선택</span>
-								</button>
-							</dl>
-						</div>
-					</li>
-					<li>
-						<div class="adrs_box">
-							<dl>
-								<div>
-									<dt><span class="sr-only">배송지명</span></dt>
-									<dd>홍길동 <span class="icon_tag"> <em class="tag_stype1">기본 배송지</em> <em class="tag_stype2">총알배송</em></span></dd>
-								</div>
-								<div>
-									<dt><span class="sr-only">배송주소</span></dt>
-									<dd>서울시 영등포구 은행로 11,8층(여의도동,일신빌딩)</dd>
-								</div>
-								<div>
-									<dt><span class="sr-only">휴대폰 번호</span></dt>
-									<dd>010-1234-5647</dd>
-								</div>
-								<div>
-									<dt>배송요청 사항</dt>
-									<dd>직접받고 부재 시 문앞</dd>
-								</div>
-								<button class="btn btn_default btn_sm"
-									id="btn_addrModify_pop">
-									<span>수정</span>
-								</button>
-								<button class="btn btn_dark btn_sm" id="">
-									<span>선택</span>
-								</button>
-							</dl>
-						</div>
-					</li>
+					<!-- 배송지목록 -->
+					<th:block th:each="deliveryAddr, index : ${deliveryAddrList}">
+						<li>
+							<div class="adrs_box">
+								<dl>
+									<div>
+										<input type="hidden" name="recipNm" 			th:value="${deliveryAddr.recipNm}"/>
+										<input type="hidden" name="recipPhnno" 			th:value="${deliveryAddr.recipPhnno}"/>
+										<input type="hidden" name="recipZipcode" 		th:value="${deliveryAddr.recipZipcode}"/>
+										<input type="hidden" name="recipBaseAddr" 		th:value="${deliveryAddr.recipBaseAddr}"/>
+										<input type="hidden" name="recipDtlAddr" 		th:value="${deliveryAddr.recipDtlAddr}"/>
+										<input type="hidden" name="delvMemo" 			th:value="${deliveryAddr.delvMemo}"/>
+										
+										<dt><span class="sr-only">배송지명</span></dt>
+										<dd>
+											<th:block th:text="${deliveryAddr.recipNm}"></th:block>
+											<span class="icon_tag">
+												<th:block th:if="${deliveryAddr.defaultYn} == 'Y'">
+													<em class="tag">기본 배송지</em>
+												</th:block>
+												<th:block th:if="${deliveryAddr.shotDelvUseYn} == 'Y'">
+													<em class="tag primary_line">총알배송</em>
+												</th:block>
+											</span>
+										</dd>
+									</div>
+									<div>
+										<dt><span class="sr-only">휴대폰 번호</span></dt>
+										<dd th:text="${deliveryAddr.recipPhnno}"></dd>
+									</div>
+									<div>
+										<dt><span class="sr-only">배송주소</span></dt>
+										<dd th:text="${deliveryAddr.recipBaseAddr} + ' ' + ${deliveryAddr.recipDtlAddr}"></dd>
+									</div>
+									<div>
+										<dt>배송요청 사항</dt>
+										<dd th:text="${deliveryAddr.delvMemo}"></dd>
+									</div>
+									<button type="button" class="btn btn_default btn_sm btn_addrModify_pop" th:value="${deliveryAddr.custDelvAddrSq}"><span>수정</span></button>
+									<button type="button" class="btn btn_dark btn_sm btn_sel_delvAddr" th:value="${deliveryAddr.custDelvAddrSq}"><span>선택</span></button>
+								</dl>
+							</div>
+						</li>
+					</th:block>
+					<!-- //배송지목록 -->
 				</ul>
-				<div class="btn_group_block">
-					<button class="btn btn_dark btn_block" id="btn_addrAdd_pop">
-						<span>배송지 추가</span>
-					</button>
-				</div>
 			</div>
 		</div>
+		<div class="modal-footer">
+			<button class="btn btn_dark" id="btn_addrAdd_pop"><span>배송지 추가</span></button>
+		</div>
 	</div>
 </div>
-<!-- //배송지변경 팝업 -->
+<a href="#close-modal" rel="modal:close" id="adrsChangePop_close" class="close-modal">Close</a>
+</form>
+<!-- //배송지변경 팝업 -->
+
+<script th:inline="javascript">
+//컨텐츠 호출
+$(document).ready( function() {
+});
+
+// 2. 버튼기능구현
+// 2.1 배송지변경 팝업열기
+$('#btn_addrAdd_pop').on("click", function(){
+	$.ajax( {
+		type		: "POST",
+		url 		: '/order/delvAddrAddPop',
+		data		: jsonData,
+		dataType 	: 'html',
+		beforeSend : function(xhr, settings) {
+			xhr.setRequestHeader("AJAX"			, "true");
+			xhr.setRequestHeader('Accept'		, 'application/json');
+			xhr.setRequestHeader('Content-Type'	, 'application/json');
+			gagajf.showProgressbar(true);
+		},
+		success 	: function(result) {
+			$("#adrsChangePop").html(result);
+			$("#adrsChangePop").modal("show");
+		}
+	});	
+});
+
+// 2.2 배송지선택버튼
+$(".btn_sel_delvAddr").on("click", function(){
+	// 배송지정보 새로고침
+	jsonObj.custDelvAddrSq = $(this).attr("value");
+	jsonObj.dispYn = "Y";
+	
+	// 배송지정보로드실행
+	deliveryAddrInfoSet(false);
+	
+	// 팝업닫기
+	$(".close-modal").trigger("click");
+});
+
+// 2.3 배송지수정버튼
+$(".btn_addrModify_pop").on("click", function(){
+		
+	var obj = {
+		"custDelvAddrSq" : $(this).attr("value")
+	} 
+	
+	$.ajax( {
+		type		: "POST",
+		url 		: '/order/delvAddrModifyPop',
+		data		: JSON.stringify(obj),
+		dataType 	: 'html',
+		beforeSend : function(xhr, settings) {
+			xhr.setRequestHeader("AJAX"			, "true");
+			xhr.setRequestHeader('Accept'		, 'application/json');
+			xhr.setRequestHeader('Content-Type'	, 'application/json');
+			gagajf.showProgressbar(true);
+		},
+		success 	: function(result) {
+			$("#adrsModifyPop").html(result);
+			$("#adrsModifyPop").modal("show");
+		}
+	});	
+});
+
+
+
+
+
+</script>

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

@@ -1,4 +1,10 @@
 <!-- 배송지수정 팝업 -->
+<form name="delvAddrChangeForm" id="delvAddrChangeForm">
+<input type="hidden" name="delvMemo" 			th:value="${deliveryAddrInfo.delvMemo}"/>
+<input type="hidden" name="recipZipcode" 		th:value="${deliveryAddrInfo.recipZipcode}"/>
+<input type="hidden" name="recipBaseAddr" 		th:value="${deliveryAddrInfo.recipBaseAddr}"/>
+<input type="hidden" name="recipDtlAddr" 		th:value="${deliveryAddrInfo.recipDtlAddr}"/>
+										
 <div class="modal-dialog" role="document">
 	<div class="modal-content">
 		<div class="modal-header">
@@ -6,87 +12,120 @@
 		</div>
 		<div class="modal-body">
 			<div class="pop_cont">
-				<div class="area_adrsinfo">
-					<div class="form_field">
-						<label class="input_label sr-only">이름(주문자명)</label>
-						<div class="ui_col_12">
-							<div class="input_wrap">
-								<input type="text" name="userName" placeholder="이름(주문자명)" id="txtName">
+				<form class="form_wrap form_full">
+					<div class="area_adrsinfo">
+						<div class="form_field">
+							<label class="input_label sr-only">이름(주문자명)</label>
+							<div class="ui_col_12">
+								<div class="input_wrap">
+									<input type="text" name="recipNm" placeholder="이름(주문자명)" th:value="${deliveryAddrInfo.recipNm}">
+								</div>
 							</div>
 						</div>
-					</div>
-					<div class="form_field">
-						<label class="input_label sr-only">휴대폰 번호</label>
-						<div class="ui_col_12">
-							<div class="input_wrap">
-								<input type="text" name="userPhone" placeholder="휴대폰 번호" id="userPhone">
+						<div class="form_field">
+							<label class="input_label sr-only">휴대폰 번호</label>
+							<div class="ui_col_12">
+								<div class="input_wrap">
+									<input type="text" name="recipPhnno" placeholder="휴대폰 번호" th:value="${deliveryAddrInfo.recipPhnno}">
+								</div>
 							</div>
 						</div>
-					</div>
-					<div class="form_field">
-						<label class="input_label sr-only">배송주소</label>
-						<div class="ui_col_12">
-							<div class="input_wrap">
-								<input type="text" name="userNumber" placeholder="배송주소" id="">
-								<button type="button" class="btn btn_dark btn_default btn_postcode">
-									<span>우편번호 찾기</span>
-								</button>
+						<div class="form_field">
+							<label class="input_label sr-only">배송주소</label>
+							<div class="ui_col_12">
+								<div class="input_wrap">
+									<input type="text" name="recipZipcode" placeholder="배송주소" th:value="${deliveryAddrInfo.recipZipcode}">
+									<button type="button" class="btn btn_dark btn_default btn_postcode" onclick="fnOpenDaumAddr();">
+										<span>우편번호 찾기</span>
+									</button>
+								</div>
 							</div>
 						</div>
+						<!-- 주소 출력 -->
+						<div class="adress">
+							<dl>
+								<div>
+									<dt><span>도로명</span></dt>
+									<dd class="recipBaseAddr" th:text="${deliveryAddrInfo.recipBaseAddr}"></dd>
+								</div>
+								<div>
+									<dt><span>지번</span></dt>
+									<dd class="recipDtlAddr" th:text="${deliveryAddrInfo.recipDtlAddr}"></dd>
+								</div>
+							</dl>
+						</div>
+						<!-- //주소 출력 -->
 					</div>
-					<!-- 주소 출력 -->
-					<div class="adress">
-						<dl>
+					<div class="area_request">
+						<h6>배송요청 사항</h6>
+						<div class="form_field">
 							<div>
-								<dt><span>도로명</span></dt>
-								<dd>서울시 영등포구 은행로 11, 일신빌딩 8층</dd>
+								<input type="radio" name="rdi-request2" id="rdi-request21"> 
+								<label for="rdi-request21"><span>문앞</span></label>
 							</div>
 							<div>
-								<dt><span>지번</span></dt>
-								<dd>서울특별시 영등포구 여의도동 15-15 일신빌딩 8층</dd>
+								<input type="radio" name="rdi-request2" id="rdi-request22">
+								<label for="rdi-request22"><span>직접받고 부재시 문 앞</span></label>
 							</div>
-						</dl>
-					</div>
-					<!-- //주소 출력 -->
-				</div>
-				<div class="area_request">
-					<h6>배송요청 사항</h6>
-					<div class="form_field">
-						<div>
-							<input type="radio" name="rdi-request2" id="rdi-request21" value="" checked=""> 
-							<label for="rdi-request21"><span>문앞</span></label>
-						</div>
-						<div>
-							<input type="radio" name="rdi-request2" id="rdi-request22" value="" checked=""> 
-							<label for="rdi-request22"><span>직접받고 부재시 문 앞</span></label>
-						</div>
-						<div>
-							<input type="radio" name="rdi-request2" id="rdi-request23" value="" checked=""> 
-							<label for="rdi-request23"><span>경비실</span></label>
-						</div>
-						<div>
-							<input type="radio" name="rdi-request2" id="rdi-request24" value="" checked=""> 
-							<label for="rdi-request24"><span>택배함</span></label>
-						</div>
-						<div>
-							<input type="radio" name="rdi-request2" id="rdi-request25" value="" checked=""> 
-							<label for="rdi-request25"><span>기타사항</span></label>
-							<div class="info_box">
-								<div class="input_wrap">
-									<input type="text" class="form_control" maxlength="30" placeholder="보관장소만 입력">
-									<p>보관 장소 외 다른 내용 입력시 통보없이 삭제 될 수 있습니다.</p>
+							<div>
+								<input type="radio" name="rdi-request2" id="rdi-request23"> 
+								<label for="rdi-request23"><span>경비실</span></label>
+							</div>
+							<div>
+								<input type="radio" name="rdi-request2" id="rdi-request24"> 
+								<label for="rdi-request24"><span>택배함</span></label>
+							</div>
+							<div>
+								<input type="radio" name="rdi-request2" id="rdi-request25"> 
+								<label for="rdi-request25"><span>기타사항</span></label>
+								<div class="info_box">
+									<div class="input_wrap">
+										<input type="text" class="form_control" maxlength="30" placeholder="보관장소만 입력">
+										<p>보관 장소 외 다른 내용 입력시 통보없이 삭제 될 수 있습니다.</p>
+									</div>
 								</div>
 							</div>
 						</div>
 					</div>
-				</div>
-				<div class="btn_group_block">
-					<button class="btn btn_dark btn_block">
-						<span>배송지 수정완료</span>
-					</button>
-				</div>
+					<div class="btn_group_block">
+						<button type="button" class="btn btn_dark btn_block"><span>배송지 수정완료</span></button>
+					</div>
+				</form>
 			</div>
 		</div>
 	</div>
 </div>
-<!-- //배송지수정 팝업 -->
+<a href="#close-modal" rel="modal:close" id="adrsModifyPop_close" class="close-modal">Close</a>
+</form>
+<!-- //배송지수정 팝업 -->
+
+<script th:inline="javascript">
+
+//우편번호 DAUM을 이용한 우편번호 팝업 레이어
+var fnOpenDaumAddr = function() {
+	let daumZip = new daum.Postcode({
+		oncomplete: function(data) {
+			$('#deliveryAddrForm input[name=recipZipcode]').val(data.zonecode);
+			$('#deliveryAddrForm input[name=recipBaseAddr]').val(cfnGetDaumRoadAddr(data));
+			$('#deliveryAddrForm input[name=recipDtlAddr]').focus();
+			
+			$('#deliveryAddrForm .recipBaseAddr').text(cfnGetDaumRoadAddr(data));
+			cfnCloseDaumAddr();
+		},
+		width: '100%'
+	});
+	
+	cfnOpenDaumAddr(daumZip);
+}
+
+$(document).ready( function() {
+	var delvMemo = $("#delvAddrChangeForm input[name=delvMemo]").val();
+	
+	$("#delvAddrChangeForm input[name=rdi-request2]").each(function(){
+		if (delvMemo == $(this).parent().find("span").text()) {
+			$(this).attr("checked", true);
+		}
+	});
+});
+</script>
+

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

@@ -28,6 +28,7 @@
 <form id="order_info" name="order_info" method="post" action="/order/pay/result/response" ></form>
 
 <!-- 주문고객정보 -->
+<form id="orderForm" name="orderForm">
 <table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none;" name="orderInfo" id="orderInfo">
 	<tbody>
 		<tr style="height:30px;">
@@ -331,266 +332,83 @@
 							
 							<div class="area_paybtn">
 								<div class="form_field">
-									<button type="button" class="btn btn_primary btn_block">
-										<span>동의 후 <em>123,456,789원</em> 결제하기</span>
+									<button type="button" class="btn btn_primary btn_block" id="btn_payment">
+										<span>동의 후 <em class="realOrdAmt"></em> 결제하기</span>
 									</button>
 								</div>
 							</div>
 						</div>
 					</form>
 				</div>
-				
-				
+
 				<div class="od_side">
 					<div class="area_order">
 						<div class="tit_box">
 							<h3>주문내역</h3>
-							<span> <em class="number">14</em>개의 상품
+							<span> <em class="number" th:text="${goodsTotCnt}"></em> 개의 상품
 							</span>
 						</div>
-						<div class="od_item_box">
-							<!-- 총알배송 -->
-							<div class="part_dlvr">
-								<h4 class="subH3">
-									STYLE24 총알배송 <span>오늘 자정까지 도착</span>
-								</h4>
-								<div class="gd_list">
-									<div class="item_gd">
-										<figure>
-											<span class="thumb"><img
-												src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
-											<figcaption>
-												<div class="brand">CURLYSUE 컬리수</div>
-												<div class="name">[★2020 겨울신상★] 리버시블 경량점퍼 CPW0XQJM51
-													[겨울] 리버시블 경량점퍼 CPW0XQJM51 [겨울]</div>
-												<div class="option">
-													<span>01_루돌프융기모상하복_D오렌지/110</span> <span>수량:<em>99</em>개
-													</span>
-												</div>
-												<div class="price">
-													<span class="selling_price">1,000,000</span>
-												</div>
-											</figcaption>
-										</figure>
-									</div>
-									<div class="item_gd">
-										<figure>
-											<span class="thumb"><img
-												src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
-											<figcaption>
-												<div class="brand">CURLYSUE 컬리수</div>
-												<div class="name">[★2020 겨울신상★] 리버시블 경량점퍼 CPW0XQJM51
-													[겨울] 리버시블 경량점퍼 CPW0XQJM51 [겨울]</div>
-												<div class="option">
-													<span>01_루돌프융기모상하복_D오렌지/110</span> <span>수량:<em>99</em>개
-													</span>
-												</div>
-												<div class="price">
-													<span class="selling_price">1,000,000</span>
-												</div>
-											</figcaption>
-										</figure>
-									</div>
-								</div>
-							</div>
-							<!-- //총알배송 -->
-							<!-- 일반배송 -->
-							<div class="part_dlvr">
-								<h4 class="subH3">STYLE24 일반배송</h4>
-								<div class="gd_list">
-									<div class="item_gd">
-										<figure>
-											<span class="thumb"><img
-												src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
-											<figcaption>
-												<div class="brand">CURLYSUE 컬리수</div>
-												<div class="name">[★2020 겨울신상★] 리버시블 경량점퍼 CPW0XQJM51
-													[겨울] 리버시블 경량점퍼 CPW0XQJM51 [겨울]</div>
-												<div class="option">
-													<span>01_루돌프융기모상하복_D오렌지/110</span> <span>수량:<em>99</em>개
-													</span>
-												</div>
-												<div class="price">
-													<span class="selling_price">1,000,000</span>
-												</div>
-											</figcaption>
-										</figure>
-									</div>
-									<div class="item_gd">
-										<figure>
-											<span class="thumb"><img
-												src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
-											<figcaption>
-												<div class="brand">CURLYSUE 컬리수</div>
-												<div class="name">[★2020 겨울신상★] 리버시블 경량점퍼 CPW0XQJM51
-													[겨울] 리버시블 경량점퍼 CPW0XQJM51 [겨울]</div>
-												<div class="option">
-													<span>01_루돌프융기모상하복_D오렌지/110</span> <span>수량:<em>99</em>개
-													</span>
-												</div>
-												<div class="price">
-													<span class="selling_price">1,000,000</span>
-												</div>
-											</figcaption>
-										</figure>
-									</div>
-								</div>
-							</div>
-							<!-- //일반배송 -->
-							<!-- 업체직배송 -->
-							<div class="part_dlvr">
-								<h4 class="subH3">업체직배송</h4>
-								<div class="gd_list">
-									<div class="item_gd">
-										<figure>
-											<span class="thumb"><img
-												src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
-											<figcaption>
-												<div class="brand">CURLYSUE 컬리수</div>
-												<div class="name">[★2020 겨울신상★] 리버시블 경량점퍼 CPW0XQJM51
-													[겨울] 리버시블 경량점퍼 CPW0XQJM51 [겨울]</div>
-												<div class="option">
-													<span>01_루돌프융기모상하복_D오렌지/110</span> <span>수량:<em>99</em>개
-													</span>
-												</div>
-												<div class="price">
-													<span class="selling_price">1,000,000</span>
-												</div>
-											</figcaption>
-										</figure>
-									</div>
-								</div>
-								<div class="gd_list">
-									<div class="item_gd">
-										<figure>
-											<span class="thumb"><img
-												src="/images/pc/thumb/tmp_odSide2.jpg" alt=""></span>
-											<figcaption>
-												<div class="brand">CURLYSUE 컬리수</div>
-												<div class="name">[★2020 겨울신상★] 리버시블 경량점퍼 CPW0XQJM51
-													[겨울] 리버시블 경량점퍼 CPW0XQJM51 [겨울]</div>
-												<div class="option">
-													<span>01_루돌프융기모상하복_D오렌지/110</span> <span>수량:<em>99</em>개
-													</span>
-												</div>
-												<div class="price">
-													<span class="selling_price">1,000,000</span>
-												</div>
-											</figcaption>
-										</figure>
-									</div>
-								</div>
-							</div>
-							<!-- //업체직배송 -->
-							<!-- 예약배송 -->
-							<div class="part_dlvr">
-								<h4 class="subH3">예약배송</h4>
-								<div class="gd_list">
-									<div class="item_gd">
-										<figure>
-											<span class="thumb"><img
-												src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
-											<figcaption>
-												<div class="brand">CURLYSUE 컬리수</div>
-												<div class="name">[★2020 겨울신상★] 리버시블 경량점퍼 CPW0XQJM51
-													[겨울] 리버시블 경량점퍼 CPW0XQJM51 [겨울]</div>
-												<div class="option">
-													<span>01_루돌프융기모상하복_D오렌지/110</span> <span>수량:<em>99</em>개
-													</span>
-												</div>
-												<div class="price">
-													<span class="selling_price">1,000,000</span>
-												</div>
-											</figcaption>
-										</figure>
-										<p class="info_reserv">
-											<i class="ico ico_calender"></i><span>2021.01.15</span>
-											배송예정상품
-										</p>
-									</div>
-									<div class="item_gd">
-										<figure>
-											<span class="thumb"><img
-												src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
-											<figcaption>
-												<div class="brand">CURLYSUE 컬리수</div>
-												<div class="name">[★2020 겨울신상★] 리버시블 경량점퍼 CPW0XQJM51
-													[겨울] 리버시블 경량점퍼 CPW0XQJM51 [겨울]</div>
-												<div class="option">
-													<span>01_루돌프융기모상하복_D오렌지/110</span> <span>수량:<em>99</em>개
-													</span>
-												</div>
-												<div class="price">
-													<span class="selling_price">1,000,000</span>
-												</div>
-											</figcaption>
-										</figure>
-										<p class="info_reserv">
-											<i class="ico ico_calender"></i><span>2021.01.15</span>
-											배송예정상품
-										</p>
-									</div>
-								</div>
-							</div>
-							<!-- //예약배송 -->
-						</div>
+						
+						<div id="orderListInfo" style="display:none"></div>
+						
 						<div class="od_amount_box">
 							<dl>
 								<div>
 									<dt>상품금액</dt>
-									<dd>1,590,000 원</dd>
+									<dd id="orgGoodsSumAmt" th:text="|${#numbers.formatInteger(orgGoodsSumAmt, 1, 'COMMA')} 원|"></dd>
 								</div>
 								<div>
 									<dt>배송비</dt>
-									<dd>0원</dd>
+									<dd id="delvSumAmt" th:text="|${#numbers.formatInteger(sumDelvFee, 1, 'COMMA')} 원|"></dd>
 								</div>
 								<div>
 									<dt>할인금액</dt>
-									<dd>
-										<span class="disc_amount">-1,746,500원</span>
-									</dd>
+									<th:block th:if="${cpn1DcSumAmt} > 0">
+										<dd><span class="disc_amount" id="cpn1DcSumAmt" th:text="|-${#numbers.formatInteger(cpn1DcSumAmt, 1, 'COMMA')} 원|"></span></dd>
+									</th:block>
+									<th:block th:if="${cpn1DcSumAmt} < 1">
+										<dd><span class="disc_amount" id="cpn1DcSumAmt" th:text="|${#numbers.formatInteger(cpn1DcSumAmt, 1, 'COMMA')} 원|"></span></dd>
+									</th:block>
 								</div>
 								<div>
-									<dt>다다익선할인</dt>
-									<dd>
-										<span class="disc_amount">25,000원</span>
-									</dd>
+									<dt>다다익선할인금액</dt>
+									<th:block th:if="${tmtbDcSumAmt} > 0">
+										<dd><span class="disc_amount" id="tmtbDcSumAmt" th:text="|-${#numbers.formatInteger(tmtbDcSumAmt, 1, 'COMMA')} 원|"></span></dd>
+									</th:block>
+									<th:block th:if="${tmtbDcSumAmt} < 1">
+										<dd><span class="disc_amount" id="tmtbDcSumAmt" th:text="|${#numbers.formatInteger(tmtbDcSumAmt, 1, 'COMMA')} 원|"></span></dd>
+									</th:block>
 								</div>
 								<div>
 									<dt>쿠폰할인</dt>
-									<dd>
-										<span class="disc_amount">3,000원</span>
-									</dd>
+									<dd><span class="disc_amount" id="couponDcSumAmt"></span></dd>
 								</div>
 								<div>
 									<dt>선포인트 사용</dt>
-									<dd>
-										<span class="disc_amount">-1,500P</span>
-									</dd>
+									<th:block th:if="${prePntDcAmt} > 0">
+										<dd><span class="disc_amount" id="prePntDcAmt" th:text="|-${#numbers.formatInteger(prePntDcAmt, 1, 'COMMA')} 원|"></span></dd>
+									</th:block>
+									<th:block th:if="${prePntDcAmt} < 1">
+										<dd><span class="disc_amount" id="prePntDcAmt" th:text="|${#numbers.formatInteger(prePntDcAmt, 1, 'COMMA')} 원|"></span></dd>
+									</th:block>
 								</div>
 								<div>
 									<dt>포인트 사용</dt>
-									<dd>
-										<span class="disc_amount">-5,500P</span>
-									</dd>
+									<dd><span class="disc_amount" id="pntDcAmt"></span></dd>
 								</div>
 								<div>
 									<dt>상품권 사용</dt>
-									<dd>
-										<span class="disc_amount">-50,000원</span>
-									</dd>
+									<dd><span class="disc_amount" id="gfcdUseAmt"></span></dd>
 								</div>
 							</dl>
 						</div>
 						<div class="totalprice_box">
 							<dl>
 								<dt>총 결제 예정 금액</dt>
-								<dd>
-									<span>3,546,200</span>원
-								</dd>
+								<dd><span id="realOrdAmt"></span> 원</dd>
 							</dl>
 							<p class="info_point">
-								<span class="save_point">3,500 P</span> 적립예정
+								<span span class="save_point" id="savePntSumAmt" th:text="|${#numbers.formatInteger(savePntSumAmt, 1, 'COMMA')} P|"></span> 적립예정
 							</p>
 						</div>
 					</div>
@@ -600,6 +418,19 @@
 		</div>
 	</div>
 </div>
+</form>
+
+<!-- 배송지변경 -->
+<div class="modal fade od_pop adrsChange_pop" id="adrsChangePop" tabindex="-1" role="dialog" aria-labelledby="adrsChangeLabel" aria-hidden="true"></div>
+<!-- //배송지변경 -->
+
+<!-- 배송지추가 팝업 -->
+<div class="modal fade od_pop adrsAdd_pop" id="adrsAddPop" tabindex="-1" role="dialog" aria-labelledby="adrsAddLabel" aria-hidden="true"></div>
+<!-- //배송지추가 팝업 -->
+
+<!-- 배송지수정 팝업 -->
+<div class="modal fade od_pop adrsModify_pop" id="adrsModifyPop" tabindex="-1" role="dialog" aria-labelledby="adrsModifyLabel" aria-hidden="true"></div>
+<!-- //배송지수정 팝업 -->
 
 <script th:inline="javascript">
 // 배송관련정보 변수선언
@@ -631,7 +462,6 @@ var cpnApplyTemp		= false;
 
 //AJAX 로드를 위한 변수 설정
 var jsonObj 			= {};
-var jsonData			= null;
 
 // 컨텐츠 호출
 $(document).ready( function() {
@@ -652,12 +482,13 @@ $(document).ready( function() {
 		, "shotDelvYn"		: shotDelvUseYn
 		, "foreignBuyYn"	: foreignBuyYn
 		, "orderMadeYn"		: orderMadeYn
+		, "custDelvAddrSq"	: 0
 	}
 	
 	jsonData = JSON.stringify(jsonObj);
 
 	// 1. AJAX 정보(회원정보로드)
-	custemerInfoSet(jsonData);
+	custemerInfoSet();
 	
 	// 999. 개발화면정보설정
 	var devTemp = false;
@@ -683,11 +514,12 @@ $(document).ready( function() {
 
 // 1. 함수기능 정의
 // 1.1 고객정보로드
-var custemerInfoSet = function(jsonData) {
+var custemerInfoSet = function() {
+	
 	$.ajax( {
 		type		: "POST",
 		url 		: '/order/custemerInfo',
-		data		: jsonData,
+		data		: JSON.stringify(jsonObj),
 		dataType 	: 'html',
 		beforeSend : function(xhr, settings) {
 			xhr.setRequestHeader("AJAX"			, "true");
@@ -706,17 +538,18 @@ var custemerInfoSet = function(jsonData) {
 				$(".cellPhnno").text($("input[name='cellPhnno']").val());
 			}
 			// 1.2 배송정보로드
-			deliveryAddrInfoSet(jsonData);
+			deliveryAddrInfoSet(true);
 		}
 	});
 }
 
 // 1.2 배송정보로드
-var deliveryAddrInfoSet = function(jsonData) {
+var deliveryAddrInfoSet = function(temp) {
+	
 	$.ajax( {
 		type		: "POST",
 		url 		: '/order/deliveryAddrInfo',
-		data		: jsonData,
+		data		: JSON.stringify(jsonObj),
 		dataType 	: 'html',
 		beforeSend : function(xhr, settings) {
 			xhr.setRequestHeader("AJAX"			, "true");
@@ -725,21 +558,41 @@ var deliveryAddrInfoSet = function(jsonData) {
 			gagajf.showProgressbar(true);
 		},
 		success 	: function(result) {
-			if (result != null) {
-				$("#deliveryAddrInfo").css("display", "block");
-				$("#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());
-			}
 			
+			$("#deliveryAddrInfo").css("display", "block");
+			$("#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());
+			
+			// 2. 버튼기능구현
+			// 2.1 배송지변경 팝업열기
+			$('#btn_adrsChange_pop').on("click", function(){
+				$.ajax( {
+					type		: "POST",
+					url 		: '/order/delvAddrChangePop',
+					data		: JSON.stringify(jsonObj),
+					dataType 	: 'html',
+					beforeSend : function(xhr, settings) {
+						xhr.setRequestHeader("AJAX"			, "true");
+						xhr.setRequestHeader('Accept'		, 'application/json');
+						xhr.setRequestHeader('Content-Type'	, 'application/json');
+						gagajf.showProgressbar(true);
+					},
+					success 	: function(result) {
+						$("#adrsAddPop").html(result);
+						$("#adrsAddPop").modal("show");
+					}
+				});	
+			});
+
 			// 1.3 총알배송가능 지역, 총알배송 가능 시간 체크(초기로드정보)
-			fnGetDailyDeliveryCheck(true);
+			fnGetDailyDeliveryCheck(temp);
 		}
 	});
 }
@@ -747,6 +600,8 @@ var deliveryAddrInfoSet = function(jsonData) {
 // 1.3 총알배송가능 지역, 총알배송 가능 시간 체크
 var fnGetDailyDeliveryCheck = function (temp) {
 	
+	jsonData = JSON.stringify(jsonObj);
+	
 	// 장바구니 총알배송 사용여부 체크 N
 	if (shotDelvUseYn == "N") {
 		// 초기에 한번 데이타 로드
@@ -790,7 +645,6 @@ var fnGetDailyDeliveryCheck = function (temp) {
 						orderListInfoSet(orderListJsonData, temp);
 					}
 				}
-				
 				shotDelvYn = tempShotDelvYn;
 			}
 		)
@@ -818,19 +672,19 @@ var orderListInfoSet = function(orderListJsonData, temp) {
 			
 			// 1.5 사은품정보로드
 			if (temp) {
-				freegiftInfoSet(jsonData);
+				freegiftInfoSet();
 			}
 		}
 	});
 }
 
 // 1.5 사은품정보로드
-var freegiftInfoSet = function(jsonData) {
+var freegiftInfoSet = function() {
 	
 	$.ajax( {
 		type		: "POST",
 		url 		: '/order/freegiftInfo',
-		data		: jsonData,
+		data		: JSON.stringify(jsonObj),
 		dataType 	: 'html',
 		beforeSend : function(xhr, settings) {
 			xhr.setRequestHeader("AJAX"			, "true");
@@ -885,17 +739,18 @@ var freegiftInfoSet = function(jsonData) {
 			}
 			
 			// 1.6 결제타입로드
-			paymentInfoSet(jsonData);
+			paymentInfoSet();
 		}
 	});
 }
 
 // 1.6 결제타입로드 (결제버튼기능구현)
-var paymentInfoSet = function(jsonData) {
+var paymentInfoSet = function() {
+	
 	$.ajax( {
 		type		: "POST",
 		url 		: '/order/paymentInfo',
-		data		: jsonData,
+		data		: JSON.stringify(jsonObj),
 		dataType 	: 'html',
 		beforeSend : function(xhr, settings) {
 			xhr.setRequestHeader("AJAX"			, "true");
@@ -1007,12 +862,10 @@ var paymentInfoSet = function(jsonData) {
 						,"freegiftUsePointArr"	: $(".freegiftUsePointArr").text().split(",")
 					};
 					
-					var orderData = JSON.stringify(orderData);
-					
 					$.ajax( {
 						type		: "POST",
 						url 		: '/order/create/preOrder',
-						data		: orderData,
+						data		: JSON.stringify(orderData),
 						dataType 	: 'html',
 						beforeSend : function(xhr, settings) {
 							xhr.setRequestHeader("AJAX"			, "true");
@@ -1030,7 +883,7 @@ var paymentInfoSet = function(jsonData) {
 								fnNaverPaymentReady();
 							} else if (pgGb == "KAKAO") {
 								fnKakaoPaymentReady();
-							} else if (pgGb == "KCP") {
+							} else if (pgGb == "KCP" || pgGb == "PAYCO") {
 								jsf__pay(document.order_info);
 							}
 						}
@@ -1050,14 +903,12 @@ var serialCpnApply = function(){
 		rdCpnNm : $("#payForm #serialCpnNm").val()
 	}
 
-	let jsonData = JSON.stringify(data);
-
 	$.ajax( {
 		type			: "POST",
 		url 			: '/cart/list/serialCpnApply',
 		contentType		: 'application/json',
 		dataType 		: 'json',
-		data 			: jsonData,
+		data 			: JSON.stringify(data),
 		success 		: function(result) {
 			var jsonObj 	= {"cartSqArr" : cartSqArr,"dispYn" : "Y"};
 			var jsonData 	= JSON.stringify(jsonObj);
@@ -1074,12 +925,12 @@ var serialCpnApply = function(){
 }
 
 // 1.8 할인영역 설정 (쿠폰, 선포인트, 포인트, 상품권)
-var dcAmtInfoSet = function(jsonData) {
+var dcAmtInfoSet = function() {
 	// 1.8.1 할인정보로드
 	$.ajax( {
 		type		: "POST",
 		url 		: '/order/dcAmtInfo',
-		data		: jsonData,
+		data		: JSON.stringify(jsonObj),
 		dataType 	: 'html',
 		beforeSend : function(xhr, settings) {
 			xhr.setRequestHeader("AJAX"			, "true");
@@ -1589,7 +1440,7 @@ var prePntDcAmtReset = function() {
 var pntDcAmtReset = function() {
 	$(".pntDcSumAmt").text("0");
 	$("input[name='pntDcAmtStr']").val("");
-	$("#pntDcAmt").text("0원");
+	$("#pntDcAmt").text("0 원");
 	
 	// 상품권리셋기능
 	gfcdUseAmtReset();
@@ -1599,7 +1450,7 @@ var pntDcAmtReset = function() {
 var gfcdUseAmtReset = function() {
 	$(".gfcdUseSumAmt").text("0");
 	$("input[name='gfcdUseAmtStr']").val("");
-	$("#gfcdUseAmt").text("0원");
+	$("#gfcdUseAmt").text("0 원");
 	
 	// 금액전체계산
 	custCpnSumAmtCal();
@@ -1621,19 +1472,19 @@ var custCpnSumAmtCal = function() {
 	
 	// 쿠폰영역
 	if (cpnDcSumAmt > 0) {
-		$(".maxdisc_amount").text("(-"+cpnDcSumAmt.addComma()+"원)"); // 쿠폰할인금액합계	
+		$(".maxdisc_amount").text("(-"+cpnDcSumAmt.addComma()+" 원)"); // 쿠폰할인금액합계	
 	} else {
-		$(".maxdisc_amount").text("("+cpnDcSumAmt.addComma()+"원)"); // 쿠폰할인금액합계
+		$(".maxdisc_amount").text("("+cpnDcSumAmt.addComma()+" 원)"); // 쿠폰할인금액합계
 	}
 	
 	
-	$("#cpnApplyCnt").text(cpnApplyCnt + "장");
+	$("#cpnApplyCnt").text(cpnApplyCnt + " 장");
 	
 	// 상품목록영역
 	if (cpnDcSumAmt > 0) {
-		$("#couponDcSumAmt").text("-" + cpnDcSumAmt.addComma() + "원"); // 쿠폰할인금액합계
+		$("#couponDcSumAmt").text("-" + cpnDcSumAmt.addComma() + " 원"); // 쿠폰할인금액합계
 	} else {
-		$("#couponDcSumAmt").text(cpnDcSumAmt.addComma() + "원"); // 쿠폰할인금액합계
+		$("#couponDcSumAmt").text(cpnDcSumAmt.addComma() + " 원"); // 쿠폰할인금액합계
 	}
 	$(".cpnDcSumAmt").text(cpnDcSumAmt);
 	
@@ -1645,7 +1496,7 @@ var custCpnSumAmtCal = function() {
 			var delvSumAmt = parseInt(orgSumDelvFee) - parseInt($(this).parent().find("input[name='cpnDcAmt']").val());
 			
 			// 최종배송비
-			$("#delvSumAmt").text(delvSumAmt.addComma() + "원");
+			$("#delvSumAmt").text(delvSumAmt.addComma() + " 원");
 			$(".delvSumAmt").text(delvSumAmt);
 		}
 	});
@@ -1760,6 +1611,7 @@ var custCpnSumAmtCal = function() {
 	$(".savePntSumAmt").text(savePntSumAmt);
 	
 	$("#realOrdAmt").text(realOrdSumAmt.addComma()); // 총 결제 예정 금액
+	$(".realOrdAmt").text(realOrdSumAmt.addComma() + " 원"); // 총 결제 예정 금액
 	
 	var tempSavePnt			= savePntSumAmt - prePntDcAmt;
 	
@@ -1767,13 +1619,13 @@ var custCpnSumAmtCal = function() {
 	var rmPntAmt 			= parseInt($("input[name='rmPntAmt']").val());
 	var freegiftUsePnt 		= parseInt($(".freegiftUsePnt").text());
 	rmPntAmt 				= rmPntAmt - freegiftUsePnt; 
-	$(".rmPntAmt").text("보유 : " + rmPntAmt.addComma() + "P");
+	$(".rmPntAmt").text("보유 : " + rmPntAmt.addComma() + " P");
 	
 	// 걸제영역
-	$("#btn_payment").text("동의 후 "+realOrdSumAmt.addComma()+"원 결제하기");
+	//$("#btn_payment").text("동의 후 "+realOrdSumAmt.addComma()+" 원 결제하기");
 	
 	// 적립포인트
-	$("#savePntSumAmt").text(savePntSumAmt.addComma()+"P");
+	$("#savePntSumAmt").text(savePntSumAmt.addComma()+" P");
 	
 	// 사은품정보 설정
 	var freegiftValArr 			= [];
@@ -1801,11 +1653,17 @@ var custCpnSumAmtCal = function() {
 	$(".freegiftValArr").text(freegiftValArr);				// 사은품시퀀스배열
 	$(".freegiftUsePointArr").text(freegiftUsePointArr);	// 사은품사용포인트배열
 };
-
-
 </script>
 
 <script type="text/javascript">
+
+// 2. 버튼기능구현
+// 2.1 배송지변경 팝업열기
+$('#btn_adrsChange_pop').on("click", function(){
+	$("#adrsChangePop").modal("show");
+});
+
+
 $(document).ready( function() {
 	//해외배송 입력
 	$(document).on('change','.odPayment .area_overseas #rdi-overs1',function(e){
@@ -1870,7 +1728,7 @@ $(document).ready( function() {
 		return false;
 	});
 
-	//개인정보동의 열고닫기
+	// 개인정보동의 열고닫기
 	$(document).on('click','.area_paymentinfo .payinfo_blk a',function(e){
 		e.preventDefault();
 		$(this).parents('.payinfo_blk').toggleClass('on');
@@ -1879,11 +1737,7 @@ $(document).ready( function() {
 		return false;
 	});
 
-	//배송지변경 팝업열기
-	$(document).on('click','#btn_adrsChange_pop',function(e){
-		$("#adrsChangePop").modal("show");
-		return false;
-	});
+	
 
 	//배송지추가 팝업열기
 	$(document).on('click','#btn_addrAdd_pop',function(e){

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

@@ -13,38 +13,37 @@
  * 1.0  2021.02.01   jsh77b     최초 작성
  *******************************************************************************
  -->
-<!-- 주문목록 -->
 <div class="od_item_box">
-	<!-- 전체배송목록 sort --> 
 	<th:block th:each="delvAllCart, i : ${delvAllCartList}">
 		<th:block th:if="${delvAllCart != null and #lists.size(delvAllCart) > 0}">
 			<div class="part_dlvr">
 				<th:block th:if="${i.index} == 0">
 					<th:block th:if="${delvAllCart != null and #lists.size(delvAllCart) > 0}">
-						<h4 class="subH3 mb20">STYLE24 총알배송 <span>오늘 자정까지 도착</span></h4>
+						<h4 class="subH3">STYLE24 총알배송 <span>오늘 자정까지 도착</span></h4>
 					</th:block>
 				</th:block>
 				<th:block th:if="${i.index} == 1">
 					<th:block th:if="${delvAllCart != null and #lists.size(delvAllCart) > 0}">
-						<h4 class="subH3 mb20">STYLE24 일반배송</h4>
+						<h4 class="subH3">STYLE24 일반배송</h4>
 					</th:block>
 				</th:block>
 				<th:block th:if="${i.index} == 2">
 					<th:block th:if="${delvAllCart != null and #lists.size(delvAllCart) > 0}">
-						<h4 class="subH3 mb20">업체직배송</h4>
+						<h4 class="subH3">업체직배송</h4>
 					</th:block>
 				</th:block>
 				<th:block th:if="${i.index} == 3">
 					<th:block th:if="${delvAllCart != null and #lists.size(delvAllCart) > 0}">
-						<h4 class="subH3 mb20">예약배송</h4>
+						<h4 class="subH3">예약배송</h4>
 					</th:block>
 				</th:block>
-				
+		
 				<div class="gd_list">
 					<th:block th:each="goods, i : ${delvAllCart}">
 						<div class="item_gd">
 							<figure>
-								<span class="thumb"><img src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
+								<span class="thumb"><img
+									src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
 								<figcaption>
 									<div class="brand" th:text="${goods.brandEnm} + ' ' + ${goods.brandKnm}"></div>
 									<div class="name" th:text="${goods.goodsNm}"></div>
@@ -66,9 +65,7 @@
 					</th:block>
 				</div>
 			</div>
+			
 		</th:block>
 	</th:block>
-<!-- //전체배송목록 sort -->
-</div>
-<!-- //주문목록 -->
 </html>

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

@@ -109,12 +109,10 @@ var dispYn = [[${order.dispYn}]]; // 노출여부
 
 //컨텐츠 호출
 $(document).ready( function() {
-	dispYn = "Y";
-	
 	// 화면펼침
 	if (dispYn == "Y") {
 		$("#paymentInfo .fold_head").addClass("on");
-		//$("#paymentInfo .fold_cont").css("display", "block");
+		$("#paymentInfo .fold_cont").css("display", "block");
 		$("#rdi-paymethod-normal").attr("checked", "checked");
 	}
 });