Merge branch 'develop' into eskim

src/main/java/com/style24/front/biz/dao/TsfOrderDao.java

@@ -46,6 +46,16 @@ public interface TsfOrderDao {
 	 */
 	int getPagingOrdNoListCount(Order order);
 
+	/**
+	 * 마이페이지 주문목록 사은품 조회
+	 *
+	 * @param Order
+	 * @return Collection<Order>
+	 * @author card007
+	 * @since 2021. 03. 19
+	 */
+	Collection<Order> getOrderFreeGiftListForMypage(Order order);
+
 	/**
 	 * 마이페이지 주문목록 페이징 처리 주문번호 조회
 	 *

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

@@ -92,10 +92,13 @@ public class TsfOrderService {
 	}
 	
 	private GagaMap setOrderMap(Collection<Order> ordDtlList) {
+		Order order = ordDtlList.iterator().next();
+
 		GagaMap map = new GagaMap();
-		map.set("giftPackYn", ordDtlList.iterator().next().getGiftPackYn());
-		map.set("ordNo", ordDtlList.iterator().next().getOrdNo());
-		map.set("ordDt", ordDtlList.iterator().next().getOrdDt());
+		map.set("giftPackYn", order.getGiftPackYn());
+		map.set("ordNo", order.getOrdNo());
+		map.set("ordDt", order.getOrdDt());
+		map.set("freeGiftList", orderDao.getOrderFreeGiftListForMypage(order));
 		map.set("ordDtlList", ordDtlList);
 
 		return map;

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

@@ -19,6 +19,9 @@ 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.GagaResponse;
+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.TscKakaoPayService;
@@ -49,12 +52,6 @@ import com.style24.persistence.domain.WishList;
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.web.parameter.GagaMap;
-import com.gagaframework.web.rest.server.GagaResponse;
-import com.gagaframework.web.rest.server.GagaResponseStatus;
-
-import lombok.extern.slf4j.Slf4j;
-
 /**
  * 마이페이지 Controller
  * 
@@ -235,19 +232,15 @@ public class TsfMypageController extends TsfBaseController {
 	@PostMapping("/order/list")
 	@ResponseBody
 	public GagaMap getOrderList(@RequestBody Order order) {
-		GagaMap map = new GagaMap();
-		ModelAndView mav = new ModelAndView();
+		GagaMap result = new GagaMap();
 
 		// 페이징 처리 설정
-		// order.setPageable(new TscPageRequest(order.getPageNo() - 1, 5));
 		TscPageRequest pageable = new TscPageRequest((order.getPageNo() > 0 ? order.getPageNo() - 1 : 0), order.getPageSize(), order.getPageUnit());
 		pageable.setTotalCount(orderService.getPagingOrdNoListCount(order));
 		order.setPageable(pageable);
-		log.info("pageable: {}", pageable);
-		log.info("totalCount {}", pageable.getTotalCount());
-		log.info("order >>> {}", order);
 
 		// 페이징 처리 및 주문정보 조회
+		Collection<GagaMap> orderList = new ArrayList<>();
 		List<Integer> ordNoList = new ArrayList<>();
 
 		for (Order tmpOrder : orderService.getPagingOrdNoList(order)) {
@@ -256,16 +249,13 @@ public class TsfMypageController extends TsfBaseController {
 
 		if (ordNoList.size() > 0) {
 			order.setOrdNoList(ordNoList.stream().mapToInt(Integer::intValue).toArray());
+			orderList = orderService.getOrderListForMypage(order);
 		}
 
-		map.set("orderList", orderService.getOrderListForMypage(order));
-		map.set("orderInfo", order);
-		
-		// mav.setViewName(super.getDeviceViewName("mypage/MypageOrderList"));
-		
-		// map.set("mav", mav);
-		// map.set("paging", order.getPageable());
-		return map;
+		result.set("orderList", orderList);
+		result.set("orderInfo", order);
+
+		return result;
 	}
 
 	/**

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

@@ -27,32 +27,26 @@
 	
 	<select id="getGiftcardUseList" parameterType="GiftCard" resultType="GiftCard">
 		/*TsfGiftcard.getGiftcardUseList*/
-		SELECT A.* 
-		      ,(CASE A.OCCUR_GB WHEN 'G074_11'THEN '+' 
-		                        WHEN 'G074_12'THEN '-'
-		                        WHEN 'G074_13'THEN '+'
-		                        WHEN 'G074_14'THEN '-'
-		                        WHEN 'G074_15'THEN '-'
-		                        WHEN 'G074_16'THEN '-'
-		                        WHEN 'G074_17'THEN '+'
-		                        WHEN 'G074_18'THEN '+'
-		                        WHEN 'G074_19'THEN '-'
-		       END) AS BALANCE
-		      ,(CASE A.OCCUR_GB WHEN 'G074_11'THEN '상품권 등록'        
-                         WHEN 'G074_12'THEN '상품권 사용'       
-                         WHEN 'G074_13'THEN '상품권 사용취소'     
-                         WHEN 'G074_14'THEN '상품권 유효기간만료'   
-                         WHEN 'G074_15'THEN '상품권 파기'       
-                         WHEN 'G074_16'THEN '상품권 현금전환'     
-                         WHEN 'G074_17'THEN '결품으로 인한 기간 연장'
-                         WHEN 'G074_18'THEN '오환불로 인한 금액추가' 
-                         WHEN 'G074_19'THEN '오환불로 인한 금액차감' 
-               END) AS BALANCE_NAME
-		      ,B.GOODS_CD 
-		      ,D.GOODS_NM 
-		FROM TB_CUST_GIFTCARD_HST A LEFT JOIN TB_ORDER_DETAIL B ON A.ORD_DTL_NO = B.ORD_DTL_NO AND A.ORD_NO = B.ORD_NO
-									LEFT JOIN TB_CUST_GIFTCARD C ON A.CUST_GFCD_SQ =C.CUST_GFCD_SQ 
-									LEFT JOIN TB_GOODS D ON B.GOODS_CD = D.GOODS_CD 
+		SELECT A.GFCD_HST_SQ
+		      , A.CUST_NO
+		      , A.OCCUR_GB
+		      , A.OCCUR_DTL_DESC
+		      , A.GFCD_AMT
+		      , A.CUST_GFCD_SQ
+		      , A.ORD_NO
+		      , A.ORD_DTL_NO
+		      , A.REG_NO
+		      , A.REG_DT
+		      , A.UPD_NO
+		      , A.UPD_DT
+		      , B.GOODS_CD 
+		      , D.GOODS_NM 
+		FROM TB_CUST_GIFTCARD_HST A INNER JOIN TB_ORDER_DETAIL B 
+													ON A.ORD_DTL_NO = B.ORD_DTL_NO AND A.ORD_NO = B.ORD_NO
+									INNER JOIN TB_CUST_GIFTCARD C 
+													ON A.CUST_GFCD_SQ =C.CUST_GFCD_SQ 
+									INNER JOIN TB_GOODS D 
+													ON B.GOODS_CD = D.GOODS_CD 
 		WHERE 1=1
 		 AND A.CUST_NO = #{custNo}
 		 <choose>

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

@@ -17,7 +17,7 @@
 
 	<!-- 마이페이지 주문 목록 조회 -->
 	<select id="getOrderListForMypage" parameterType="Order" resultType="Order">
-		/* TscOrder.getOrderListForMypage */
+		/* TsfOrder.getOrderListForMypage */
 		SELECT O.ORD_NO
 		     , DATE_FORMAT(O.ORD_DT, '%Y.%m.%d') AS ORD_DT
 		     , CASE OD.GIFT_PACK_YN WHEN 'Y' THEN DATE_FORMAT(O.ORD_DT + INTERVAL 3 DAY, '%Y.%m.%d')
@@ -50,7 +50,7 @@
 		     , OD.SUPPLY_COMP_CD
 		     , OD.DELV_FEE_CD
 		     , OD.SHOT_DELV_YN
-		     , OD.CHANGABLE_YN
+		     , OD.CHANGEABLE_YN
 		     , OD.RETURNABLE_YN
 		     , G.SELF_GOODS_YN
 		     , CONCAT(B.BRAND_ENM, ' ', B.BRAND_KNM)						AS BRAND_NM
@@ -125,7 +125,7 @@
 
 	<!-- 마이페이지 주문 상태 별 수량 조회 -->
 	<select id="getOrderStatCount" parameterType="Order" resultType="Order">
-		/* TscOrder.getOrderStatCount */
+		/* TsfOrder.getOrderStatCount */
 		SELECT SUM(Z.ORDER_RECEIPT)                          AS ORDER_RECEIPT_COUNT
 		     , SUM(Z.PAYMENT_COMPLETE)                       AS PAYMENT_COMPLETE_COUNT
 		     , SUM(Z.GOODS_PREPARE)                          AS GOODS_PREPARE_COUNT
@@ -178,7 +178,7 @@
 
 	<!-- 마이페이지 주문목록 페이징 처리 주문번호 수 조회 -->
 	<select id="getPagingOrdNoListCount" parameterType="Order" resultType="int">
-		/* TscOrder.getPagingOrdNoList */
+		/* TsfOrder.getPagingOrdNoList */
 		SELECT COUNT(*) AS CNT
 		  FROM (SELECT O.ORD_NO
 				  FROM TB_ORDER O
@@ -198,7 +198,7 @@
 
 	<!-- 마이페이지 주문목록 페이징 처리 주문번호 조회 -->
 	<select id="getPagingOrdNoList" parameterType="Order" resultType="Order">
-		/* TscOrder.getPagingOrdNoList */
+		/* TsfOrder.getPagingOrdNoList */
 		<include refid="selectForPagingHeader"/>
 		SELECT O.ORD_NO
 		     , RANK() OVER(ORDER BY O.ORD_DT DESC) AS NUMB
@@ -216,10 +216,24 @@
 		 GROUP BY O.ORD_NO
 		<include refid="selectForPagingFooter"/>
 	</select>
+	
+	<!-- 마이페이지 주문목록 사은품 조회 -->
+	<select id="getOrderFreeGiftListForMypage" parameterType="Order" resultType="Order">
+		/* TsfOrder.getPagingOrdNoList */
+		SELECT FG.GOODS_NM
+			 , OFV.USE_POINT
+		  FROM TB_ORD_FREEGIFT OFG
+		 INNER JOIN TB_ORD_FREEGIFT_VAL OFV
+		    ON OFG.ORD_FREEGIFT_SQ = OFV.ORD_FREEGIFT_SQ
+		 INNER JOIN TB_FREE_GOODS FG
+		    ON OFV.PRODUCT_NO = FG.PRODUCT_NO
+		   AND OFV.PRODUCT_CODE = FG.PRODUCT_CODE
+		 WHERE OFG.ORD_NO = #{ordNo}
+	</select>
 
 	<!-- 마이페이지 주문상세 금액정보 조회 -->
 	<select id="getOrderAmtForMypage" parameterType="Order" resultType="Order">
-		/* TscOrder.getOrderAmtForMypage */
+		/* TsfOrder.getOrderAmtForMypage */
 		SELECT SUM(OD.ORD_AMT)          AS ORD_AMT
 			 , SUM(OD.CPN1_DC_AMT)      AS CPN1_DC_AMT
 			 , SUM(OD.TMTB1_DC_AMT)     AS TMTB1_DC_AMT
@@ -248,7 +262,7 @@
 
 	<!-- 마이페이지 주문상세 결제정보 조회 -->
 	<select id="getPaymentInfoForMypage" parameterType="Order" resultType="Order">
-		/* TscOrder.getPaymentInfoForMypage */
+		/* TsfOrder.getPaymentInfoForMypage */
 		SELECT PAY_SQ
 		     , ORD_NO
 		     , PAY_DT
@@ -312,7 +326,7 @@
 
 	<!-- 마이페이지 주문상세 배송지 정보 조회 -->
 	<select id="getOrderDeliveryAddrInfo" parameterType="Order" resultType="Order">
-		/* TscOrder.getOrderDeliveryAddrInfo */
+		/* TsfOrder.getOrderDeliveryAddrInfo */
 		SELECT DA.DELV_ADDR_SQ
 			 , DA.RECIP_NM
 			 , DA.RECIP_PHNNO

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

@@ -200,12 +200,12 @@
 					$.each(cate1.cate2List, function(idx2, cate2) {
 						tag += '					<li>\n';
 						tag += '						<a href="javascript:void(0);" onclick="cfnGoToCategoryMain(\'' + cate2.cateGb + '\',\'' + cate2.cate1No + '\',\'' + cate2.cate2No + '\');">' + cate2.cate2Nm + '</a>\n';
-						if (cate2.leafYn == 'N' && cate2.cate3List.length > 0) {
+						if (cate2.leafYn == 'N' && cate2.cate3List != null && cate2.cate3List.length > 0) {
 							tag += '						<ul class="box_depth2">\n';
 							$.each(cate2.cate3List, function(idx3, cate3) {
 								tag += '							<li>\n';
 								tag += '								<a href="javascript:void(0);" onclick="cfnGoToCategoryMain(\'' + cate3.cateGb + '\',\'' + cate3.cate1No + '\',\'' + cate3.cate2No + '\',\'' + cate3.cate3No + '\');">' + cate3.cate3Nm + '</a>\n';
-								if (cate3.leafYn == 'N' && cate3.cate4List.length > 0) {
+								if (cate3.leafYn == 'N' && cate3.cate4List != null && cate3.cate4List.length > 0) {
 									tag += '								<ul class="box_depth3">\n';
 									$.each(cate3.cate4List, function(idx4, cate4) {
 										tag += '									<li><a href="javascript:void(0);" onclick="cfnGoToCategoryMain(\'' + cate4.cateGb + '\',\'' + cate4.cate1No + '\',\'' + cate4.cate2No + '\',\'' + cate4.cate3No + '\',\'' + cate4.cate4No + '\');">' + cate4.cate4Nm + '</a></li>\n';

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

@@ -1,6 +1,5 @@
 <!DOCTYPE html>
-<html lang="ko"
-	xmlns:th="http://www.thymeleaf.org"
+<html lang="ko" xmlns:th="http://www.thymeleaf.org"
 	xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
 	layout:decorator="web/common/layout/MypageLayoutWeb">
 <!--
@@ -17,68 +16,123 @@
  *******************************************************************************
  -->
 <body>
-
-<th:block layout:fragment="content">
-<!--  container -->
-	<div class="my_cont">
-		<div class="sec_head">
-			<h3>나의 쿠폰</h3>
-		</div>
-		<div class="sec_body">
-			<div class="save_area mypage_coupon">
-				<p>내가 보유한 할인 쿠폰<strong th:text="${#numbers.formatInteger(couponInfo.allCouponCnt,0,'COMMA')}"></strong>장</p>
-				<ul>
-					<li>사용 가능 할인 쿠폰 <span th:text="${#numbers.formatInteger(couponInfo.useCouponCnt,0,'COMMA')} + '장'"></span></li>
-					<li>7일 이내 마감 쿠폰 <span th:text="${#numbers.formatInteger(couponInfo.expireCouponCnt,0,'COMMA')} + '장'"></span></li>
-				</ul>
-			</div>
-			<div class="coupon_list">
-				<ul class="clear">
-					<th:block th:each="CouponData, CouponStat : ${couponList}">
-					<li th:class="${CouponData.userYn == 'Y' ? '' : 'off'}">
-						<div class="cp_top">
-							<div class="cp_detail">
-								<p class="tit" th:text="${CouponData.cpnNm}"></p>
-								<th:block th:if="${CouponData.dcWay == '할인율'}">
-								<strong class="sale_t won_t"><span th:text="${CouponData.dcPval}"></span>%</strong>
-								</th:block>
-								<th:block th:unless="${CouponData.dcWay == '할인율'}">
-								<strong class="sale_t won_t"><span th:text="${#numbers.formatInteger(CouponData.dcPval,0,'COMMA')}"></span>원</strong>
-								</th:block>
-								
-								<p class="cp_cont"><span th:text="${#numbers.formatInteger(CouponData.buyLimitAmt,0,'COMMA')}"></span>원 이상 구매시 최대 <span th:text="${#numbers.formatInteger(CouponData.maxDcAmt,0,'COMMA')}"></span>원 할인</p>
-								<span class="cp_cnt"><span th:text="${CouponData.cnt}"></span>장 보유</span>
+	<th:block layout:fragment="content">
+		<!--  container -->
+		<!-- CONT-BODY -->
+		<div class="content myCoupon">
+			<!-- 페이지특정 클래스 = myCoupon -->
+			<div class="cont_body">
+				<div class="lnb">
+					<!-- 마이페이지 lnb 영역 -->
+				</div>
+				<div class="cont">
+					<div class="sec_head">
+						<h3 class="subH1">쿠폰</h3>
+					</div>
+					<div class="sec_body">
+						<div class="highlight_area">
+							<div class="have_amount">
+								<div class="total_amount">
+									나의 보유 쿠폰&nbsp;<span><em
+										th:text="${#numbers.formatInteger(couponInfo.allCouponCnt,0,'COMMA')}"></em>장</span>
+								</div>
+								<dl>
+									<div>
+										<dt>
+											<span class="tag primary_line">D-<em>7</em></span>7일 이내 소멸 예정
+										</dt>
+										<dd>
+											<em
+												th:text="${#numbers.formatInteger(couponInfo.expireCouponCnt,0,'COMMA')}"></em>장
+										</dd>
+									</div>
+								</dl>
 							</div>
-							<span class="cp_shape"></span>
 						</div>
-					
-						<th:block th:if="${CouponData.userYn == 'Y'}">
-						<div class="cp_date">
-							<span th:text="${CouponData.availStdt}"></span> ~ <span th:text="${CouponData.availEddt}"></span>
-						</div>
-						</th:block>
-						
-						<th:block th:unless="${CouponData.userYn == 'Y'}">
-						<div class="cp_date">
-							<span class="cp_off">사용완료</span>
-						</div>
-						</th:block>
-						
-						<div class="cp_info">
-							<button type="button" th:onclick="useInfoCoupon([[${CouponData.cpnId}]])" class="coupon_pop_btn"><span>사용안내</span></button>
+						<div class="content_area">
+							<!-- 데이터 있을 시 -->
+							<div class="list_box">
+								<div class="coupon_list">
+									<ul>
+										<th:block th:if="${couponList != null and !couponList.empty}"
+											th:each="CouponData, CouponStat : ${couponList}">
+											<li>
+												<!-- 쿠폰사용 기한 -->
+												<div
+													th:class="${CouponData.userYn == 'coupon' ? '' : 'coupon disabled'}">
+													<div>
+														<p class="cp_name" th:text="${CouponData.cpnNm}"></p>
+														<p class="cp_cont">
+															<th:block th:if="${CouponData.dcWay == '할인율'}">
+																<span><em th:text="${CouponData.dcPval}"></em>%</span>
+															</th:block>
+															<th:block th:unless="${CouponData.dcWay == '할인율'}">
+																<span><em
+																	th:text="${#numbers.formatInteger(CouponData.dcPval,0,'COMMA')}"></em>원</span>
+															</th:block>
+
+														</p>
+														<p class="cp_condition">
+															[[${#numbers.formatInteger(CouponData.buyLimitAmt,0,'COMMA')}]]원
+															이상 구매 시 최대
+															[[${#numbers.formatInteger(CouponData.maxDcAmt,0,'COMMA')}]]원
+															할인 <span><em class="tag primary_line"
+																th:text="${CouponData.cnt}+' 장 보유'"></em></span>
+														</p>
+													</div>
+													<th:block th:if="${CouponData.userYn == 'Y'}">
+														<p class="cp_date">
+															<span th:text="${CouponData.availStdt}"></span>&nbsp;~&nbsp;<span
+																th:text="${CouponData.availEddt}"></span>
+														</p>
+													</th:block>
+													<th:block th:unless="${CouponData.userYn == 'Y'}">
+														<p class="cp_date">사용완료</p>
+													</th:block>
+
+												</div> <!-- 쿠폰사용 기한-->
+												<button type="button" id="btn_couponInfo_pop"
+													class="btn_underline"
+													th:onclick="useInfoCoupon([[${CouponData.cpnId}]])">
+													<span>사용안내</span>
+												</button>
+											</li>
+									</ul>
+								</div>
+							</div>
+							<!-- //데이터 있을 시 -->
+							<!-- 데이터 없을 시 -->
+							<div class="nodata" style="display: none;">
+								<div class="txt_box">
+									<p>
+										현재 노출 할 수 있는 쿠폰이 없습니다.<br>
+									</p>
+								</div>
+								<!-- 버튼 필요시 -->
+								<!-- <div class="btn_box">
+										<button class="btn btn_default"><span>행동하기</span></button>
+									</div> -->
+								<!-- //버튼 필요시 -->
+							</div>
+							<!-- 데이터 없을 시 -->
 						</div>
-					</li>
-					</th:block>
-				</ul>
+					</div>
+				</div>
 			</div>
 		</div>
-	</div>
-	
-	<!-- 쿠폰 사용 내역 팝업 -->
-	<div class="modal coupon_popup" tabindex="-1" role="dialog" aria-labelledby="PopupBasicLabel" aria-hidden="true" id="couponDetailPop"></div>
+		<!-- // CONT-BODY -->
+
+		<!-- 쿠폰 사용 내역 팝업 -->
+		<div class="modal coupon_popup" tabindex="-1" role="dialog"
+			aria-labelledby="PopupBasicLabel" aria-hidden="true"
+			id="couponDetailPop"></div>
 
-	<!-- // container -->	
-<script th:inline="javascript">
+		<!-- // container -->
+		<script th:inline="javascript">
+
+let couponList = ([[${couponList}]]);	
+
+console.log(couponList);
 // 사용안내 모달
 var useInfoCoupon = function (id) {
 	 $.ajax( {
@@ -96,8 +150,23 @@ var useInfoCoupon = function (id) {
 	return false; 
 }
 
-$(document).ready(function() {
+if(couponList.length>0){
+	$(".nodata").hide();
+}else{
+	$(".nodata").show();
+}
+
 
+
+
+$(document).ready(function() {
+	
+	if(couponList.length>0){
+		$(".nodata").hide();
+	}else{
+		$(".nodata").show();
+	}
+	
 	// 마이페이지 LNB 설정
 	fnSetMypageLnbList(4);
 	
@@ -107,7 +176,7 @@ $(document).ready(function() {
 
 });
 </script>
-</th:block>
+	</th:block>
 
 </body>
 </html>

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

@@ -19,339 +19,359 @@
 
 	<th:block layout:fragment="content">
 		<!--  container -->
-		<div class="cont">
-			<div class="sec_head">
-				<h3 class="subH1">상품권</h3>
-			</div>
-			<div class="sec_body">
-				<div class="highlight_area">
-					<div class="have_amount">
-						<div class="total_amount">
-							나의 보유 금액&nbsp;<span><em th:text="${#numbers.formatInteger(giftcardInfo.useGift,0,'COMMA')}"></em>원</span>
-						</div>
-						<dl>
-							<div>
-								<dt>보유 상품권</dt>
-								<dd>
-									<em th:text="${#numbers.formatInteger(giftcardInfo.totalCount,0,'COMMA')}"></em>장
-								</dd>
-							</div>
-							<div>
-								<dt>
-									<span class="tag primary_line">D-<em>30</em></span>한 달 이내 소멸 예정
-								</dt>
-								<dd>
-									<em th:text="${#numbers.formatInteger(giftcardInfo.expireCount,0,'COMMA')}"></em>원
-								</dd>
-							</div>
-						</dl>
+		<div class="content myVoucher">
+			<!-- 페이지특정 클래스 = myVoucher -->
+			<div class="cont_body">
+			<div class="lnb">
+						<!-- 마이페이지 lnb 영역 -->
 					</div>
-				</div>
-				<div class="input_area">
-					<form class="form_wrap">
-						<div class="form_field">
-							<label class="input_label"><span>상품권 등록</span></label>
-							<div class="input_wrap">
-								<input type="text" class="form_control"	  id="gift_input" placeholder="상품권 번호를 입력해주세요">
+				<div class="cont">
+					<div class="sec_head">
+						<h3 class="subH1">상품권</h3>
+					</div>
+					<div class="sec_body">
+						<div class="highlight_area">
+							<div class="have_amount">
+								<div class="total_amount">
+									나의 보유 금액&nbsp;<span><em
+										th:text="${#numbers.formatInteger(giftcardInfo.useGift,0,'COMMA')}"></em>원</span>
+								</div>
+								<dl>
+									<div>
+										<dt>보유 상품권</dt>
+										<dd>
+											<em
+												th:text="${#numbers.formatInteger(giftcardInfo.totalCount,0,'COMMA')}"></em>장
+										</dd>
+									</div>
+									<div>
+										<dt>
+											<span class="tag primary_line">D-<em>30</em></span>한 달 이내 소멸
+											예정
+										</dt>
+										<dd>
+											<em
+												th:text="${#numbers.formatInteger(giftcardInfo.expireCount,0,'COMMA')}"></em>원
+										</dd>
+									</div>
+								</dl>
 							</div>
-							<button type="button" class="btn btn_dark" onclick="giftcardSave()">
-								<span>등록</span>
-							</button>
 						</div>
-					</form>
-				</div>
-				<div class="com_info_txt">
-					<p class="tit">상품권 등록 안내</p>
-					<ul>
-						<li>상품권은 상품 구매시 현금과 동일하게 사용됩니다.</li>
-						<li>상품권은 등록한 해당 몰에서만 사용이 가능합니다.(YES24와 중복 사용불가)</li>
-						<li>사용 후 남은 잔액은 상품권 잔액으로 환불되며, 유효기간 내에 사용 가능합니다.</li>
-						<li>유효기간이 지난 상품권의 잔액은 자동 소멸됩니다.</li>
-						<li>상품권은 현금성 결제 수단에 포함되어 주문시 포인트 적립이 가능합니다.</li>
-						<li>상품권으로 결제한 금액은 마이페이지 > 주문상세페이지에서 현금영수증을 발급 받으실 수 있습니다.</li>
-					</ul>
-				</div>
-				<div class="content_area">
-					<div class="taps">
-						<div>
+						<div class="input_area">
+							<form class="form_wrap">
+								<div class="form_field">
+									<label class="input_label"><span>상품권 등록</span></label>
+									<div class="input_wrap">
+										<input type="text" class="form_control" id="gift_input"
+											placeholder="상품권 번호를 입력해주세요">
+									</div>
+									<button type="button" class="btn btn_dark"
+										onclick="giftcardSave()">
+										<span>등록</span>
+									</button>
+								</div>
+							</form>
+						</div>
+						<div class="com_info_txt">
+							<p class="tit">상품권 등록 안내</p>
 							<ul>
-								<li><a href="javascript:void(0);" id="SearchUseGiftcard">사용내역</a></li>
-								<li><a href="javascript:void(0);" id="SearchOwnGiftcard">보유 상품권</a></li>
+								<li>상품권은 상품 구매시 현금과 동일하게 사용됩니다.</li>
+								<li>상품권은 등록한 해당 몰에서만 사용이 가능합니다.(YES24와 중복 사용불가)</li>
+								<li>사용 후 남은 잔액은 상품권 잔액으로 환불되며, 유효기간 내에 사용 가능합니다.</li>
+								<li>유효기간이 지난 상품권의 잔액은 자동 소멸됩니다.</li>
+								<li>상품권은 현금성 결제 수단에 포함되어 주문시 포인트 적립이 가능합니다.</li>
+								<li>상품권으로 결제한 금액은 마이페이지 > 주문상세페이지에서 현금영수증을 발급 받으실 수 있습니다.</li>
 							</ul>
 						</div>
-					</div>
-					<div class="select_box" id="dateField">
-						<div class="form_field">
-							<div class="select_custom month">
-								<div class="combo">
-									<div class="select"></div>
-									<ul class="list" id="searchDt">
+						<div class="content_area">
+							<div class="taps">
+								<div>
+									<ul>
+										<li id="SearchUseGiftcard"><a href="javascript:void(0);" >사용내역</a></li>
+										<li id="SearchOwnGiftcard"><a href="javascript:void(0);" >보유
+												상품권</a></li>
 									</ul>
 								</div>
 							</div>
+							<div class="select_box" id="dateField">
+								<div class="form_field">
+									<div class="select_custom month">
+										<div class="combo">
+											<div class="select"></div>
+											<ul class="list" id="searchDt">
+											</ul>
+										</div>
+									</div>
+								</div>
+							</div>
+							<!-- 데이터 있을 시 -->
+							<div class="list_box" id="giftcardList"></div>
+							<!-- //데이터 있을 시 -->
 						</div>
 					</div>
-					<!-- 데이터 있을 시 -->
-					<div class="list_box" id="giftcardList">
-						
-					</div>
-					<!-- //데이터 있을 시 -->
 				</div>
 			</div>
 		</div>
 		<!-- // CONT-BODY -->
 <script th:inline="javascript">
-var date = new Date();
-var year = date.getFullYear();
-var month = date.getMonth()+1;
+	var date = new Date();
+	var year = date.getFullYear();
+	var month = date.getMonth() + 1;
 
+	//동적으로 날짜 년도 append
+	function appendYear() {
 
-//동적으로 날짜 년도 append
-function appendYear(){
-	
-    for(var i=year; i<=year; i++){
-       	for (var j= 1; j <=month; j++) {
-       		$("#searchDt").prepend("<li onclick='fnChangeDate(this.value)' value='"+year+""+j+"'>"+i+"년"+j +"월 </li>");
+		for (var i = year; i <= year; i++) {
+			for (var j = 1; j <= month; j++) {
+				$("#searchDt").prepend(
+						"<li onclick='fnChangeDate(this.value)' value='"
+								+ year + "" + j + "'>" + i
+								+ "년" + j + "월 </li>");
+			}
 		}
-    }
-    $(".select").append("<li class='selected' value='"+year+""+month+"'>"+year+"년"+ month +"월 </li>"); // 현재년도 선택 */
-}
- 
-appendYear($("#searchDt"));
-
-// 사용내역 조회
-$("#SearchUseGiftcard").click(function(){
-	// class제거 추가
-	$("#SearchOwnGiftcard").removeClass("active");
-	$("#SearchUseGiftcard").addClass("active");
-	$("#giftcardList").attr("class","order_list");
-	
-	// 날짜 필드 
-	$("#dateField").css("display","block");
-	
-	let data = {searchDt : year+""+month,
-				month : month};
-
-	var jsonData = JSON.stringify(data);
-	
-	$.ajax(
-			{
-				type 	 : "POST",
-				data	 : jsonData,
-				url 	 : '/mypage/gift/use/list',
-				contentType: 'application/json',
-					dataType : 'json',
-				success  : function(result){
-					useGiftcard(result);
-				}
+		$(".select").append(
+				"<li class='selected' value='"+year+""+month+"'>"
+						+ year + "년" + month + "월 </li>"); // 현재년도 선택 */
+	}
+
+	appendYear($("#searchDt"));
+
+	// 사용내역 조회
+	$("#SearchUseGiftcard").click(function() {
+		// class제거 추가
+		$("#SearchOwnGiftcard").removeClass("active");
+		$("#SearchUseGiftcard").addClass("active");
+		$("#giftcardList").attr("class", "order_list");
+
+		// 날짜 필드 
+		$("#dateField").css("display", "block");
+
+		let data = {
+			searchDt : year + "" + month,
+			month : month
+		};
+
+		var jsonData = JSON.stringify(data);
+
+		$.ajax({
+			type : "POST",
+			data : jsonData,
+			url : '/mypage/gift/use/list',
+			contentType : 'application/json',
+			dataType : 'json',
+			success : function(result) {
+				useGiftcard(result);
 			}
-	)
-});
-
-function useGiftcard(result) {
-	
-	let giftcardUseList = result.giftcardUseList;
-	
-	let tmtbHtml = "";
-	tmtbHtml += '<div class="tbl type5">';
-	tmtbHtml += '<table>';
-	tmtbHtml += '<colgroup>';
-	tmtbHtml += '<col width="10%">';	
-	tmtbHtml += '<col width="*">';		
-	tmtbHtml += '<col width="18%">';		
-	tmtbHtml += '<col width="18%">';		
-	tmtbHtml += '</colgroup>';
-	tmtbHtml += '<thead>';	
-	tmtbHtml += '<tr>';	
-	tmtbHtml += '<th scope="col"><span class="sr-only">차감</span></th>';		
-	tmtbHtml += '<th scope="col">내용</th>';				
-	tmtbHtml += '<th scope="col">사용금액</th>';			
-	tmtbHtml += '<th scope="col">일자</th>';			
-	tmtbHtml += '</tr>';				
-	tmtbHtml += '</thead>';		
-	
-	if(giftcardUseList.length<=0){
-		tmtbHtml += '<tbody>';
-		tmtbHtml += '</tbody>';
-		tmtbHtml += '</table>';
-		tmtbHtml += '</div>';
-		tmtbHtml += '<div class="nodata">';
-		tmtbHtml += '<div class="txt_box">';
-		tmtbHtml += '<p>현재 노출 할 수 있는 이용내역이 없습니다.<br></p>';
-		tmtbHtml += '</div>';		
-		tmtbHtml += '</div>';	
-		
-	}else{
-		tmtbHtml += '<tbody>';
-		
-		for(let i=0; i<giftcardUseList.length; i++){
-			let useGiftcard = giftcardUseList[i];
-			tmtbHtml += '<tr>';
-			tmtbHtml += '<td><span class="tag deepgray">차감</span></td>';
-			tmtbHtml += '<td>';
-			if(useGiftcard.goodsNm.length>0){
-				tmtbHtml +='<div class="txt_content">'+ useGiftcard.goodsNm + '</div>';	
-			}else{
-				tmtbHtml +='<div class="txt_content">'+ useGiftcard.balanceName + '</div>';	
+		})
+	});
+
+	function useGiftcard(result) {
+
+		let giftcardUseList = result.giftcardUseList;
+
+		let tmtbHtml = "";
+		tmtbHtml += '<div class="tbl type5">';
+		tmtbHtml += '<table>';
+		tmtbHtml += '<colgroup>';
+		tmtbHtml += '<col width="10%">';
+		tmtbHtml += '<col width="*">';
+		tmtbHtml += '<col width="18%">';
+		tmtbHtml += '<col width="18%">';
+		tmtbHtml += '</colgroup>';
+		tmtbHtml += '<thead>';
+		tmtbHtml += '<tr>';
+		tmtbHtml += '<th scope="col"><span class="sr-only">차감</span></th>';
+		tmtbHtml += '<th scope="col">내용</th>';
+		tmtbHtml += '<th scope="col">사용금액</th>';
+		tmtbHtml += '<th scope="col">일자</th>';
+		tmtbHtml += '</tr>';
+		tmtbHtml += '</thead>';
+
+		if (giftcardUseList.length <= 0) {
+			tmtbHtml += '<tbody>';
+			tmtbHtml += '</tbody>';
+			tmtbHtml += '</table>';
+			tmtbHtml += '</div>';
+			tmtbHtml += '<div class="nodata">';
+			tmtbHtml += '<div class="txt_box">';
+			tmtbHtml += '<p>현재 노출 할 수 있는 이용내역이 없습니다.<br></p>';
+			tmtbHtml += '</div>';
+			tmtbHtml += '</div>';
+
+		} else {
+			tmtbHtml += '<tbody>';
+
+			for (let i = 0; i < giftcardUseList.length; i++) {
+				let useGiftcard = giftcardUseList[i];
+				tmtbHtml += '<tr>';
+				tmtbHtml += '<td><span class="tag deepgray">차감</span></td>';
+				tmtbHtml += '<td>';
+				tmtbHtml += '<div class="txt_content">'	+ useGiftcard.goodsNm + '</div>';
+				tmtbHtml += '</td>';
+				tmtbHtml += '<td><span class="amount_minus"> <em>'
+						+ '-'
+						+ ' '
+						+ useGiftcard.gfcdAmt.addComma()
+						+ '</em>원';
+				tmtbHtml += '</span></td>';
+				tmtbHtml += '<td>' + useGiftcard.regDt
+						+ '</td>';
+				tmtbHtml += '</tr>';
 			}
-			tmtbHtml += '</td>';
-			tmtbHtml += '<td><span class="amount_minus"> <em>'+ useGiftcard.balance + ' ' + useGiftcard.gfcdAmt.addComma() + '</em>원';
-			tmtbHtml += '</span></td>';					
-			tmtbHtml += '<td>'+useGiftcard.regDt +'</td>';					
-			tmtbHtml += '</tr>';		
+			tmtbHtml += '</tbody>';
+			tmtbHtml += '</table>';
+			tmtbHtml += '</div>';
+
 		}
-		tmtbHtml += '</tbody>';
-		tmtbHtml += '</table>';
-		tmtbHtml += '</div>';
-		
+
+		$("#giftcardList").html(tmtbHtml);
 	}
-		
-	$("#giftcardList").html(tmtbHtml);
-}
-
-// 보유상품권 조회
-$("#SearchOwnGiftcard").click(function(){
-	$("#SearchUseGiftcard").removeClass("active");
-	$("#SearchOwnGiftcard").addClass("active");
-	$("#giftcardList").attr("class","gift_list");
-	
-	// 날짜 필드 
-	$("#dateField").css("display","none");
-	let data = {};
-	
-	var jsonData = JSON.stringify(data);
-	
-	$.ajax(
-			{
-				type 	 : "POST",
-				data	 : jsonData,
-				url 	 : '/mypage/gift/own/list',
-				contentType: 'application/json',
-					dataType : 'json',
-				success  : function(result){
-					ownGiftcard(result);
-				}
-			}
-	)
-});
-
-function ownGiftcard(result) {
-	
-	let giftcardOwnList = result.giftcardOwnList;
-	
-	let tmtbHtml2 = "";
-
-	if(giftcardOwnList == null){
-		tmtbHtml2 += '<div class="nodata">';
-		tmtbHtml2 += '<div class="txt_box">';
-		tmtbHtml2 += '<p>현재 노출 할 수 있는 상품권이 없습니다.<br></p>';
-		tmtbHtml2 += '</div>';		
-		tmtbHtml2 += '</div>';	
-	}else{
-		
-		tmtbHtml2 += '<div class="voucher_list">';
-		tmtbHtml2 += '<ul>';
-		
-		for(let i=0; i<giftcardOwnList.length; i++){
-			let ownGiftcard = giftcardOwnList[i];
-
-			tmtbHtml2 += '<li>';
-			if(ownGiftcard.rmGfcdAmt > 0){
-				tmtbHtml2 += '<div class="voucher">';
-			}else{
-				tmtbHtml2 += '<div class="voucher disable">';
-			}	
-			
-			tmtbHtml2 += '<div>';
-			tmtbHtml2 += '<p class="vch_name">'+ownGiftcard.gfcdNm +'</p>';
-			tmtbHtml2 += '<p class="vch_price"><span class="tag primary_line"><em>'+ownGiftcard.chgGfcdAmt.addComma() +'</em>원권</span></p>';
-			if(ownGiftcard.rmGfcdAmt > 0){
-				tmtbHtml2 += '<p class="vch_remain">'+ownGiftcard.rmGfcdAmt.addComma() +'</p>';
-			}else{
-				tmtbHtml2 += '<p class="vch_remain">전액소진</p>';
+
+	// 보유상품권 조회
+	$("#SearchOwnGiftcard").click(function() {
+		$("#SearchUseGiftcard").removeClass("active");
+		$("#SearchOwnGiftcard").addClass("active");
+		$("#giftcardList").attr("class", "gift_list");
+
+		// 날짜 필드 
+		$("#dateField").css("display", "none");
+		let data = {};
+
+		var jsonData = JSON.stringify(data);
+
+		$.ajax({
+			type : "POST",
+			data : jsonData,
+			url : '/mypage/gift/own/list',
+			contentType : 'application/json',
+			dataType : 'json',
+			success : function(result) {
+				ownGiftcard(result);
 			}
-			
-			tmtbHtml2 += '<p class="vch_code">'+ownGiftcard.gfcdNo +'</p>';
+		})
+	});
+
+	function ownGiftcard(result) {
+
+		let giftcardOwnList = result.giftcardOwnList;
+
+		let tmtbHtml2 = "";
+
+		if (giftcardOwnList == null) {
+			tmtbHtml2 += '<div class="nodata">';
+			tmtbHtml2 += '<div class="txt_box">';
+			tmtbHtml2 += '<p>현재 노출 할 수 있는 상품권이 없습니다.<br></p>';
 			tmtbHtml2 += '</div>';
-			tmtbHtml2 += '<div class="vch_date">~&nbsp;<span>'+ownGiftcard.useExpDate+'</span></div>';
 			tmtbHtml2 += '</div>';
-			tmtbHtml2 += '<li>';
+		} else {
+
+			tmtbHtml2 += '<div class="voucher_list">';
+			tmtbHtml2 += '<ul>';
+				for (let i = 0; i < giftcardOwnList.length; i++) {
+				let ownGiftcard = giftcardOwnList[i];
+
+				tmtbHtml2 += '<li>';
+				if (ownGiftcard.rmGfcdAmt == 0) {
+					tmtbHtml2 += '<div class="voucher disable">';
+				} else {
+					tmtbHtml2 += '<div class="voucher">';
+				}
+
+				tmtbHtml2 += '<div>';
+				tmtbHtml2 += '<p class="vch_name">'	+ ownGiftcard.gfcdNm + '</p>';
+				tmtbHtml2 += '<p class="vch_price"><span class="tag primary_line"><em>'	+ ownGiftcard.chgGfcdAmt.addComma()	+ '</em>원권</span></p>';
+				if (ownGiftcard.rmGfcdAmt > 0) {
+					tmtbHtml2 += '<p class="vch_remain">'+ ownGiftcard.rmGfcdAmt.addComma()+ '원</p>';
+				} else {
+					tmtbHtml2 += '<p class="vch_remain">전액소진</p>';
+				}
+
+				tmtbHtml2 += '<p class="vch_code">'	+ ownGiftcard.gfcdNo + '</p>';
+				tmtbHtml2 += '</div>';
+				tmtbHtml2 += '<div class="vch_date">~&nbsp;<span>'	+ ownGiftcard.useExpDate	+ '</span></div>';
+				tmtbHtml2 += '</div>';
+				tmtbHtml2 += '</li>';
+			}
+			tmtbHtml2 += '</ul>';
+			tmtbHtml2 += '</div>';
+
 		}
-		tmtbHtml2 += '</ul>';
-		tmtbHtml2 += '</div>';
-		
+
+		$("#giftcardList").html(tmtbHtml2);
+
 	}
-		
-	$("#giftcardList").html(tmtbHtml2);
-
-}
-
-function fnChangeDate(obj) {
-
-	var seletedDate = obj.toString();
-	var splitMonth = seletedDate.substr(4);
-	
-	data = {month : splitMonth,
-			searchDt : seletedDate};
-
- 	var jsonData = JSON.stringify(data);
-	
-	$.ajax(
-			{
-				type 	 : "POST",
-				data	 : jsonData,
-				url 	 : '/mypage/gift/use/list',
-				contentType: 'application/json',
-					dataType : 'json',
-				success  : function(result){
-					useGiftcard(result);
-				}
+
+	function fnChangeDate(obj) {
+
+		var seletedDate = obj.toString();
+		var splitMonth = seletedDate.substr(4);
+
+		data = {
+			month : splitMonth,
+			searchDt : seletedDate
+		};
+
+		var jsonData = JSON.stringify(data);
+
+		$.ajax({
+			type : "POST",
+			data : jsonData,
+			url : '/mypage/gift/use/list',
+			contentType : 'application/json',
+			dataType : 'json',
+			success : function(result) {
+				useGiftcard(result);
 			}
-		)  
-}
-
-// 상품권 등록 버튼 누를 시 
-function giftcardSave() {
-	if($("#gift_input").val() == "" || $("#gift_input").val() == null){
-		mcxDialog.alert("상품권 번호를 입력해주세요.");
-		return;
+		})
 	}
-	
- 	data = {gfcdNo : $("#gift_input").val()};
-
- 	var jsonData = JSON.stringify(data);
- 	
- 	mcxDialog.confirm("상품권을 등록 하시겠습니까?", {
-		cancelBtnText: "취소",
-		sureBtnText: "확인",
-		sureBtnClick: function() {
-			
-			gagajf.ajaxJsonSubmit('/mypage/gift/use/confirm', jsonData, function() {
-				cfnGoToPage(_PAGE_MYPAGE_GIFTCARD);
-			});
+
+	// 상품권 등록 버튼 누를 시 
+	function giftcardSave() {
+		if ($("#gift_input").val() == ""
+				|| $("#gift_input").val() == null) {
+			mcxDialog.alert("상품권 번호를 입력해주세요.");
+			return;
 		}
+
+		data = {
+			gfcdNo : $("#gift_input").val()
+		};
+
+		var jsonData = JSON.stringify(data);
+
+		mcxDialog.confirm("상품권을 등록 하시겠습니까?", {
+			cancelBtnText : "취소",
+			sureBtnText : "확인",
+			sureBtnClick : function() {
+
+				gagajf.ajaxJsonSubmit(
+						'/mypage/gift/use/confirm', jsonData,
+						function() {
+							cfnGoToPage(_PAGE_MYPAGE_GIFTCARD);
+						});
+			}
+		});
+
+	}
+
+	$(document).ready(function() {
+
+		// 마이페이지 LNB 설정
+		fnSetMypageLnbList(6);
+
+		// 마이페이지 location 설정
+		fnSetMypageLocation('상품권', '_PAGE_MYPAGE_GIFTCARD');
+
+		// 전체내역 표시
+		$("#SearchUseGiftcard").trigger('click');
+
+		// 셀렉트박스 활성화
+		$('.select_custom.month').each(function(index) {
+			var selecter01 = new sCombo($(this));
+		});
 	});
-	
-}
-
-$(document).ready(function() {
-
-	// 마이페이지 LNB 설정
-	fnSetMypageLnbList(6);
-	
-	// 마이페이지 location 설정
-	fnSetMypageLocation('상품권', '_PAGE_MYPAGE_GIFTCARD');
-	
-	// 전체내역 표시
-	$("#SearchUseGiftcard").trigger('click');
-
-	// 셀렉트박스 활성화
-	$('.select_custom.month').each(function(index) {
-		var selecter01 = new sCombo($(this));
-	});
-});
 </script>
-	</th:block>
+</th:block>
 
 </body>
 </html>

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

@@ -129,13 +129,13 @@
 						<div class="form_field">
 							<label class="input_label sr-only">선택기간 시작</label>
 							<div class="input_wrap">
-								<input type="text" class="form_control period_datepicker hasDatepicker" name="stDate" value="" id="stDate" onchange="fnCheckPeriod(this);">
+								<input type="text" class="form_control period_datepicker hasDatepicker" value="" id="stDate" onchange="fnCheckPeriod(this);">
 							</div>
 						</div>
 						<div class="form_field">
 							<label class="input_label sr-only">선택기간 끝</label>
 							<div class="input_wrap">
-								<input type="text" class="form_control period_datepicker hasDatepicker" name="edDate" value="" id="edDate" onchange="fnCheckPeriod(this);">
+								<input type="text" class="form_control n_input period_datepicker hasDatepicker" value="" id="edDate" onchange="fnCheckPeriod(this);">
 							</div>
 						</div>
 						<button type="button" class="btn btn_dark btn_sm" onclick="fnSearchOrderList();"><span>조회</span></button>
@@ -263,7 +263,7 @@
 		fnSetMypageLocation('주문확인/배송조회');
 		
 		// datepicker 설정
-		$(".my_datepicker").datepicker();
+		$('.period_datepicker').datepicker();
 
 		// 셀렉트박스 활성화
 		$('.select_custom.order_status').each(function(index) {
@@ -418,6 +418,7 @@
 				tag += '	</div>\n';
 				tag += '	<div class="goods_cont">\n';
 				$.each(order.ordDtlList, function (index, ordDtl) {
+					console.log(ordDtl);
 					tag += '		<div class="goods_info">\n';
 					tag += '			<div class="order_desc">\n';
 					tag += '				<div class="goods_box">\n';
@@ -492,6 +493,9 @@
 
 						// 교환신청 버튼(배송중, 출고완료, 배송완료)
 						if (ordDtl.ordDtlStat == 'G013_50' || ordDtl.ordDtlStat == 'G013_55' || ordDtl.ordDtlStat == 'G013_60') {
+							console.log(ordDtl);
+							console.log(ordDtl.changeableYn);
+							console.log(ordDtl.returnableYn);
 							// 교환/반품 가능한 상품
 							if (ordDtl.changeableYn == 'Y' && ordDtl.returnableYn == 'Y') {
 								tag += '					<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" onclick="fnCreateChange(this, \'exchange\');"><span>교환 신청</span></button></p>\n';
@@ -575,27 +579,32 @@
 						}
 						
 						// 배송중, 배송완료
-						if ((ordDtl.ordDtlStat == 'G013_50' || ordDtl.ordDtlStat == 'G013_55' || ordDtl.ordDtlStat == 'G013_60') && (ordDtl.changeableYn == 'N' || ordDtl.returnableYn == 'N')) {
-							// 교환신청 불가 상품
-							tag += '			<div class="order_text">\n';
-							if (ordDtl.changeableYn == 'N' && ordDtl.returnableYn == 'Y') {
-								tag += '				<p>해당 상품은 교환이 불가능한 상품입니다. 문의사항은 1:1문의를 이용해주세요.</p>\n';
+						if ((ordDtl.ordDtlStat == 'G013_50' || ordDtl.ordDtlStat == 'G013_55' || ordDtl.ordDtlStat == 'G013_60')) {
+							// 교환/반품 신청 불가 상품 처리
+							if (ordDtl.changeableYn == 'N' || ordDtl.returnableYn == 'N') {
+								// 교환신청 불가 상품
+								tag += '			<div class="order_text">\n';
+								if (ordDtl.changeableYn == 'N' && ordDtl.returnableYn == 'Y') {
+									tag += '				<p>해당 상품은 교환이 불가능한 상품입니다. 문의사항은 1:1문의를 이용해주세요.</p>\n';
+								}
+								// 반품신청 불가 상품
+								else if (ordDtl.changeableYn == 'Y' && ordDtl.returnableYn == 'N') {
+									tag += '				<p>해당 상품은 반품이 불가능한 상품입니다. 문의사항은 1:1문의를 이용해주세요.</p>\n';
+								}
+								// 교환/반품신청 불가 상품
+								else if (ordDtl.changeableYn == 'N' && ordDtl.returnableYn == 'N') {
+									tag += '				<p>해당 상품은 교환/반품이 불가능한 상품입니다. 문의사항은 1:1문의를 이용해주세요.</p>\n';
+								}
+								
+								// 배송완료
+								if (ordDtl.ordDtlStat == 'G013_60') {
+									tag += '				<p>15일 후 자동으로 구매확정됩니다.</p>\n';
+								}
+								
+								tag += '			</div>';
+							} else {
+								tag += '			<div class="order_text"><p>15일 후 자동으로 구매확정됩니다.</p></div>\n';
 							}
-							// 반품신청 불가 상품
-							else if (ordDtl.changeableYn == 'Y' && ordDtl.returnableYn == 'N') {
-								tag += '				<p>해당 상품은 반품이 불가능한 상품입니다. 문의사항은 1:1문의를 이용해주세요.</p>\n';
-							}
-							// 교환/반품신청 불가 상품
-							else if (ordDtl.changeableYn == 'N' && ordDtl.returnableYn == 'N') {
-								tag += '				<p>해당 상품은 교환/반품이 불가능한 상품입니다. 문의사항은 1:1문의를 이용해주세요.</p>\n';
-							}
-							
-							// 배송완료
-							if (ordDtl.ordDtlStat == 'G013_60') {
-								tag += '				<p>15일 후 자동으로 구매확정됩니다.</p>\n';
-							}
-							
-							tag += '			</div>';
 						}
 
 						// 구매확정
@@ -604,12 +613,37 @@
 						}
 					}
 					tag += '		</div>';
-					tag += '	</div>';
-					tag += '</div>';
 				});
+				tag += '	</div>';
+				//사은품 처리
+				if (order.freeGiftList != null && order.freeGiftList.length > 0) {
+					tag += '	<div className="goods_foot">';
+					tag += '		<div className="order_gift">';
+					tag += '			<span className="title">사은품</span>';
+					tag += '			<ul>';
+					$.each(order.freeGiftList, function(index, freeGift) {
+						tag += '				<li>' + freeGift.goodsNm + ' ' + '<span>(-' + freeGift.usePoint.addComma() + 'P)</span></li>';
+					});
+					tag += '			</ul>';
+					tag += '		</div>';
+					tag += '	</div>';
+				}
+				tag += '</div>';
 			});
 		} else {
 			// 데이터 없음 표시
+			tag += '<div class="nodata">';
+			tag += '	<div class="txt_box">';
+			tag += '		<p>';
+			tag += '			현재 노출 할 수 있는 데이터가 없습니다.<br>';
+			tag += '		</p>';
+			tag += '	</div>';
+			//tag += '	<!-- 버튼 필요시 -->';
+			//tag += '	<div class="btn_box">';
+			//tag += '		<button class="btn btn_default"><span>행동하기</span></button>';
+			//tag += '	</div>';
+			//tag += '	<!-- //버튼 필요시 -->';
+			tag += '</div>';
 		}
 
 		return tag;