jsh77b 5 лет назад
Родитель
Сommit
4ca6b8cd64

+ 20 - 0
src/main/java/com/style24/front/biz/web/TsfOrderController.java

@@ -201,6 +201,12 @@ public class TsfOrderController extends TsfBaseController {
 		// 3.1 즉시할인, 다다익선 할인금액 정보 적용 정보
 		Collection<Order> tmtbGoodsApplyList = cartService.getMoreBetterAmtList(order);
 		
+		// 3.1.1 상품목록이 없으면 장바구니이동 
+		if (tmtbGoodsApplyList.size() < 1) {
+			mav.setViewName("redirect:/cart/list/form");		// 비회원주문서화면
+			return mav;
+		}
+		
 		// 3.2 배송정보조회(장바구니상품목록)
 		GagaMap delvOrderMap = coreOrderService.getCartDelvGoodsCntList(tmtbGoodsApplyList, order);
 		
@@ -781,6 +787,20 @@ public class TsfOrderController extends TsfBaseController {
 		// 2. 결제완료정보조회
 		GagaMap resultMap = coreOrderService.getOrderCompleteInfo(order);
 		
+		// 2.1 본인회원인 경우 체크
+		Order orderInfo = (Order) resultMap.get("orderInfo");
+		if (orderInfo.getCustNo() != 0) {
+			if (TsfSession.isLogin()) {
+				if (!TsfSession.getInfo().getCustNo().equals(orderInfo.getCustNo())) {
+					mav.setViewName("redirect:/cart/list/form");
+					return mav;
+				}
+			} else {
+				mav.setViewName("redirect:/cart/list/form");
+				return mav;
+			}
+		}
+		
 		// 3. 화면전송변수설정
 		mav.addObject("orderInfo"			, resultMap.get("orderInfo"));			// 주문기본정보
 		mav.addObject("ordSumAmt"			, resultMap.get("ordSumAmt"));			// 주문금액합계

+ 454 - 0
src/main/webapp/WEB-INF/views/mob/order/OrderCompleteMob.html

@@ -0,0 +1,454 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="mob/common/layout/SubLayoutMob">
+<!--
+ *******************************************************************************
+ * @source  : OrderCompleteMob.html
+ * @desc    : 주문완료 Page
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2020 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.04.12   jsh77b     최초 작성
+ *******************************************************************************
+ -->
+<body>
+<th:block layout:fragment="content">
+<main role="" id="" class="container od">
+	<section class="content completed">
+		<div class="inner wide">
+			<div class="info_complete">
+				<img src="/images/mo/ico_complete_check.png" alt="주문이 완료 되었습니다.">
+				<p class="txt_box">주문이 완료되었습니다.</p>
+				<dl class="report_box">
+					<div>
+						<dt>주문번호</dt>
+						<dd><span th:text="${orderInfo.ordNo}"></span></dd>
+					</div>
+				</dl>
+			</div>
+		</div>
+		<!-- 무통장입금 결제시 -->
+		<th:block th:if="${orderInfo.payMeans} == 'G014_20'">
+			<div class="inner">
+				<div class="tbl_wrap">
+					<div class="tbl_tit"> 
+						<h3>무통장 입금 정보</h3>
+					</div>
+					<div class="tbl type1">
+						<table>
+							<colgroup>
+								<col width="107">
+								<col width="*">
+							</colgroup>   
+							<tbody>
+								<tr>
+									<th>은행명/명의자</th>
+									<td>
+										<div>
+											<span th:text="${orderInfo.cardNm}"></span>/<span th:text="${orderInfo.ordNm}"></span>
+										</div>
+									</td>
+								</tr>
+								<tr>
+									<th>계좌번호</th>
+									<td>
+										<div>
+											<span th:text="${orderInfo.vaNo}"></span>
+										</div>
+									</td>
+								</tr>
+								<tr>
+									<th>입금기한</th>
+									<td>
+										<div>
+											<span th:text="|${orderInfo.vaDeadline}"></span><!-- <span>12:00:00</span> --> 까지
+										</div>
+									</td>
+								</tr>
+							</tbody>
+						</table>
+					</div>
+				</div>
+			</div>
+		</th:block>
+		<div class="inner wide">
+			<!-- 폴딩리스트 -->
+			<div class="ui_row">
+				<div class="foldGroup">
+					<ul>
+						<li class="fold_mbinfo">
+							<div class="fold_head">
+								<a href="javascript:void(0)">
+									<div>
+										<div class="fold_tit">
+											<span th:text="${orderInfo.ordNm}"></span>
+										</div>
+										<div class="data">
+											<span th:text="${orderInfo.ordNm}"></span>
+											<span th:text="${orderInfo.ordPhnno}"></span>
+										</div>
+									</div>
+								</a>
+							</div>
+							<div class="fold_cont">
+								<div class="customer_info">
+									<dl>
+										<div>
+											<dt><span class="sr-only">주문자명</span></dt>
+											<dd th:text="${orderInfo.ordNm}"></dd>
+										</div>
+										<div>
+											<dt><span class="sr-only">이메일</span></dt>
+											<dd th:text="${orderInfo.ordEmail}"></dd>
+										</div>
+										<div>
+											<dt><span class="sr-only">휴대폰 번호</span></dt>
+											<dd th:text="${orderInfo.ordPhnno}"></dd>
+										</div>
+									</dl>
+								</div>
+							</div>
+						</li>
+					</ul>
+				</div>
+			</div>
+			<!-- 폴딩리스트 -->
+		</div>
+		<div class="inner wide">
+			<!-- 폴딩리스트 -->
+			<div class="ui_row">
+				<div class="foldGroup shipfold">
+					<ul>
+						<li class="fold_delivery">
+							<div class="fold_head">
+								<a href="javascript:void(0)">
+									<div>
+										<div class="fold_tit">
+											<span>배송지 정보</span>
+										</div>
+										<div class="data">
+											<span class="recipAddr" th:text="${orderInfo.recipBaseAddr} + '    ' + ${orderInfo.recipDtlAddr}"></span>
+										</div>
+									</div>
+								</a>
+							</div>
+							<div class="fold_cont">
+								<!-- //배송지 정보 변경불가 -->
+								<div class="ship_info">
+									<button type="button" id="btn_adrsChange_pop" class="btn_popup"><span>배송지 변경</span></button>
+									<dl>
+										<div class="company">
+											<dt><span class="sr-only">배송지명</span></dt>
+											<dd id="recipNm" th:text="${orderInfo.recipNm}">
+												<!-- 
+												<span class="icon_tag">
+													<em class="tag_stype1">기본 배송지</em>
+													<em class="tag_stype2">총알배송</em>
+												</span>
+												 -->
+											</dd>
+										</div>
+										<div class="phone">
+											<dt><span class="sr-only">휴대폰 번호</span></dt>
+											<dd id="recipPhnno" th:text="${orderInfo.recipPhnno}"></dd>
+										</div>
+										<div class="addr">
+											<dt><span class="sr-only">배송주소</span></dt>
+											<dd id="recipAddr" th:text="${orderInfo.recipBaseAddr} + '    ' + ${orderInfo.recipDtlAddr}"></dd>
+										</div>
+										<div class="ship_request">
+											<dt>배송요청 사항</dt>
+											<dd id="delvMemo" th:text="${orderInfo.delvMemo}"></dd>
+										</div>
+									</dl>
+								</div>
+								<!-- //배송지 정보 변경불가 -->
+							</div>
+						</li>
+					</ul>
+				</div>
+			</div>
+			<!-- 폴딩리스트 -->
+		</div>
+		<div class="inner">
+			<div class="tbl_wrap pay_wrap">
+				<div class="tbl_tit"> 
+					<h3>결제 정보</h3>
+					<strong class="pay"><span th:text="${#numbers.formatInteger(realOrdSumAmt, 1, 'COMMA')}"></span>원</strong>
+				</div>
+				<div class="tbl type1">
+					<table>
+						<colgroup>
+							<col width="227">
+							<col width="*">
+						</colgroup>   
+						<tr>
+							<td>
+								<dl>
+									<!-- 210330 : 태그 분할 -->
+									<div>
+										<dt>상품금액</dt>
+										<dd>
+											<div><span th:text="${#numbers.formatInteger(goodsSumAmt, 1, 'COMMA')}"></span>원</div>
+										</dd>
+									</div>
+									<div>
+										<dt>배송비</dt>
+										<dd>
+											<div><span th:text="${#numbers.formatInteger(delvFeeSumAmt, 1, 'COMMA')}"></span>원</div>
+										</dd>
+									</div>
+									<!-- //210330 : 태그 분할 -->
+									<div>
+										<dt>상품할인(즉시할인)</dt>
+										<th:block th:if="${cpn1DcSumAmt}>0">
+											<dd><div><span th:text="|- ${#numbers.formatInteger(cpn1DcSumAmt, 1, 'COMMA')}|"></span>원</div></dd>
+										</th:block>
+										<th:block th:if="${cpn1DcSumAmt}<1">
+											<dd><div><span>0</span>원<div></dd>
+										</th:block>
+									</div>
+									<!-- 회원인경우노출 -->
+									<th:block th:if="${isLogin}">
+										<div>
+											<dt>다다익선 할인</dt>
+											<th:block th:if="${tmtbSumAmt}>0">
+												<dd><div><span th:text="|- ${#numbers.formatInteger(tmtbSumAmt, 1, 'COMMA')}|"></span>원</div></dd>
+											</th:block>
+											<th:block th:if="${tmtbSumAmt}<1">
+												<dd><div><span >0</span>원</div></dd>
+											</th:block>
+										</div>
+										<div>
+											<dt>쿠폰할인</dt>
+											<th:block th:if="${cpnDcSumAmt}>0">
+												<dd><div><span th:text="|- ${#numbers.formatInteger(cpnDcSumAmt, 1, 'COMMA')}|"></span>원</div></dd>
+											</th:block>
+											<th:block th:if="${cpnDcSumAmt}<1">
+												<dd><div><em>0</em>원</div></dd>
+											</th:block>
+										</div>
+										<div>
+											<dt>선 포인트 사용</dt>
+											<th:block th:if="${prePntDcSumAmt}>0">
+												<dd><div><em th:text="|- ${#numbers.formatInteger(prePntDcSumAmt, 1, 'COMMA')}|"></em>P</div></dd>
+											</th:block>
+											<th:block th:if="${prePntDcSumAmt}<1">
+												<dd><div><span>0</span>P</div></dd>
+											</th:block>
+										</div>
+										<div>
+											<dt>포인트 사용</dt>
+											<th:block th:if="${pntDcSumAmt}>0">
+												<dd><div><span th:text="|- ${#numbers.formatInteger(pntDcSumAmt, 1, 'COMMA')}|"></span></div>P</dd>
+											</th:block>
+											<th:block th:if="${pntDcSumAmt}<1">
+												<dd><div><span>0</span>P</div></dd>
+											</th:block>
+										</div>
+										<div>
+											<dt>상품권 사용</dt>
+											<th:block th:if="${gfcdUseSumAmt}>0">
+												<dd><div><span th:text="|- ${#numbers.formatInteger(gfcdUseSumAmt, 1, 'COMMA')}|"></span>원</div></dd>
+											</th:block>
+											<th:block th:if="${gfcdUseSumAmt}<1">
+												<dd><div><span>0</span>원</div></dd>
+											</th:block>
+										</div>
+									</th:block>
+									<div>
+										<dt>마일리지 사용</dt>
+										<th:block th:if="${mileageDcAmt}>0">
+											<dd><div><span th:text="|- ${#numbers.formatInteger(mileageDcAmt, 1, 'COMMA')}|"></span>원</div></dd>
+										</th:block>
+										<th:block th:if="${mileageDcAmt}<1">
+											<dd><div><span>0</span>원</div></dd>
+										</th:block>
+									</div>
+									<div>
+										<dt>제휴 할인</dt>
+										<th:block th:if="${allianceDcAmt}>0">
+											<dd><div><span th:text="|- ${#numbers.formatInteger(allianceDcAmt, 1, 'COMMA')}|"></span>원</div></dd>
+										</th:block>
+										<th:block th:if="${allianceDcAmt}<1">
+											<dd><div><span>0</span>원</div></dd>
+										</th:block>
+									</div>
+									<div>
+										<dt>적립예정 포인트</dt>
+										<dd>
+											<div>
+												<span th:text="${#numbers.formatInteger(savePntSumAmt, 1, 'COMMA')}">3000</span>P
+											</div>
+										</dd>
+									</div>
+									<div>
+										<dt>결제방법</dt>
+										<!-- kcp 신용카드 -->
+										<th:block th:if="${orderInfo.payMeans} == 'G014_30'">
+											<!--  체크카드 -->
+											<th:block th:if="${orderInfo.cardType} == 'Y'">
+												<dd><div><span th:text="|체크카드(${orderInfo.cardNm})/${orderInfo.cardMips}|"></span></div></dd>
+											</th:block>
+											<!--  신용카드 -->
+											<th:block th:if="${orderInfo.cardType} == 'N'">
+												<dd><div><span th:text="|체크카드(${orderInfo.cardNm})/${orderInfo.cardMips}|"></span></div></dd>
+											</th:block>
+										</th:block>
+										<th:block th:if="${orderInfo.payMeans} != 'G014_30'">
+											<dd><div><span th:text="${orderInfo.payType}"></span></div></dd>
+										</th:block>
+									</div>
+								</dl>
+							</td>
+						</tr>
+					</table>
+				</div>
+			</div>
+			<div class="btn_group btn_group_flex">
+				<div><button type="button" class="btn btn_gost"><span>주문 상세보기</span></button></div>
+				<div><button type="button" class="btn btn_dark"><span>쇼핑 계속하기</span></button></div>
+			</div>
+		</div>
+	</section>
+</main>
+
+
+<script th:inline="javascript">
+// 배송관련정보 변수선언
+var ordNo			= [[${orderInfo.ordNo}]]		// 배송목록
+var isLogin			= [[${isLogin}]];				// 로그인여부
+var delvAddrSq		= [[${delvAddrSq}]];			// 배송지번호
+
+// 2.1 회원 배송지변경 팝업열기
+$('#btn_adrsChange_pop').on("click", function(){
+	// 회원인경우
+	if (isLogin == true) {
+		$.ajax( {
+			type		: "POST",
+			url 		: '/common/delvAddrChangePop',
+			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 .modal-dialog .modal-content").html(result);
+				$("#adrsChangePop").modal("show");
+			}
+		});
+	}
+	// 비회원인경우
+	else {
+		$.ajax( {
+			type		: "POST",
+			url 		: '/common/delvAddrAddPop',
+			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 .modal-dialog .modal-content").html(result);
+				$("#adrsAddPop").modal("show");
+			}
+		});	
+	}
+});
+
+// 2.2 배송요청사항 팝업열기
+$("#btn_rqstModify_pop").on("click", function(e){
+	var jsonObj = new Object();
+	jsonObj.delvMemo = $("#delvMemo").text();
+	
+	$.ajax({
+		type		: "POST",
+		url 		: "/common/delvMemoChangePop",
+		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) {
+			if (result != null) {
+				$("#rqstModifyPop .modal-dialog .modal-content").html(result);
+				$("#rqstModifyPop").modal("show");
+			}
+		}
+	});
+	
+	return false;
+});
+
+// 1.18 배송지정보 설정
+var delvAddrSet = function(delvObj) {
+	
+	var rtnStr = "";
+	rtnStr += "| recipNm 			::: " + delvObj.recipNm;
+	rtnStr += "| recipPhnno 		::: " + delvObj.recipPhnno;
+	rtnStr += "| recipZipcode 		::: " + delvObj.recipZipcode;
+	rtnStr += "| recipBaseAddr 		::: " + delvObj.recipBaseAddr;
+	rtnStr += "| recipDtlAddr 		::: " + delvObj.recipDtlAddr;
+	rtnStr += "| delvMemo 			::: " + delvObj.delvMemo;
+	
+	$("#recipNm").text(delvObj.recipNm);
+	$("#recipPhnno").text(delvObj.recipPhnno);
+	$("#recipAddr").text(delvObj.recipBaseAddr + '    ' + delvObj.recipDtlAddr);
+	$("#delvMemo").text(delvObj.delvMemo);
+	
+	// 변수값 설정
+	var jsonObj = {
+		"delvAddrSq" 		: delvAddrSq
+		, "recipNm"			: delvObj.recipNm
+		, "recipPhnno"		: delvObj.recipPhnno
+		, "recipZipcode"	: delvObj.recipZipcode
+		, "recipBaseAddr"	: delvObj.recipBaseAddr
+		, "recipDtlAddr"	: delvObj.recipDtlAddr
+		, "delvMemo"		: delvObj.delvMemo
+	}
+	
+	gagajf.ajaxJsonSubmit(
+		"/common/updateDeliverAddr"
+		, JSON.stringify(jsonObj)
+		, function (result) {
+			mcxDialog.alert("수정되었습니다.");
+		}
+	)
+}
+
+// 1.19 배송메모설정
+var delvMemoSet = function(delvMemoObj) {
+	
+	var rtnStr = "";
+	rtnStr += "| delvMemo 			::: " + delvMemoObj.delvMemo;
+
+	// 변수값 설정
+	var jsonObj = {
+		"delvAddrSq" 		: delvAddrSq
+		, "delvMemo"		: delvMemoObj.delvMemo
+	}
+	
+	$("#delvMemo").text(delvMemoObj.delvMemo);
+	
+	gagajf.ajaxJsonSubmit(
+		"/common/updateDeliverAddrDelvMemo"
+		, JSON.stringify(jsonObj)
+		, function (result) {
+			mcxDialog.alert("수정되었습니다.");
+		}
+	)
+}
+
+</script>
+</th:block>
+</body>
+</html>

+ 1 - 1
src/main/webapp/WEB-INF/views/mob/order/OrderDcAmtInfoMob.html

@@ -66,7 +66,7 @@
 									</th:block>
 									<div class="form_field">
 										<div class="input_wrap">
-											<input type="text" class="form_control" maxlength="13" placeholder="할인코드를 입력해주세요.">
+											<input type="text" class="form_control" id="serialCpnNm" maxlength="13" placeholder="할인코드를 입력해주세요.">
 											<button type="button" class="btn btn_dark btn_sm" onclick="serialCpnApply()">
 												<span>적용</span>
 											</button>

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

@@ -302,13 +302,7 @@
 											</div>
 											<div>
 												<dt>할인금액</dt>
-													<th:block th:if="${cpn1DcSumAmt} > 0">
-														<dd><div><span class="dcSumAmt disc_amount" id="cpn1DcSumAmt" th:text="|-${#numbers.formatInteger(cpn1DcSumAmt, 1, 'COMMA')}|"></span>원</div></dd>
-													</th:block>
-													<th:block th:if="${cpn1DcSumAmt} < 1">
-														<dd><div><span class="dcSumAmt disc_amount" id="cpn1DcSumAmt" th:text="|${#numbers.formatInteger(cpn1DcSumAmt, 1, 'COMMA')}|"></span>원</div></dd>
-													</th:block>
-												</dd>
+												<dd><div><span class="dcSumAmt disc_amount"></span>원</div></dd>
 											</div>
 										</dl>
 									</td>
@@ -1007,7 +1001,7 @@ var paymentInfoSet = function() {
 							
 							var pgGb = $("#order_info input[name=pgGb]").val();
 							
-							if (pgGb == "NAVFER") {
+							if (pgGb == "NAVER") {
 								fnNaverPaymentReady();
 							} else if (pgGb == "KAKAO") {
 								fnKakaoPaymentReady();
@@ -1162,6 +1156,21 @@ var dcAmtInfoSet = function() {
 								$("#chk-maxdisc").attr("checked", false);
 							}
 						});
+						
+						// 1.8.5 쿠폰 최대할인금액 초기화 버튼 설정
+						$("#chk-maxdisc").on("click", function(){
+							if ($(this).is(":checked")) {
+								// 상품&장바구니쿠폰 초기환
+								custGoodsCpnInit();
+								
+								// 배송비쿠폰 초기환
+								custDelvCpnInit();
+								
+								$("#chk-maxdisc01").attr("checked", true);
+							} else {
+								$("#chk-maxdisc01").attr("checked", false);
+							}
+						});
 					}
 				});
 				
@@ -1241,7 +1250,7 @@ var dcAmtInfoSet = function() {
 					
 					// 포인트 적용
 					$("#orderAmtForm .pntDcSumAmt").text(pntDcAmt);
-					$("#pntDcAmt").text(getZeroMinusDelAmt(pntDcAmt)+" 원");
+					$("#pntDcAmt").text(getZeroMinusDelAmt(pntDcAmt));
 					
 					// 상품권리렛기능
 					gfcdUseAmtReset();
@@ -1285,7 +1294,7 @@ var dcAmtInfoSet = function() {
 					
 					// 상품권 적용
 					$("#orderAmtForm .gfcdUseSumAmt").text(gfcdUseAmt);
-					$("#gfcdUseAmt").text("-"+gfcdUseAmt.addComma()+" 원");
+					$("#gfcdUseAmt").text(getZeroMinusDelAmt(gfcdUseAmt));
 					
 					// 금액전체계산
 					custCpnSumAmtCal();
@@ -1748,7 +1757,7 @@ var prePntDcAmtReset = function() {
 	$("#orderForm input[name='prePntDcAmt']").val(rmPrePntAmt);
 	
 	// 선포인트사용여부 체크 후 적용
-	$("#orderFrom input[name='rdi-beforpoint']").each(function(){
+	$("#orderForm input[name='rdi-beforpoint']").each(function(){
 		// 선포인트 초기 설정 사용함
 		if ($(this).val() == "Y") {
 			$(this).attr("checked", true);
@@ -1872,6 +1881,8 @@ var custCpnSumAmtCal = function() {
 	var gfcdUseSumAmt 		= parseInt($("#orderAmtForm .gfcdUseSumAmt").text());
 	var realOrdSumAmt		= 0;
 	var savePntSumAmt		= 0;
+	var totDcSumAmt			= 0;
+	
 	
 	$("#orderAmtForm .cartSq").each(function(){
 		var orgCurrPrice 	= parseInt($(this).parent().find(".orgCurrPrice").text());
@@ -1883,8 +1894,8 @@ var custCpnSumAmtCal = function() {
 		var goodsCpnDcAmt	= parseInt($(this).parent().find(".goodsCpnDcAmt").text());
 		var cartCpnDcAmt	= parseInt($(this).parent().find(".cartCpnDcAmt").text());
 		var prePntDcAmt1	= parseInt($(this).parent().find(".prePntDcAmt1").text());
-		var dcSumAmt		= 0;
 		var savePntAmt1		= parseInt($(this).parent().find(".savePntAmt1").text());
+		var dcSumAmt		= 0;
 		
 		// 주문금액 = ((판매가 - 즉시할인가) + 옵션추가금액) * 장바구니수량
 		orgGoodsSumAmt		= orgGoodsSumAmt + (orgCurrPrice + optAddPrice) * goodsQty;
@@ -1908,6 +1919,8 @@ var custCpnSumAmtCal = function() {
 			dcSumAmt		= tmtb1DcAmt + tmtb2DcAmt + goodsCpnDcAmt + cartCpnDcAmt;
 		}
 		
+		totDcSumAmt			= totDcSumAmt + dcSumAmt;
+		
 		// 주문금액설정
 		$(this).parent().find(".ordAmt").text(ordAmt);
 		$(this).parent().find(".dcSumAmt").text(dcSumAmt);
@@ -1933,7 +1946,7 @@ var custCpnSumAmtCal = function() {
 			leftGfcdAmt		= leftGfcdAmt - gfcdUseAmt1;
 		}
 		
-		var realOrdAmt1		= ordAmt - dcSumAmt - (pntDcAmt1 - gfcdUseAmt1);
+		var realOrdAmt1		= ordAmt - dcSumAmt - pntDcAmt1 - gfcdUseAmt1;
 		realOrdSumAmt		= realOrdSumAmt + realOrdAmt1;
 		
 		$(this).parent().find(".pntDcAmt1").text(pntDcAmt1);
@@ -1961,6 +1974,8 @@ var custCpnSumAmtCal = function() {
 	$("#realOrdAmt").text(realOrdSumAmt.addComma()); 					// 총 결제 예정 금액
 	$("#orderForm .realOrdAmt").text(realOrdSumAmt.addComma()); 		// 총 결제 예정 금액
 	$("#orderForm .orgGoodsSumAmt").text(orgGoodsSumAmt.addComma());
+	$("#orderForm #btn_payment").text(realOrdSumAmt.addComma());		// 총 결제 예정 금액
+	$("#orderForm .dcSumAmt").text(totDcSumAmt.addComma());				// 할인금액합계
 	
 	var tempSavePnt			= savePntSumAmt - prePntDcAmt;
 	

+ 1 - 1
src/main/webapp/WEB-INF/views/mob/order/OrderFreegiftInfoMob.html

@@ -90,7 +90,7 @@
 										</th:block>
 									</th:block>
 									<div class="gift">
-										<input type="radio" th:name="'rdi-gift'+${i.count}" th:id="${i.count}+'0'" class="chk_img freegiftRdo" value="noSel" usepoint="0" allYn="N"> 
+										<input type="radio" th:name="'rdi-gift'+${i.count}" th:id="${i.count}+'0'" class="chk_img freegiftRdo" value="noSel" usepoint="0" allYn="N" checked> 
 										<label th:for="${i.count}+'0'">
 											<span class="thumb"><img src="/images/pc/thumb/tmp_gift_empty.jpg" width="" alt=""></span>
 											<span class="name">사은품 수령안함</span> <span class="deduct">수령거부</span>

+ 6 - 6
src/main/webapp/WEB-INF/views/mob/order/OrderListInfoMob.html

@@ -126,10 +126,10 @@
 						<div>
 							<dt>상품할인(즉시할인)</dt>
 							<th:block th:if="${cpn1DcSumAmt} > 0">
-								<dd><span class="disc_amount" id="cpn1DcSumAmt" th:text="|-${#numbers.formatInteger(cpn1DcSumAmt, 1, 'COMMA')} 원|"></span></dd>
+								<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>
+								<dd><span class="disc_amount" id="cpn1DcSumAmt" th:text="|${#numbers.formatInteger(cpn1DcSumAmt, 1, 'COMMA')}원|"></span></dd>
 							</th:block>
 						</div>
 						
@@ -138,10 +138,10 @@
 							<div>
 								<dt>다다익선할인</dt>
 								<th:block th:if="${tmtbDcSumAmt} > 0">
-									<dd><span class="disc_amount" id="tmtbDcSumAmt" th:text="|-${#numbers.formatInteger(tmtbDcSumAmt, 1, 'COMMA')} 원|"></span></dd>
+									<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>
+									<dd><span class="disc_amount" id="tmtbDcSumAmt" th:text="|${#numbers.formatInteger(tmtbDcSumAmt, 1, 'COMMA')}원|"></span></dd>
 								</th:block>
 							</div>
 							<div>
@@ -153,10 +153,10 @@
 							<div>
 								<dt>선포인트 사용</dt>
 								<th:block th:if="${prePntDcAmt} > 0">
-									<dd><span class="disc_amount" id="prePntDcAmt" th:text="|-${#numbers.formatInteger(prePntDcAmt, 1, 'COMMA')} 원|"></span></dd>
+									<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>
+									<dd><span class="disc_amount" id="prePntDcAmt" th:text="|${#numbers.formatInteger(prePntDcAmt, 1, 'COMMA')}원|"></span></dd>
 								</th:block>
 							</div>
 							<div>

+ 5 - 2
src/main/webapp/WEB-INF/views/mob/order/OrderNoMemberMob.html

@@ -129,7 +129,6 @@ $(document).ready( function() {
 	
 // 주문하기버튼
 $("#btn_order").on("click", function() {
-	/*
 	// TODO 유효성 체크 추가
 	if (gagajf.isNull($("#orderForm input[name=custNm]").val())) {
 		mcxDialog.alert("이름을 입력해주세요.");
@@ -177,7 +176,6 @@ $("#btn_order").on("click", function() {
 		mcxDialog.alert("비회원 개인정보 수집 이용에 동의해주세요.");
 		return false;
 	}
-	*/
 	
 	// 주문서전송
 	$("#orderForm").submit();
@@ -216,7 +214,12 @@ var fnOpenDaumAddr = function() {
 			$('#orderForm input[name=recipZipcode]').val(data.zonecode);
 			$('#orderForm input[name=recipBaseAddr]').val(cfnGetDaumRoadAddr(data));
 			$('#orderForm input[name=recipDtlAddr]').focus();
+			
 			cfnCloseDaumAddr();
+			
+			// 2021.04.12 이태영 지원 닫기버튼 기능
+			$(".jquery-modal.blocker.current").hide();
+			$("body").css("overflow", "");
 		},
 		width: '100%'
 	});

+ 4 - 17
src/main/webapp/WEB-INF/views/web/order/OrderCompleteWeb.html

@@ -48,7 +48,7 @@
 									</div>
 									<div class="closedate">
 										<dt>입금마감</dt>
-										<dd><span  th:text="|${orderInfo.vaDeadline}"></span>까지</dd>
+										<dd><span th:text="|${orderInfo.vaDeadline}"></span>까지</dd>
 									</div>
 								</th:block>
 								<!-- //무통장 입금 결제시 -->
@@ -359,7 +359,8 @@ var delvAddrSet = function(delvObj) {
 	
 	// 변수값 설정
 	var jsonObj = {
-		"delvAddrSq" 		: delvAddrSq
+		"ordNo" 			: ordNo
+		, "delvAddrSq" 		: delvAddrSq
 		, "recipNm"			: delvObj.recipNm
 		, "recipPhnno"		: delvObj.recipPhnno
 		, "recipZipcode"	: delvObj.recipZipcode
@@ -367,14 +368,6 @@ var delvAddrSet = function(delvObj) {
 		, "recipDtlAddr"	: delvObj.recipDtlAddr
 		, "delvMemo"		: delvObj.delvMemo
 	}
-	
-	gagajf.ajaxJsonSubmit(
-		"/common/updateDeliverAddr"
-		, JSON.stringify(jsonObj)
-		, function (result) {
-			mcxDialog.alert("수정되었습니다.");
-		}
-	)
 }
 
 // 1.19 배송메모설정
@@ -391,13 +384,7 @@ var delvMemoSet = function(delvMemoObj) {
 	
 	$("#delvMemo").text(delvMemoObj.delvMemo);
 	
-	gagajf.ajaxJsonSubmit(
-		"/common/updateDeliverAddrDelvMemo"
-		, JSON.stringify(jsonObj)
-		, function (result) {
-			mcxDialog.alert("수정되었습니다.");
-		}
-	)
+	
 }
 
 

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

@@ -1960,7 +1960,7 @@ var custCpnSumAmtCal = function() {
 			leftGfcdAmt		= leftGfcdAmt - gfcdUseAmt1;
 		}
 		
-		var realOrdAmt1		= ordAmt - dcSumAmt - (pntDcAmt1 - gfcdUseAmt1);
+		var realOrdAmt1		= ordAmt - dcSumAmt - pntDcAmt1 - gfcdUseAmt1;
 		realOrdSumAmt		= realOrdSumAmt + realOrdAmt1;
 		
 		$(this).parent().find(".pntDcAmt1").text(pntDcAmt1);

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

@@ -75,7 +75,7 @@
 							</th:block>
 						</th:block>
 						<div class="gift">
-							<input type="radio" th:name="'rdi-gift'+${i.count}" th:id="${i.count}+'0'" class="chk_img freegiftRdo" value="noSel" usepoint="0" allYn="N"> 
+							<input type="radio" th:name="'rdi-gift'+${i.count}" th:id="${i.count}+'0'" class="chk_img freegiftRdo" value="noSel" usepoint="0" allYn="N" checked> 
 							<label th:for="${i.count}+'0'">
 								<span class="thumb"><img src="/images/pc/thumb/tmp_gift_empty.jpg" width=""alt=""></span> 
 								<span class="name">사은품 수령안함</span>