Merge branch 'develop' into bin2107

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

@@ -123,15 +123,7 @@ public class TsfGoodsController extends TsfBaseController {
 		ModelAndView mav = new ModelAndView();
 
 		String afLinkCd = paramsGoods.getAfLinkCd();
-		if (StringUtils.isBlank(paramsGoods.getGoodsCd())) {
-			if (StringUtils.isBlank(afLinkCd)) {
-				mav.setViewName("redirect:/display/mall/main/form");
-			} else {
-				mav.setViewName("redirect:/display/mall/main/form?af=" + afLinkCd);
-			}
-			return mav;
-		}
-
+		
 		// 상품관련 기본값 설정(회원 등급, 앱, PC/모바일 등)
 		setGoods(paramsGoods);
 
@@ -140,12 +132,33 @@ public class TsfGoodsController extends TsfBaseController {
 			paramsGoods.setFrontGb("M");
 		}
 
+		
+		if (StringUtils.isBlank(paramsGoods.getGoodsCd())) {
+//			if (StringUtils.isBlank(afLinkCd)) {
+//				mav.setViewName("redirect:/display/mall/main/form");
+//			} else {
+//				mav.setViewName("redirect:/display/mall/main/form?af=" + afLinkCd);
+//			}
+			if ("Y".equals(mobileYn)) {
+				mav.setViewName("mob/goods/Goods404FormMob");
+			} else {
+				mav.setViewName(super.getDeviceViewName("goods/Goods404Form"));
+			}
+			return mav;
+		}
+
+		
 		Goods goods = goodsService.getGoodsInfo(paramsGoods);
 		if (goods == null || goods.getGoodsCd().isEmpty()) {
-			if (StringUtils.isBlank(afLinkCd)) {
-				mav.setViewName("redirect:/display/mall/main/form");
+//			if (StringUtils.isBlank(afLinkCd)) {
+//				mav.setViewName("redirect:/display/mall/main/form");
+//			} else {
+//				mav.setViewName("redirect:/display/mall/main/form?af=" + afLinkCd);
+//			}
+			if ("Y".equals(mobileYn)) {
+				mav.setViewName("mob/goods/Goods404FormMob");
 			} else {
-				mav.setViewName("redirect:/display/mall/main/form?af=" + afLinkCd);
+				mav.setViewName(super.getDeviceViewName("goods/Goods404Form"));
 			}
 			return mav;
 		}
@@ -1062,7 +1075,7 @@ public class TsfGoodsController extends TsfBaseController {
 
 		// 상품관련 기본값 설정(회원 등급, 앱, PC/모바일 등)
 		setGoods(paramsGoods);
-		log.info("createGoodsCoupon  paramsGoods {}", paramsGoods);
+		//log.info("createGoodsCoupon  paramsGoods {}", paramsGoods);
 
 		// 일반상품과 딜상품 구분
 		Goods goods = goodsService.getGoodsInfo(paramsGoods);
@@ -1073,7 +1086,7 @@ public class TsfGoodsController extends TsfBaseController {
 			return result;
 		}
 
-		log.info("createGoodsCoupon  goods {}", goods);
+		//log.info("createGoodsCoupon  goods {}", goods);
 		if (TscConstants.GoodsType.DEAL.value().equals(goods.getGoodsType())) {
 			Collection<Goods> goodsDealComposeList = goodsService.getGoodsDealComposeList(paramsGoods);
 			// 상품쿠폰

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

@@ -108,13 +108,13 @@ public class TsfOrderController extends TsfBaseController {
 		// @ WEB 의 경우에는 입력한 고객정보와 인증받은 고객정보가 다른경우 고객정보 업데이트
 		// @ MOBILE 인 경우에는 본인인증 후 주문서 이동
 		
-		// 1. 카트시퀀스가 정보가 없을때 처리 장바구니로 이동
+		// 1. 장바구니 시퀀스가 정보가 없을때 처리 장바구니로 이동
 		if (order.getCartSqArr() == null) {
 			mav.setViewName("redirect:/cart/list/form");						// 장바구니화면이동
 			return mav;
 		}
 		
-		// 2. 선물하기주문 체크 후 비 로그인 상태면 장바구니로 강제 이동
+		// 2. 선물하기주문 체크 후 비로그인 상태면 장바구니로 강제 이동
 		if (coreOrderService.getGiftOrderCheck(order) > 0) {
 			if (TsfSession.isLogin() == false) {
 				mav.setViewName("redirect:/cart/list/form");					// 장바구니화면이동
@@ -172,7 +172,7 @@ public class TsfOrderController extends TsfBaseController {
 			return mav;
 		}
 
-		// 1.2 카트시퀀스가 정보가 없을때 처리 장바구니로 이동
+		// 1.2 장바구니 시퀀스가 정보가 없을때 처리 장바구니로 이동
 		if (order.getCartSqArr() == null) {
 			mav.setViewName("redirect:/cart/list/form");		// 장바구니화면이동
 			return mav;
@@ -297,6 +297,7 @@ public class TsfOrderController extends TsfBaseController {
 				devTempYn = true;
 			}
 		}
+		
 		mav.addObject("devTempYn"			, devTempYn);								// 개발자모드가능여부
 		mav.addObject("frontGb"				, TsfSession.getFrontGb());					// 프론트구분
 		mav.setViewName(super.getDeviceViewName("order/OrderForm"));
@@ -435,13 +436,15 @@ public class TsfOrderController extends TsfBaseController {
 		
 		// 2021.07.06 회원일때 개인통관부호 정보 설정
 		String entryNo = "";
-		if (TsfSession.isLogin()) {
-			Order vo = new Order();
-			order.setCustNo(TsfSession.getInfo().getCustNo());
-			vo = coreOrderService.getEntryNo(order);
-			
-			if (vo != null && vo.getEntryNo() != null) {
-				entryNo = vo.getEntryNo();
+		if ("Y".equals(order.getForeignBuyYn())) {
+			if (TsfSession.isLogin()) {
+				Order vo = new Order();
+				order.setCustNo(TsfSession.getInfo().getCustNo());
+				vo = coreOrderService.getEntryNo(order);
+				
+				if (vo != null && vo.getEntryNo() != null) {
+					entryNo = vo.getEntryNo();
+				}
 			}
 		}
 		

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

@@ -484,10 +484,12 @@
 		                END
 		       END AS ACCESSIBLE_YN
 		FROM   (
-		        SELECT 1                                             AS CNT1 /*제휴채널전체건수*/
-		            , CASE WHEN AF_LINK_CD = #{afLinkCd} THEN 1 ELSE 0 END AS CNT2 /*특정제휴채널건수*/
-		        FROM   TB_PLAN_AF_CHANNEL A
-		        WHERE  PLAN_SQ =  #{planSq}
+		        SELECT 1                                                                            AS CNT1 /*제휴채널전체건수*/
+		             , CASE WHEN PAC.AF_LINK_CD = #{afLinkCd} AND AF.USE_YN = 'Y' THEN 1 ELSE 0 END AS CNT2 /*특정제휴채널건수*/
+		        FROM   TB_PLAN_AF_CHANNEL PAC
+		             , TB_AF_LINK AF
+		        WHERE  PAC.AF_LINK_CD = AF.AF_LINK_CD
+		        AND    PAC.PLAN_SQ =  #{planSq}
 		       ) Z
 	</select>
 	
@@ -1774,87 +1776,96 @@
 		        ,(CASE WHEN RNK.LIST_PRICE > 0 THEN 100 - ROUND((RNK.CURR_PRICE / RNK.LIST_PRICE) * 100 ,0) ELSE 0 END ) AS DC_RATE
 		      FROM
 		         (
-		          SELECT  ROW_NUMBER() OVER (PARTITION BY GOODS.BRAND_GROUP_NO ORDER BY GOODS.DISP_ORD DESC) AS RNUM
+		          SELECT  ROW_NUMBER() OVER (PARTITION BY GOODS.BRAND_GROUP_NO ORDER BY GOODS.DISP_ORD DESC, GOODS.DIS) AS RNUM
 		                 , GOODS.*
 		            FROM 
 		                (
-		                 SELECT 
-		                    CASE WHEN BG.DISP_NM_LANG = 'EN' THEN
-		                             BG.BRAND_GROUP_ENM
-		                         ELSE
-		                             BG.BRAND_GROUP_KNM
-		                    END                                    AS BRAND_NM /*브랜드그룹명*/
-		                  , SDB.BRAND_GROUP_NO 
-		                  , SDB.DISP_ORD
-		                  , G.GOODS_CD 
-		                  , G.GOODS_NM 
-		                  , G.GOODS_GB                                               /*상품구분*/
-		                  , G.FOREIGN_BUY_YN                                         /*해외구매대행여부*/
-		                  , G.PARALLEL_IMPORT_YN                                     /*병행수입여부*/
-		                  , G.ORDER_MADE_YN                                          /*주문제작여부*/
-		                  , G.GOODS_TNM                                              /*상품타이틀명*/
-		                  , G.MAIN_COLOR_CD                                          /*대표색상코드*/
-		                  , G.LIST_PRICE                                             /*정상가(최초판매가)*/
-		                  , G.CURR_PRICE                                             /*현재판매가*/
-		                FROM   TB_SHOT_DELV_BRAND SDB
-		                                 INNER JOIN TB_SHOT_DELV_GOODS SDG
-		                        ON SDB.BRAND_GROUP_NO = SDG.BRAND_GROUP_NO
-		                                 INNER JOIN TB_GOODS G
-		                        ON SDG.GOODS_CD = G.GOODS_CD 
-		                          		  INNER JOIN TB_BRAND B
-		                        ON G.BRAND_CD = B.BRAND_CD 
-		                                 INNER JOIN TB_BRAND_GROUP BG 
-		                        ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO 
-		                                 INNER JOIN TB_GOODS_STOCK GS
-		                        ON SDG.GOODS_CD = GS.GOODS_CD 
-		                WHERE  1=1  
-		                AND    G.GOODS_CD NOT IN (SELECT GOODS_CD FROM TB_GOODS_SHOT_DELV_SKIP GSDS)
-		                AND    G.SELF_GOODS_YN = 'Y'
-		                AND    G.SELF_MALL_YN = 'Y'
-		                AND    SDG.DEL_YN = 'N'
-		                AND    G.GOODS_STAT = 'G008_90' /*승인완료상품*/
-		                AND    NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT /*현재 판매되는 상품*/
-		                AND    B.USE_YN = 'Y' /*사용하는 브랜드*/
-		                AND    BG.USE_YN = 'Y' /*사용하는 브랜드그룹*/
-		                AND    GS.STOCK_QTY  <![CDATA[>]]>  0 /*재고있는상품*/
-		                UNION 
-		                SELECT 
-		                       CASE WHEN BG.DISP_NM_LANG = 'EN' THEN
-		                                BG.BRAND_GROUP_ENM
-		                            ELSE
-		                                BG.BRAND_GROUP_KNM
-		                       END                                    AS BRAND_NM /*브랜드그룹명*/
-		                     , SDB.BRAND_GROUP_NO 
-		                     , SDB.DISP_ORD
-		                     , G.GOODS_CD 
-		                     , G.GOODS_NM 
-		                     , G.GOODS_GB                                               /*상품구분*/
-		                     , G.FOREIGN_BUY_YN                                         /*해외구매대행여부*/
-		                     , G.PARALLEL_IMPORT_YN                                     /*병행수입여부*/
-		                     , G.ORDER_MADE_YN                                          /*주문제작여부*/
-		                     , G.GOODS_TNM                                              /*상품타이틀명*/
-		                     , G.MAIN_COLOR_CD                                          /*대표색상코드*/
-		                     , G.LIST_PRICE                                             /*정상가(최초판매가)*/
-		                     , G.CURR_PRICE                                             /*현재판매가*/
-		                FROM   TB_SHOT_DELV_BRAND SDB
-		                                  INNER JOIN TB_BRAND_GROUP BG 
-		                        ON SDB.BRAND_GROUP_NO = BG.BRAND_GROUP_NO 
-		                                  INNER JOIN TB_BRAND B
-		                        ON BG.BRAND_GROUP_NO = B.BRAND_GROUP_NO 
-		                                 INNER JOIN TB_GOODS G
-		                        ON B.BRAND_CD = G.BRAND_CD 
-		                                 INNER JOIN TB_GOODS_STOCK GS
-		                        ON G.GOODS_CD = GS.GOODS_CD 
-		                WHERE  1=1  
-		                AND    G.GOODS_CD NOT IN (SELECT GOODS_CD FROM TB_GOODS_SHOT_DELV_SKIP GSDS)
-		                AND    G.SELF_GOODS_YN = 'Y'
-		                AND    G.SELF_MALL_YN = 'Y'
-		                AND    G.GOODS_STAT = 'G008_90' /*승인완료상품*/
-		                AND    NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT /*현재 판매되는 상품*/
-		                AND    B.USE_YN = 'Y' /*사용하는 브랜드*/
-		                AND    BG.USE_YN = 'Y' /*사용하는 브랜드그룹*/
-		                AND    GS.STOCK_QTY  <![CDATA[>]]>  0 /*재고있는상품*/
+		                  SELECT AA.*
+		                        ,COUNT(*) OVER(PARTITION BY GOODS_CD) AS GOODS_CD_CNT
+		                  FROM 		                 
+		                       (	                
+		                        SELECT 
+		                           CASE WHEN BG.DISP_NM_LANG = 'EN' THEN
+		                                    BG.BRAND_GROUP_ENM
+		                                ELSE
+		                                    BG.BRAND_GROUP_KNM
+		                           END                                    AS BRAND_NM /*브랜드그룹명*/
+		                         , SDB.BRAND_GROUP_NO 
+		                         , SDB.DISP_ORD
+		                         , G.GOODS_CD 
+		                         , G.GOODS_NM 
+		                         , G.GOODS_GB                                               /*상품구분*/
+		                         , G.FOREIGN_BUY_YN                                         /*해외구매대행여부*/
+		                         , G.PARALLEL_IMPORT_YN                                     /*병행수입여부*/
+		                         , G.ORDER_MADE_YN                                          /*주문제작여부*/
+		                         , G.GOODS_TNM                                              /*상품타이틀명*/
+		                         , G.MAIN_COLOR_CD                                          /*대표색상코드*/
+		                         , G.LIST_PRICE                                             /*정상가(최초판매가)*/
+		                         , G.CURR_PRICE                                             /*현재판매가*/
+		                         , 1 AS DIS
+		                        FROM   TB_SHOT_DELV_BRAND SDB
+		                                        INNER JOIN TB_SHOT_DELV_GOODS SDG
+		                               ON SDB.BRAND_GROUP_NO = SDG.BRAND_GROUP_NO
+		                                        INNER JOIN TB_GOODS G
+		                               ON SDG.GOODS_CD = G.GOODS_CD 
+		                            	        INNER JOIN TB_BRAND B
+		                               ON G.BRAND_CD = B.BRAND_CD 
+		                                        INNER JOIN TB_BRAND_GROUP BG 
+		                               ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO 
+		                                        INNER JOIN TB_GOODS_STOCK GS
+		                               ON SDG.GOODS_CD = GS.GOODS_CD 
+		                        WHERE  1=1  
+		                        AND    G.GOODS_CD NOT IN (SELECT GOODS_CD FROM TB_GOODS_SHOT_DELV_SKIP GSDS)
+		                        AND    G.SELF_GOODS_YN = 'Y'
+		                        AND    G.SELF_MALL_YN = 'Y'
+		                        AND    SDG.DEL_YN = 'N'
+		                        AND    G.GOODS_STAT = 'G008_90' /*승인완료상품*/
+		                        AND    NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT /*현재 판매되는 상품*/
+		                        AND    B.USE_YN = 'Y' /*사용하는 브랜드*/
+		                        AND    BG.USE_YN = 'Y' /*사용하는 브랜드그룹*/
+		                        AND    GS.STOCK_QTY  <![CDATA[>]]>  0 /*재고있는상품*/
+		                        UNION ALL
+		                        SELECT 
+		                              CASE WHEN BG.DISP_NM_LANG = 'EN' THEN
+		                                       BG.BRAND_GROUP_ENM
+		                                   ELSE
+		                                       BG.BRAND_GROUP_KNM
+		                              END                                    AS BRAND_NM /*브랜드그룹명*/
+		                            , SDB.BRAND_GROUP_NO 
+		                            , SDB.DISP_ORD
+		                            , G.GOODS_CD 
+		                            , G.GOODS_NM 
+		                            , G.GOODS_GB                                               /*상품구분*/
+		                            , G.FOREIGN_BUY_YN                                         /*해외구매대행여부*/
+		                            , G.PARALLEL_IMPORT_YN                                     /*병행수입여부*/
+		                            , G.ORDER_MADE_YN                                          /*주문제작여부*/
+		                            , G.GOODS_TNM                                              /*상품타이틀명*/
+		                            , G.MAIN_COLOR_CD                                          /*대표색상코드*/
+		                            , G.LIST_PRICE                                             /*정상가(최초판매가)*/
+		                            , G.CURR_PRICE                                             /*현재판매가*/
+		                            , 2 AS DIS
+		                        FROM   TB_SHOT_DELV_BRAND SDB
+		                                         INNER JOIN TB_BRAND_GROUP BG 
+		                               ON SDB.BRAND_GROUP_NO = BG.BRAND_GROUP_NO 
+		                                         INNER JOIN TB_BRAND B
+		                               ON BG.BRAND_GROUP_NO = B.BRAND_GROUP_NO 
+		                                        INNER JOIN TB_GOODS G
+		                               ON B.BRAND_CD = G.BRAND_CD 
+		                                        INNER JOIN TB_GOODS_STOCK GS
+		                               ON G.GOODS_CD = GS.GOODS_CD 
+		                        WHERE  1=1  
+		                        AND    G.GOODS_CD NOT IN (SELECT GOODS_CD FROM TB_GOODS_SHOT_DELV_SKIP GSDS)
+		                        AND    G.SELF_GOODS_YN = 'Y'
+		                        AND    G.SELF_MALL_YN = 'Y'
+		                        AND    G.GOODS_STAT = 'G008_90' /*승인완료상품*/
+		                        AND    NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT /*현재 판매되는 상품*/
+		                        AND    B.USE_YN = 'Y' /*사용하는 브랜드*/
+		                        AND    BG.USE_YN = 'Y' /*사용하는 브랜드그룹*/
+		                        AND    GS.STOCK_QTY  <![CDATA[>]]>  0 /*재고있는상품*/
+		                       )AA
+		                       ORDER BY AA.BRAND_GROUP_NO, AA.DISP_ORD DESC, AA.DIS
 		               )GOODS 
+		          WHERE CASE WHEN GOODS.GOODS_CD_CNT>1 THEN GOODS.DIS = 1 ELSE GOODS.DIS = 2 END  
 		        )RNK
 		   WHERE RNK.RNUM <![CDATA[<=]]> 100
 		)
@@ -1922,12 +1933,12 @@
 		      , C.COLOR_CHIPS                                                                                                      /*컬러칩*/
 		      , GB.ICON                                                                                                            /*혜택아이콘*/
 		       <choose>
-	                 <when test="custNo != null and custNo > 0"> <!-- 로그인 했으면 -->
-	             , IF(W.GOODS_CD IS NULL,'','likeit')                                                                AS LIKE_IT       /*위시리스트담긴상품*/
-	                 </when>
-	                 <otherwise>
-	             , ''                                                                                                AS LIKE_IT       /*위시리스트담긴상품*/
-	                 </otherwise>
+		                 <when test="custNo != null and custNo > 0"> <!-- 로그인 했으면 -->
+		             , IF(W.GOODS_CD IS NULL,'','likeit')                                                                AS LIKE_IT       /*위시리스트담긴상품*/
+		                 </when>
+		                 <otherwise>
+		             , ''                                                                                                AS LIKE_IT       /*위시리스트담긴상품*/
+		                 </otherwise>
 		      </choose>
 		FROM   TAB_BRAND_GOODS BG
 		LEFT OUTER JOIN TAB_GOODS_IMG GI ON BG.GOODS_CD = GI.GOODS_CD

src/main/webapp/WEB-INF/views/mob/app/NoticeFormMob.html

@@ -3,6 +3,7 @@
 	xmlns:th="http://www.thymeleaf.org"
 	xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
 	layout:decorator="mob/common/layout/AppLayoutMob">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <!--
  *******************************************************************************
  * @source  : NoticeFormMob.html
@@ -53,6 +54,15 @@
 			let pushListJosn = JSON.parse(orgPushList);
 			let html = '';
 			$.each(pushListJosn.pushList, function(idx, item) {
+				if (_osType === 'I') {
+					alert('fnDecodeUnicode :' + fnDecodeUnicode(item.title.toLowerCase()) + 'escape :' + escape(item.title)
+					 + ' unescape :' + unescape(item.title)
+					 + ' encodeURI:' + encodeURI(item.title)
+					 + ' decodeURI:' + decodeURI(item.title)
+					 + ' encodeURIComponent:' + encodeURIComponent(item.title)
+					 + ' decodeURIComponent:' + decodeURIComponent(item.title)
+					);
+				}
 				html += '<div class="inner">\n';
 				html += '    <a href="'+item.link+'">\n';
 				html += '        <dl>\n';

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

@@ -18,7 +18,6 @@
 
 <link rel="stylesheet" type="text/css" href="/ux/pc/css/swiper.min.css">
 <script type="text/javascript" src="/ux/pc/js/swiper.min.js"></script>
-<script type="text/javascript" src="/ux/pc/js/slick.min.js"></script>
 <script type="text/javascript" src="/ux/pc/js/jquery-ui.js"></script>
 
 <!-- payment.js -->

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

@@ -146,7 +146,7 @@ $(document).ready( function() {
 	}
 	
 	//사은품노출여부
-	freegiftInfoDispYn(dispYn);
+	freegiftInfoDispYn("Y");
 	
 	// 사은품시퀀스배열, 
 	var freegiftSqArr 		= [];

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

@@ -73,7 +73,6 @@
 	<script src="/ux/pc/js/swiper.min.js"></script>
 	<script src="/ux/pc/js/ion.rangeSlider.min.js"></script>
 	<script src="/ux/pc/js/jquery.modal.min.js"></script>
-	<script src="/ux/pc/js/slick.min.js"></script>
 	<script src="/ux/pc/js/jquery-ui.js"></script>
 	<script src="/ux/plugins/jquery.serializeObject.min.js"></script>
 	<script src="/ux/pc/js/mcxdialog_ui.js"></script>

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

@@ -22,7 +22,7 @@
 	<div class="content myOrderList"> <!-- 페이지특정 클래스 = myOrderList -->
 		<div class="cont_body">
 			<!-- CONT-BODY -->
-			<div class="lnb">
+			<div class="lnb" id="scrollInit">
 				<div class="lnb_tit">
 					<h2>마이페이지</h2>
 				</div>
@@ -226,11 +226,19 @@
 	}
 
 	// 주문 목록 조회 콜백
+	let index = 0;
 	var fnSearchCallback = function(result) {
 		$('#creList').html(fnCreateCreList(result));
 
+		if (index > 0){
+			var offset = $("#scrollInit").offset();
+			$('html, body').animate({scrollTop : offset.top-100}, 300);
+		}
+
 		// Create pagination
 		gagaPaging.createPagination(result.creInfo.pageable);
+
+		index++;
 	}
 
 	// 검색기간 설정 체크

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

@@ -22,7 +22,7 @@
 	<div class="content myOrderList">
 		<div class="cont_body">
 			<!-- CONT-BODY -->
-			<div class="lnb">
+			<div class="lnb" id="scrollInit">
 				<div class="lnb_tit">
 					<h2>마이페이지</h2>
 				</div>
@@ -248,11 +248,19 @@
 	}
 
 	// 주문 목록 조회 콜백
+	let index = 0;
 	var fnSearchCallback = function(result) {
 		$('#orderList').html(fnCreateOrderList(result));
 
+		if (index > 0){
+			var offset = $("#scrollInit").offset();
+			$('html, body').animate({scrollTop : offset.top-100}, 300);
+		}
+
 		// Create pagination
 		gagaPaging.createPagination(result.orderInfo.pageable);
+		
+		index++;
 	}
 
 	// 검색기간 설정 체크

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

@@ -18,7 +18,6 @@
 
 <link rel="stylesheet" type="text/css" href="/ux/pc/css/swiper.min.css">
 <script type="text/javascript" src="/ux/pc/js/swiper.min.js"></script>
-<script type="text/javascript" src="/ux/pc/js/slick.min.js"></script>
 <script type="text/javascript" src="/ux/pc/js/jquery-ui.js"></script>
 
 <!-- payment.js -->

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

@@ -18,7 +18,6 @@
 
 <link rel="stylesheet" type="text/css" href="/ux/pc/css/swiper.min.css">
 <script type="text/javascript" src="/ux/pc/js/swiper.min.js"></script>
-<script type="text/javascript" src="/ux/pc/js/slick.min.js"></script>
 <script type="text/javascript" src="/ux/pc/js/jquery-ui.js"></script>
 
 <!-- payment.js -->

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

@@ -132,7 +132,7 @@ $(document).ready( function() {
 	}
 	
 	//사은품노출여부
-	freegiftInfoDispYn(dispYn);
+	freegiftInfoDispYn("Y");
 	
 	// 사은품시퀀스배열, 
 	var freegiftSqArr 		= [];