Merge branch 'card007' into order

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

@@ -191,7 +191,7 @@ public class TsfMypageController extends TsfBaseController {
 		}
 
 		// 주문상세상태코드 설정
-		mav.addObject("ordDtlStatList", rendererService.getCommonCodeList("G013", "Y", new String[] {"G013_25", "G013_35", "G013_55", "G013_97", "G013_98", "G013_99"}));
+		mav.addObject("ordDtlStatList", rendererService.getCommonCodeList("G013", "Y", new String[] {"G013_10", "G013_11", "G013_25", "G013_35", "G013_55", "G013_97", "G013_98", "G013_99"}));
 
 		mav.setViewName(super.getDeviceViewName("mypage/MypageOrderListForm"));
 
@@ -277,7 +277,14 @@ public class TsfMypageController extends TsfBaseController {
 	public GagaMap getOrderList(@RequestBody Order order) {
 		GagaMap map = new GagaMap();
 
+		// 고객번호 설정
+		int custNo = 0;
+		if(TsfSession.isLogin()) {
+			custNo = TsfSession.getInfo().getCustNo();
+		}
+
 		// 페이징 처리 설정
+		order.setCustNo(custNo);
 		TscPageRequest pageable = new TscPageRequest((order.getPageNo() > 0 ? order.getPageNo() - 1 : 0), order.getPageSize(), order.getPageUnit());
 		pageable.setTotalCount(orderService.getPagingOrdNoListCount(order));
 		order.setPageable(pageable);
@@ -560,10 +567,12 @@ public class TsfMypageController extends TsfBaseController {
 	 */
 	@PostMapping("/coupon/count")
 	@ResponseBody
-	public GagaMap fnReloadCouponCount(@RequestBody Order order) {
+	public GagaMap fnReloadCouponCount() {
 		GagaMap result = new GagaMap();
 
 		// 쿠폰정보 조회
+		Order order = new Order();
+		order.setCustNo(TsfSession.getInfo().getCustNo());
 		result.set("couponCnt", coreOrderService.getCouponInfo(order));
 
 		order.setExpiredSoon("Y");
@@ -583,10 +592,12 @@ public class TsfMypageController extends TsfBaseController {
 	 */
 	@PostMapping("/status/count")
 	@ResponseBody
-	public GagaMap fnReloadStatusCount(@RequestBody Order order) {
+	public GagaMap fnReloadStatusCount() {
 		GagaMap result = new GagaMap();
 
 		// 쿠폰정보 조회
+		Order order = new Order();
+		order.setCustNo(TsfSession.getInfo().getCustNo());
 		result.set("orderCount", coreOrderService.getOrderStatCount(order));
 
 		result.set("status", GagaResponseStatus.SUCCESS.getCode());
@@ -895,7 +906,14 @@ public class TsfMypageController extends TsfBaseController {
 	public GagaMap getCreList(@RequestBody OrderChange orderChange) {
 		GagaMap map = new GagaMap();
 
+		// 고객번호 설정
+		int custNo = 0;
+		if(TsfSession.isLogin()) {
+			custNo = TsfSession.getInfo().getCustNo();
+		}
+
 		// 페이징 처리 설정
+		orderChange.setCustNo(custNo);
 		TscPageRequest pageable = new TscPageRequest((orderChange.getPageNo() > 0 ? orderChange.getPageNo() - 1 : 0), orderChange.getPageSize(), orderChange.getPageUnit());
 		pageable.setTotalCount(orderChangeService.getPagingCreListCount(orderChange));
 		orderChange.setPageable(pageable);
@@ -909,9 +927,9 @@ public class TsfMypageController extends TsfBaseController {
 
 		if (ordChgSqList.size() > 0) {
 			orderChange.setOrdChgSqArr(ordChgSqList.stream().mapToInt(Integer::intValue).toArray());
+			map.set("creList", orderChangeService.getCreList(orderChange));
 		}
 
-		map.set("creList", orderChangeService.getCreList(orderChange));
 		map.set("creInfo", orderChange);
 
 		return map;

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

@@ -3,14 +3,10 @@ package com.style24.front.biz.web;
 import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.Date;
-import java.util.Map;
 
-import com.style24.front.biz.service.TsfCustomerService;
-import com.style24.front.biz.service.TsfDisplayService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mobile.device.Device;
@@ -23,12 +19,16 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.gagaframework.web.parameter.GagaMap;
+import com.gagaframework.web.rest.server.GagaResponseStatus;
 import com.style24.core.biz.service.TscCouponService;
 import com.style24.core.biz.service.TscCustomerService;
 import com.style24.core.biz.service.TscPointService;
 import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.front.biz.service.TsfCouponService;
+import com.style24.front.biz.service.TsfCustomerService;
+import com.style24.front.biz.service.TsfDisplayService;
 import com.style24.front.biz.service.TsfPlanningService;
 import com.style24.front.support.controller.TsfBaseController;
 import com.style24.front.support.security.session.TsfSession;
@@ -44,9 +44,6 @@ import com.style24.persistence.domain.Review;
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.web.parameter.GagaMap;
-import com.gagaframework.web.rest.server.GagaResponseStatus;
-
 /**
  * 기획전 Controller
  * 
@@ -584,6 +581,7 @@ public class TsfPlanningController extends TsfBaseController {
 		int downloadCnt = couponService.downloadCustGradeCoupon(TsfSession.getInfo().getCustNo());
 		boolean isDownload = downloadCnt > 0;
 		result.setBoolean("isDownload", isDownload);
+		result.setInt("downloadCnt", downloadCnt);
 		return result;
 	}
 

src/main/java/com/style24/persistence/domain/Cart.java

@@ -27,6 +27,7 @@ public class Cart extends TscBaseDomain {
 	private int goodsQty;			// 장바구니 등록 수량
 	private int ordNo;				// 주문번호
 	private int ordDtlNo;			// 주문상세번호
+	private int ordQty;				// 주문수량
 	private String cartGb;			// 장바구니 구분 (공통코드G026)
 	private String goodsCd;			// 상품번호
 	private String productNo;		// ProductNo(WMS)

src/main/java/com/style24/persistence/mybatis/shop/TsfCart.xml

@@ -1030,7 +1030,7 @@
 		/* TsfCart.getAddCartInfoForMypage */
 		SELECT OD.GOODS_CD
 		     , ODI.OPT_CD
-		     , OD.ORD_QTY - OD.CNCL_RTN_QTY AS ORD_QTY
+		     , IF(OD.ORD_QTY - OD.CNCL_RTN_QTY = 0, 1, OD.ORD_QTY - OD.CNCL_RTN_QTY) AS ORD_QTY
 		     , OD.GOODS_TYPE
 		     , ODI.ITEM_CD
 		  FROM TB_ORDER_DETAIL OD

src/main/java/com/style24/persistence/mybatis/shop/TsfOrder.xml

@@ -226,7 +226,14 @@
 				   AND O.ORD_DT BETWEEN CONCAT(#{stDate}, ' 00:00:00') AND CONCAT(#{edDate}, ' 23:59:59')
 		</if>
 		<if test="ordDtlStat != null and ordDtlStat != ''">
+			<choose>
+				<when test="ordDtlStat == 'G013_00'">
+				   AND OD.ORD_DTL_STAT = 'G013_10'
+				</when>
+				<otherwise>
 				   AND OD.ORD_DTL_STAT = #{ordDtlStat}
+				</otherwise>
+			</choose>
 		</if>
 				 GROUP BY O.ORD_NO
 			   ) Z

src/main/java/com/style24/persistence/mybatis/shop/TsfOrderChange.xml

@@ -527,6 +527,9 @@
 		</if>
 		<if test="chgStat != null and chgStat != ''">
 			<choose>
+				<when test="chgStat == 'G685_91'">
+		           AND OCD.CHG_STAT IN ('G685_21', 'G685_32', 'G685_51')
+				</when>
 				<when test="chgStat == 'G685_34'">
 		           AND OCD.CHG_STAT = 'G685_40'
 		           AND EXISTS (SELECT 1
@@ -541,6 +544,17 @@
 		                        WHERE OD2.ORD_DTL_NO = OCD.CHG_ORD_DTL_NO
 		                          AND OD2.ORD_DTL_STAT IN ('G013_60', 'G013_70'))
 				</when>
+				<when test="chgStat == 'G685_92'">
+		           AND OCD.CHG_STAT IN ('G685_49', 'G685_69')
+				</when>
+				<when test="chgStat == 'G685_93'">
+		           AND OCD.CHG_STAT IN ('G685_17', 'G685_18')
+		           AND OC.CHG_REASON <![CDATA[<>]]> 'G686_30'
+				</when>
+				<when test="chgStat == 'G685_94'">
+		           AND OCD.CHG_STAT IN ('G685_17', 'G685_18')
+		           AND OC.CHG_REASON = 'G686_30'
+				</when>
 				<otherwise>
 		           AND OCD.CHG_STAT = #{chgStat}
 				</otherwise>
@@ -585,7 +599,39 @@
 		           AND OCD.REG_DT BETWEEN CONCAT(#{stDate}, ' 00:00:00') AND CONCAT(#{edDate}, ' 23:59:59')
 		</if>
 		<if test="chgStat != null and chgStat != ''">
+			<choose>
+				<when test="chgStat == 'G685_91'">
+		           AND OCD.CHG_STAT IN ('G685_21', 'G685_32', 'G685_51')
+				</when>
+				<when test="chgStat == 'G685_34'">
+		           AND OCD.CHG_STAT = 'G685_40'
+		           AND EXISTS (SELECT 1
+		                         FROM TB_ORDER_DETAIL OD2
+		                        WHERE OD2.ORD_DTL_NO = OCD.CHG_ORD_DTL_NO
+		                          AND OD2.ORD_DTL_STAT IN ('G013_20', 'G013_30', 'G013_35', 'G013_40', 'G013_50', 'G013_55'))
+				</when>
+				<when test="chgStat == 'G685_40'">
+		           AND OCD.CHG_STAT = 'G685_40'
+		           AND EXISTS (SELECT 1
+		                         FROM TB_ORDER_DETAIL OD2
+		                        WHERE OD2.ORD_DTL_NO = OCD.CHG_ORD_DTL_NO
+		                          AND OD2.ORD_DTL_STAT IN ('G013_60', 'G013_70'))
+				</when>
+				<when test="chgStat == 'G685_92'">
+		           AND OCD.CHG_STAT IN ('G685_49', 'G685_69')
+				</when>
+				<when test="chgStat == 'G685_93'">
+		           AND OCD.CHG_STAT IN ('G685_17', 'G685_18')
+		           AND OC.CHG_REASON <![CDATA[<>]]> 'G686_30'
+				</when>
+				<when test="chgStat == 'G685_94'">
+		           AND OCD.CHG_STAT IN ('G685_17', 'G685_18')
+		           AND OC.CHG_REASON = 'G686_30'
+				</when>
+				<otherwise>
 		           AND OCD.CHG_STAT = #{chgStat}
+				</otherwise>
+			</choose>
 		</if>
 		         GROUP BY OCD.ORD_CHG_SQ
 		       ) Z
@@ -625,7 +671,39 @@
 		   AND OCD.REG_DT BETWEEN CONCAT(#{stDate}, ' 00:00:00') AND CONCAT(#{edDate}, ' 23:59:59')
 		</if>
 		<if test="chgStat != null and chgStat != ''">
+			<choose>
+				<when test="chgStat == 'G685_91'">
+		   AND OCD.CHG_STAT IN ('G685_21', 'G685_32', 'G685_51')
+				</when>
+				<when test="chgStat == 'G685_34'">
+		   AND OCD.CHG_STAT = 'G685_40'
+		   AND EXISTS (SELECT 1
+		                 FROM TB_ORDER_DETAIL OD2
+		                WHERE OD2.ORD_DTL_NO = OCD.CHG_ORD_DTL_NO
+		                  AND OD2.ORD_DTL_STAT IN ('G013_20', 'G013_30', 'G013_35', 'G013_40', 'G013_50', 'G013_55'))
+				</when>
+				<when test="chgStat == 'G685_40'">
+		   AND OCD.CHG_STAT = 'G685_40'
+		   AND EXISTS (SELECT 1
+		                 FROM TB_ORDER_DETAIL OD2
+		                WHERE OD2.ORD_DTL_NO = OCD.CHG_ORD_DTL_NO
+		                  AND OD2.ORD_DTL_STAT IN ('G013_60', 'G013_70'))
+				</when>
+				<when test="chgStat == 'G685_92'">
+		   AND OCD.CHG_STAT IN ('G685_49', 'G685_69')
+				</when>
+				<when test="chgStat == 'G685_93'">
+		   AND OCD.CHG_STAT IN ('G685_17', 'G685_18')
+		   AND OC.CHG_REASON <![CDATA[<>]]> 'G686_30'
+				</when>
+				<when test="chgStat == 'G685_94'">
+		   AND OCD.CHG_STAT IN ('G685_17', 'G685_18')
+		   AND OC.CHG_REASON = 'G686_30'
+				</when>
+				<otherwise>
 		   AND OCD.CHG_STAT = #{chgStat}
+				</otherwise>
+			</choose>
 		</if>
 		 GROUP BY OCD.ORD_CHG_SQ
 		<include refid="selectForPagingFooter"/>

src/main/webapp/WEB-INF/views/web/mypage/MypageCreListFormWeb.html

@@ -82,7 +82,7 @@
 					<!-- //주문 현황 -->
 				</div>
 				<div class="sec_body">
-					<h3 class="subH2">취소/교환/반품 내역</h3>
+					<h3 class="subH2">취소/반품/교환 내역</h3>
 					<!-- 주문조회 검색 -->
 					<div class="area_filter">
 						<div class="select_month_box">
@@ -127,7 +127,19 @@
 											<ul class="list">
 												<!-- 선택처리 class="selected" / 선택불가 aria-disabled="true" 추가  -->
 												<li class="selected" code="">전체상태</li>
-												<li th:if="${chgStatList}" th:each="oneData, status : ${chgStatList}" th:attr="code=${oneData.cd}" th:text="${oneData.cdNm}"></li>
+												<li code="G685_91">결제대기</li>
+												<li code="G685_20">교환접수</li>
+												<li code="G685_50">반품접수</li>
+												<li code="G685_30">회수요청</li>
+												<li code="G685_31">상품 검수중</li>
+												<li code="G685_34">교환 진행중</li>
+												<li code="G685_33">환불 진행중</li>
+												<li code="G685_40">교환완료</li>
+												<li code="G685_60">반품완료</li>
+												<li code="G685_92">접수취소</li>
+												<li code="G685_93">주문취소</li>
+												<li code="G685_94">품절취소</li>
+<!--												<li th:if="${chgStatList}" th:each="oneData, status : ${chgStatList}" th:attr="code=${oneData.cd}" th:text="${oneData.cdNm}"></li>-->
 											</ul>
 										</div>
 									</div>
@@ -150,7 +162,6 @@
 					<input type="hidden" name="chgStat" value="" />
 					<input type="hidden" name="stDate" value="" />
 					<input type="hidden" name="edDate" value="" />
-					<input type="hidden" name="custNo" th:value ="${custNo}"/>
 				</form>
 				<form id="exchangeForm" name="exchangeForm" action="#" th:action="@{'/mypage/cre/exchange/detail/form'}" th:method="post">
 					<input type="hidden" name="ordChgSq"/>
@@ -227,15 +238,63 @@
 
 	// 검색기간 설정 체크
 	var fnCheckPeriod = function(param) {
+		let id = $(param).attr('id');
 		let stDate = $('#stDate').val();
 		let edDate = $('#edDate').val();
+		let chgDate;
+
+		$('#searchForm input[name=stDate]').val(stDate);
+		$('#searchForm input[name=edDate]').val(edDate);
 
 		let sdt = new Date(stDate);
 		let edt = new Date(edDate);
+		let today = new Date();
+
+		// 검색기간 버튼 처리
+		$.each($('.select_month_box input:radio'), function(idx, item) {
+			if ($(item).is(':checked')) {
+				$(item).prop('checked', false);
+			}
+		});
+
+		// 오늘 이후 날짜 선택 처리
+		chgDate = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + (today.getDate())).slice(-2);
+		if (id == 'stDate' && Math.ceil((sdt.getTime() - today.getTime()) / (1000 * 3600 * 24))) {
+			mcxDialog.alert('조회기간을 확인해주세요.');
+			$('#stDate').val(chgDate);
+			$('#searchForm input[name=stDate]').val(chgDate);
+
+			return false;
+		} else if (id == 'edDate' && Math.ceil((edt.getTime() - today.getTime()) / (1000 * 3600 * 24))) {
+			mcxDialog.alert('조회기간을 확인해주세요.');
+			$('#edDate').val(chgDate);
+			$('#searchForm input[name=edDate]').val(chgDate);
+
+			return false;
+		}
+
+		// 시작 종료일자 확인
+		if (sdt > edt) {
+			mcxDialog.alert('조회기간을 확인해주세요.');
+
+			if (id == 'stDate') {
+				chgDate = sdt.getFullYear() + '-' + ('0' + (sdt.getMonth() + 1)).slice(-2) + '-' + ('0' + (sdt.getDate())).slice(-2);
+			} else {
+				chgDate = edt.getFullYear() + '-' + ('0' + (edt.getMonth() + 1)).slice(-2) + '-' + ('0' + (edt.getDate())).slice(-2);
+			}
+
+			$('#stDate').val(chgDate);
+			$('#edDate').val(chgDate);
+			$('#searchForm input[name=stDate]').val(chgDate);
+			$('#searchForm input[name=edDate]').val(chgDate);
+
+			return false;
+		}
+
+		// 기간 1년 확인
 		let dateDiff = Math.ceil((edt.getTime() - sdt.getTime()) / (1000 * 3600 * 24));
 
 		if (dateDiff > 366) {
-			let id = $(param).attr('id');
 			mcxDialog.alert('조회기간은 최대 1년을 넘을 수 없습니다.');
 			if (id == 'stDate') {
 				sdt.setFullYear(sdt.getFullYear() + 1);
@@ -250,6 +309,8 @@
 				$('#stDate').val(chgStDate);
 				$('#searchForm input[name=stDate]').val(chgStDate);
 			}
+
+			return false;
 		}
 	}
 
@@ -258,8 +319,7 @@
 		let url = '/mypage/status/count';
 		
 		let data = {};
-		data.custNo = customerInfo.custNo;
-		
+
 		let jsonData = JSON.stringify(data);
 		
 		gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
@@ -425,11 +485,11 @@
 						tag += '									<div class="order_text"><p>' + cre.addPayCost.addComma() + '원 결제 후 반품 가능합니다.</p></div>\n';
 					}
 					// 상품 검수중(반품)
-					if (cre.chgStat == 'G685_31' && cre.chgGb == 'G680_40') {
+					if (cre.chgStat == 'G685_31' && cre.chgGb == 'G680_30') {
 						tag += '									<div class="order_text"><p>고객님이 반품하신 상품을 검수 중에 있습니다.</p></div>\n';
 					}
 					// 결제대기(반품)
-					if (cre.chgStat == 'G685_32' && cre.chgGb == 'G680_40') {
+					if (cre.chgStat == 'G685_32' && cre.chgGb == 'G680_30') {
 						tag += '									<div class="order_text"><p>' + cre.addPayCost.addComma() + '원 결제 후 반품 가능합니다.</p></div>\n';
 					}
 					// 환불진행중

src/main/webapp/WEB-INF/views/web/mypage/MypageCreReturnDetailFormWeb.html

@@ -269,6 +269,7 @@
 	/*<![CDATA[*/
 	let oneData = [[${oneData}]];
 	var isLogin = [[${isLogin}]];
+	let jsonObj = {};
 
 	$(document).ready(function() {
 		// 마이페이지 LNB 설정

src/main/webapp/WEB-INF/views/web/mypage/MypageExchangeFormWeb.html

@@ -96,8 +96,8 @@
 																<div class="select">선택</div>
 																<ul class="list">
 																	<!-- 선택처리 class="selected" / 선택불가 aria-disabled="true" 추가  -->
-																	<li class="selected" qty="0" onclick="fnChangeExchangeQty(this);">선택</li>
-																	<li th:if="${exchange.ordCanChgQty > 0}" th:each="num : ${#numbers.sequence(1,exchange.ordCanChgQty)}" th:attr="qty=${num}" th:text="${num}" onclick="fnChangeExchangeQty(this);"></li>
+																	<li class="selected" qty="0" th:attr="ordDtlNo=${exchange.ordDtlNo}" onclick="fnChangeExchangeQty(this);">선택</li>
+																	<li th:if="${exchange.ordCanChgQty > 0}" th:each="num : ${#numbers.sequence(1,exchange.ordCanChgQty)}" th:attr="qty=${num}, ordDtlNo=${exchange.ordDtlNo}" th:text="${num}" onclick="fnChangeExchangeQty(this);"></li>
 																</ul>
 															</div>
 														</div>
@@ -139,7 +139,7 @@
 										<td>
 											<div class="form_field">
 												<div class="input_wrap">
-													<textarea class="doc_reason" name="chgMemo" id="chgMemo" cols="30" rows="10" placeholder="자세한 사유를 입력해주세요." style="resize: none;"></textarea>
+													<textarea class="doc_reason" name="chgMemo" id="chgMemo" cols="30" rows="10" placeholder="자세한 사유를 입력해주세요." onkeyup="cfnGetTextLength(this, 200, $('#reason_cnt'));" style="resize: none;"></textarea>
 													<p class="txt_cnt"><span id="reason_cnt" class="c_primary">0</span>/200</p>
 												</div>
 											</div>
@@ -228,7 +228,7 @@
 											<form class="form_wrap">
 												<div class="form_field">
 													<div class="input_wrap">
-														<input type="text" class="form_control" name="wdInvoiceNo" placeholder="송장번호를 입력해주세요.">
+														<input type="text" class="form_control" name="wdInvoiceNo" data-valid-type="numeric" placeholder="송장번호를 입력해주세요.">
 													</div>
 												</div>
 											</form>
@@ -302,6 +302,7 @@
 	let oneData = [[${oneData}]];
 	let isCustomer = false;
 	let addrGb = '';
+	let jsonObj = {};
 
 	$(document).ready(function() {
 		// 마이페이지 LNB 설정
@@ -517,9 +518,26 @@
 
 	// 교환 수량 변경 이벤트
 	var fnChangeExchangeQty = function(param) {
+		let ordDtlNo = $(param).attr('ordDtlNo');
+
 		if (param != null) {
 			$(param).parent().parent().find('input[name=chgQty]').val($(param).attr('qty'));
 		}
+
+		// 교환옵션 표기 초기화
+		$.each($('.exchangeOption'), function(idx, item) {
+			if (ordDtlNo == $(item).attr('ordDtlNo')) {
+				$(item).css('display', 'none');
+				$(item).find('.option_wrap').html('');
+			}
+		});
+
+		// 교환옵션 값 초기화
+		$.each($('#exchangeForm input[name=chgOptionList]'), function(idx, item) {
+			if (ordDtlNo == $(item).attr('ordDtlNo')) {
+				$(item).val('');
+			}
+		});
 		
 		// 추가 배송비 계산
 		fnAddCost();

src/main/webapp/WEB-INF/views/web/mypage/MypageOrderDetailFormWeb.html

@@ -460,7 +460,7 @@
 							</table>
 						</div>
 						<div class="btn_footer_area">
-							<button type="button" class="btn btn_dark btn_md"><span>확인</span></button>
+							<button type="button" class="btn btn_dark btn_md" onclick="cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);"><span>확인</span></button>
 						</div>
 					</div>
 				</form>

src/main/webapp/WEB-INF/views/web/mypage/MypageOrderListFormWeb.html

@@ -54,7 +54,7 @@
 									</li>
 									<li>
 										<div>
-											<p class="txt">STYLE24 포인트</p>
+											<p class="txt">STYLE 포인트</p>
 											<p class="count"><span th:text="${#numbers.formatInteger(rmPntAmt, 1, 'COMMA')}"></span>P</p>
 										</div>
 									</li>
@@ -184,7 +184,6 @@
 					<input type="hidden" name="ordDtlStat" value="" />
 					<input type="hidden" name="stDate" value="" />
 					<input type="hidden" name="edDate" value="" />
-					<input type="hidden" name="custNo" th:value ="${customerInfo.custNo}"/>
 				</form>
 				<form id="exchangeForm" name="exchangeForm" action="#" th:action="@{'/mypage/exchange/form'}" th:method="post">
 					<input type="hidden" name="ordNo"/>
@@ -208,7 +207,6 @@
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
 	let ordNo = [[${ordNo}]];
-	let customerInfo = [[${customerInfo}]];
 	let totalCount = 0;
 	let pageSize = 0;
 /*<![CDATA[*/
@@ -268,18 +266,42 @@
 		let id = $(param).attr('id');
 		let stDate = $('#stDate').val();
 		let edDate = $('#edDate').val();
+		let chgDate;
 
 		$('#searchForm input[name=stDate]').val(stDate);
 		$('#searchForm input[name=edDate]').val(edDate);
 
 		let sdt = new Date(stDate);
 		let edt = new Date(edDate);
+		let today = new Date();
+
+		// 검색기간 버튼 처리
+		$.each($('.select_month_box input:radio'), function(idx, item) {
+			if ($(item).is(':checked')) {
+				$(item).prop('checked', false);
+			}
+		});
+
+		// 오늘 이후 날짜 선택 처리
+		chgDate = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + (today.getDate())).slice(-2);
+		if (id == 'stDate' && Math.ceil((sdt.getTime() - today.getTime()) / (1000 * 3600 * 24)) > 0) {
+			mcxDialog.alert('조회기간을 확인해주세요.');
+			$('#stDate').val(chgDate);
+			$('#searchForm input[name=stDate]').val(chgDate);
+			
+			return false;
+		} else if (id == 'edDate' && Math.ceil((edt.getTime() - today.getTime()) / (1000 * 3600 * 24)) > 0) {
+			mcxDialog.alert('조회기간을 확인해주세요.');
+			$('#edDate').val(chgDate);
+			$('#searchForm input[name=edDate]').val(chgDate);
+			
+			return false;
+		}
 
 		// 시작 종료일자 확인
 		if (sdt > edt) {
 			mcxDialog.alert('조회기간을 확인해주세요.');
 			
-			let chgDate;
 			if (id == 'stDate') {
 				chgDate = sdt.getFullYear() + '-' + ('0' + (sdt.getMonth() + 1)).slice(-2) + '-' + ('0' + (sdt.getDate())).slice(-2);
 			} else {
@@ -290,7 +312,7 @@
 			$('#edDate').val(chgDate);
 			$('#searchForm input[name=stDate]').val(chgDate);
 			$('#searchForm input[name=edDate]').val(chgDate);
-			
+
 			return false;
 		}
 
@@ -312,35 +334,41 @@
 				$('#stDate').val(chgStDate);
 				$('#searchForm input[name=stDate]').val(chgStDate);
 			}
+			
+			return false;
 		}
 	}
-	
+
 	// 등급혜택 보기 클릭 이벤트
 	var fnGoToCustomerBenefit = function() {
-		// TODO
-		// 등급혜택보기 페이지 이동
+		cfnGoToPage(_PAGE_CUSTOMER_GRADE_BENEFIT);
 	}
-	
+
 	// 등급쿠폰 다운 클릭 이벤트
 	var fnDownloadCoupon = function() {
-		let url = '/mypage/coupon/download/all';
-
-		let data = {};
-		data.custNo = customerInfo.custNo;
+		let url = '/planning/event/custgrade/coupon/down';
 
-		let jsonData = JSON.stringify(data);
+		let params = JSON.stringify({});
+		gagajf.ajaxJsonSubmit(url, params, function(result) {
+			let message = '이미 다운로드를 완료 하셨습니다.';
+			if (result.isDownload) {
+				message = '총 ' + result.downloadCnt + '장의 쿠폰을 다운로드 하였습니다.';
+			}
 
-		gagajf.ajaxJsonSubmit(url, jsonData, function() {
-			fnReloadCouponCount();
+			mcxDialog.alertC(message, {
+				sureBtnText: "확인",
+				sureBtnClick: function () {
+					fnReloadCouponCount();
+				}
+			});
 		});
 	}
-	
+
 	// 보유쿠폰 수량 업데이트 처리
 	var fnReloadCouponCount = function() {
 		let url = '/mypage/coupon/count';
 		
 		let data = {};
-		data.custNo = customerInfo.custNo;
 		
 		let jsonData = JSON.stringify(data);
 		
@@ -355,7 +383,6 @@
 		let url = '/mypage/status/count';
 		
 		let data = {};
-		data.custNo = customerInfo.custNo;
 		
 		let jsonData = JSON.stringify(data);
 		
@@ -568,6 +595,13 @@
 							tag += '									</div>\n';
 						}
 						
+						// 결제완료
+						if (ordDtl.ordDtlStat == 'G013_20' && !gagajf.isNull(ordDtl.delvResDt)) {
+							tag += '									<div class="order_text">';
+							tag += '										<p>예약판매 상품으로' + ordDtl.delvResDt + ' 출고 예정입니다.</p>';
+							tag += '									</div>\n';
+						}
+						
 						// 상품준비중
 						if (ordDtl.ordDtlStat == 'G013_30') {
 							tag += '									<div class="order_text">';
@@ -658,7 +692,6 @@
 			tag += '							</div>';
 			tag += '						</div>';
 		}
-console.log(tag);
 		return tag;
 	}
 /*]]>*/

src/main/webapp/WEB-INF/views/web/mypage/MypageReturnFormWeb.html

@@ -228,7 +228,7 @@
 												<form class="form_wrap">
 													<div class="form_field">
 														<div class="input_wrap">
-															<input type="text" class="form_control" name="wdInvoiceNo" placeholder="송장번호를 입력해주세요.">
+															<input type="text" class="form_control" name="wdInvoiceNo" data-valid-type="numeric" placeholder="송장번호를 입력해주세요.">
 														</div>
 													</div>
 												</form>
@@ -263,7 +263,7 @@
 												</div>
 												<div class="include_item">
 													<dt>배송비</dt>
-													<dd><em id="비">0</em>원</dd>
+													<dd><em id="deliveryFee">0</em>원</dd>
 												</div>
 												<div class="include_item">
 													<dt>할인 금액 차감</dt>
@@ -355,10 +355,15 @@
 		fnSetMypageLocation('취소/반품/환불내역', '_PAGE_MYPAGE_CRE_LIST', '반품 신청');
 
 		// 반품상품 수량 셀렉트박스 활성화
-		var goods_count_selecter = new sCombo('.myOrderView .part_goods .select_custom.select_count');
+		//var goods_count_selecter = new sCombo('.myOrderView .part_goods .select_custom.select_count');
 
 		// 반품사유 셀렉트박스 활성화
-		var return_reason_selecter = new sCombo('.myOrderView .tbl.type1 td .select_custom.select_reason');
+		//var return_reason_selecter = new sCombo('.myOrderView .tbl.type1 td .select_custom.select_reason');
+		
+		// 셀렉트박스 활성화
+		$('.select_custom').each(function() {
+			new sCombo($(this));
+		});
 
 		// 입점업체의 경우 회수방식 직접배송 처리
 		if (oneData.selfGoodsYn != 'Y') {
@@ -385,10 +390,12 @@
 		$.each($('#returnForm input[name=chgQty]'), function(idx, item) {
 			let chgQty = $(item).val();
 			let ordDtlNo = $(item).attr('ordDtlNo');
-			
-			ordDtlNoArr.push(Number(ordDtlNo));
-			cnclRtnReqQtyArr.push(Number(chgQty));
-			chkQty += chgQty;
+
+			if (chgQty > 0) {
+				ordDtlNoArr.push(Number(ordDtlNo));
+				cnclRtnReqQtyArr.push(Number(chgQty));
+				chkQty += chgQty;
+			}
 		});
 
 		// 반품 수량 체크
@@ -431,7 +438,7 @@
 
 		// 추가배송비 PG 처리
 		let addPayCost = $('#returnForm input[name=addPayCost]').val();
-
+		alert(addPayCost);
 		let data = {};
 		data.ordNo = oneData.ordNo;
 		data.ordChgSq = 0;
@@ -503,12 +510,9 @@
 			let jsonData = JSON.stringify(data);
 
 			gagajf.ajaxJsonSubmit(url, jsonData, function (result) {
-				// 환불포인트, 환불상품권 금액 계산
 				let refundPoint = Number(result.spanPntDcAmt);
 				let refundGiftCard = Number(result.spanGfcdUseAmt);
-
 				let spanCnclRtnAmt = Number(result.spanCnclRtnAmt);
-				let sumDeliveryFee = Number(result.sumDeliveryFee);
 				let spanTotDeliveryFee = Number(result.spanTotDeliveryFee);
 				let spanCpnDcAmt = Number(result.spanCpnDcAmt);
 				let spanTmtbDcAmt = Number(result.spanTmtbDcAmt);
@@ -519,10 +523,8 @@
 				// 반품 사유 및 반품 방식 배송비 계산
 				if (result.spanRealCnclRtnAmt > 0) {
 					let wdGb = $('#returnForm input[name=wdGb]:radio:checked').val();
-
 					// 회사사유 : 추가배송비 0, 반품배송비 0
 					if (!isCustomer) {
-						spanTotDeliveryFee = 0;
 						spanTotRtnDelvFee = 0;
 					}
 					// 고객사유(직접발송) : 반품배송비 0
@@ -531,16 +533,18 @@
 					}
 				}
 
-				let addDelvFee = spanTotDeliveryFee + spanTotRtnDelvFee;
-
 				let goodsCancelAmt = spanCnclRtnAmt;										// 상품취소금액
-				let deliveryFee = sumDeliveryFee - addDelvFee;								// 배송비
+				let addDelvFee = spanTotRtnDelvFee;											// 추가배송비
 				let deductDcAmt = 0 - spanCpnDcAmt - spanTmtbDcAmt - spanPrePntDcAmt;		// 할인금액 차감(쿠폰+다다익선+선포인트)
-				let refundPayAmt = spanRefundAmt - addDelvFee;								// 결제금액 환불
+				let refundPayAmt = spanRefundAmt - spanTotRtnDelvFee;						// 결제금액 환불
+
+				if (!isCustomer) {
+					refundPayAmt += spanTotDeliveryFee;
+				}
 
 				// 추가배송비 영역 설정
 				if (refundPayAmt < 0) {
-					refundPayAmt = spanRefundAmt;
+					refundPayAmt += addDelvFee;
 					$('#addDeliveryFee').css('display', '');
 					$('#addPayCost').text(addDelvFee.addComma() + '원');
 					$('#returnForm input[name=addPayCost]').val(addDelvFee);
@@ -554,7 +558,7 @@
 				// 금액 설정
 				$('#returnAmt').text(returnAmt.addComma());
 				$('#goodsCancelAmt').text(goodsCancelAmt.addComma());
-				$('#deliveryFee').text(deliveryFee.addComma());
+				$('#deliveryFee').text((0 - addDelvFee).addComma());
 				$('#deductDcAmt').text(deductDcAmt.addComma());
 				$('#refundPayAmt').text(refundPayAmt.addComma());
 				$('#refundPoint').text(refundPoint.addComma());
@@ -565,7 +569,7 @@
 
 	// 반품 방식 변경 이벤트
 	$('#returnForm input[name=wdGb]').on('change', function() {
-		let wdGb = $('i#returnForm input[name=wdGb]:radio:checked').val();
+		let wdGb = $('#returnForm input[name=wdGb]:radio:checked').val();
 
 		if (wdGb == 'W') {
 			$('#chgerLocation').css('display', '');

src/main/webapp/biz/mypage.js

@@ -2,15 +2,15 @@
 var fnSetMypageLnbList = function(lnbLvl) {
 	let tag = '';
 	tag += '<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);"' + (lnbLvl == 1 ? ' class="on"' : '') + '>주문확인/배송조회</a></li>\n';
-	tag += '<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);"' + (lnbLvl == 2 ? ' class="on"' : '') + '>취소/반품/환불내역</a></li>\n';
+	tag += '<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);"' + (lnbLvl == 2 ? ' class="on"' : '') + '>취소/반품/교환 내역</a></li>\n';
 	tag += '<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MYPAGE_RESTOCK);"' + (lnbLvl == 3 ? ' class="on"' : '') + '>재입고 알림 내역</a></li>\n';
 	tag += '<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MYPAGE_COUPON);"' + (lnbLvl == 4 ? ' class="on"' : '') + '>쿠폰</a></li>\n';
-	tag += '<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MYPAGE_POINT);"' + (lnbLvl == 5 ? ' class="on"' : '') + '>STYLE24 포인트</a></li>\n';
+	tag += '<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MYPAGE_POINT);"' + (lnbLvl == 5 ? ' class="on"' : '') + '>STYLE 포인트</a></li>\n';
 	tag += '<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MYPAGE_GIFTCARD);"' + (lnbLvl == 6 ? ' class="on"' : '') + '>상품권</a></li>\n';
 	tag += '<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MYPAGE_REVIEW);"' + (lnbLvl == 7 ? ' class="on"' : '') + '>리뷰</a></li>\n';
 	tag += '<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MYPAGE_DELIVERY_ADDR);"' + (lnbLvl == 8 ? ' class="on"' : '') + '>배송지 관리</a></li>\n';
 	tag += '<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MYPAGE_WISHLIST);"' + (lnbLvl == 9 ? ' class="on"' : '') + '>위시리스트</a></li>\n';
-	tag += '<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MYPAGE_CUSTOMER);"' + (lnbLvl == 10 ? ' class="on"' : '') + '>내정보 관리</a></li>\n';
+	tag += '<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MYPAGE_CUSTOMER);"' + (lnbLvl == 10 ? ' class="on"' : '') + '>내 정보 관리</a></li>\n';
 	tag += '<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MYPAGE_SECEDE);"' + (lnbLvl == 11 ? ' class="on"' : '') + '>회원 탈퇴</a></li>\n';
 	tag += '</ul>';
 	$('#mypageLnbList').html(tag);