Merge branch 'develop' into jmh

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

@@ -1045,10 +1045,13 @@ public class TsfCartService {
 				order.setSumOrdAmt(order.getSumOrdAmt() + cart.getCurrPrice());
 				order.setSumRealPayAmt(order.getSumRealPayAmt() + cart.getTmtbDcAmt());
 				order.setSumListPrice(order.getSumListPrice() + cart.getListPrice());
-
+				
 				// 배송비 합계
 				if ("Y".equals(cart.getFirstCompYn())) {
-					order.setTotDelvFee(order.getTotDelvFee() + cart.getDelvFee());
+					// 2021.08.13 자사는 전체배송비에서 제외 아래에서 처리하고있음
+					if(!"WMS".equals(cart.getDelvFeeCd())) {
+						order.setTotDelvFee(order.getTotDelvFee() + cart.getDelvFee());
+					}
 				}
 			}
 		}

src/main/java/com/style24/front/support/interceptor/TsfGoodsViewInterceptor.java

@@ -43,11 +43,15 @@ public class TsfGoodsViewInterceptor extends HandlerInterceptorAdapter {
 		// Parameter
 		GagaMap params = GagaParameterUtil.getParameterMap(request);
 
-		// 상품뷰이력 생성
-		goodsService.createGoodsViewHst(params.getString("goodsCd"), params.getString("ithrCd"));
-
-		// 최근본상품 생성
-		recentlyGoodsService.createRecentlyGoods(params.getString("goodsCd"));
+		try {
+			// 상품뷰이력 생성
+			goodsService.createGoodsViewHst(params.getString("goodsCd"), params.getString("ithrCd"));
+
+			// 최근본상품 생성
+			recentlyGoodsService.createRecentlyGoods(params.getString("goodsCd"));
+		} catch (Exception e) {
+			// Do nothing
+		}
 
 		// SSL Server
 		boolean isSslServer = Boolean.parseBoolean(hasSsl);

src/main/webapp/WEB-INF/views/mob/common/fragments/HeadMob.html

@@ -53,23 +53,23 @@
 	<!-- 추천솔루션 meta -->
 	
 	<title th:text="${metaInfo.browserTitle}">한세공식몰 스타일24</title>
-	<link rel="icon" th:href="${metaInfo.favicon}" href="/images/favicon.ico" type="image/x-icon"/>
-	<link rel="apple-touch-icon" href="/images/apple-touch-icon.png" sizes="180x180"/>
-	<link rel="icon" href="/images/favicon-32x32.png" sizes="32x32" type="image/png"/>
-	<link rel="icon" href="/images/favicon-16x16.png" sizes="16x16" type="image/png"/>
+	<link rel="icon" th:href="${metaInfo.favicon}" href="[[${@environment.getProperty('domain.uximage')}]]/images/favicon.ico" type="image/x-icon"/>
+	<link rel="apple-touch-icon" th:href="${@environment.getProperty('domain.uximage')} + '/images/apple-touch-icon.png'" sizes="180x180"/>
+	<link rel="icon" th:href="${@environment.getProperty('domain.uximage')} + '/images/favicon-32x32.png'" sizes="32x32" type="image/png"/>
+	<link rel="icon" th:href="${@environment.getProperty('domain.uximage')} + '/images/favicon-16x16.png'" sizes="16x16" type="image/png"/>
 	
-	<link rel="stylesheet" type="text/css" href="/ux/mo/css/swiper.min.css"/>
-	<link rel="stylesheet" type="text/css" th:href="@{'/ux/mo/css/common_m.css?v=' + ${#calendars.format(#calendars.createNow(), 'yyyyMMddHHmmss')}}" href="/ux/mo/css/common_m.css"/>
-	<link rel="stylesheet" type="text/css" th:href="@{'/ux/mo/css/layout_m.css?v=' + ${#calendars.format(#calendars.createNow(), 'yyyyMMddHHmmss')}}" href="/ux/mo/css/layout_m.css"/>
-	<link rel="stylesheet" type="text/css" th:href="@{'/ux/mo/css/style24_m.css?v=' + ${#calendars.format(#calendars.createNow(), 'yyyyMMddHHmmss')}}" href="/ux/mo/css/style24_m.css"/>
+	<link rel="stylesheet" type="text/css" th:href="${@environment.getProperty('domain.uximage')} + '/ux/mo/css/swiper.min.css'"/>
+	<link rel="stylesheet" type="text/css" th:href="${@environment.getProperty('domain.uximage')} + @{'/ux/mo/css/common_m.css?v=' + ${#calendars.format(#calendars.createNow(), 'yyyyMMddHHmmss')}}" href="/ux/mo/css/common_m.css"/>
+	<link rel="stylesheet" type="text/css" th:href="${@environment.getProperty('domain.uximage')} + @{'/ux/mo/css/layout_m.css?v=' + ${#calendars.format(#calendars.createNow(), 'yyyyMMddHHmmss')}}" href="/ux/mo/css/layout_m.css"/>
+	<link rel="stylesheet" type="text/css" th:href="${@environment.getProperty('domain.uximage')} + @{'/ux/mo/css/style24_m.css?v=' + ${#calendars.format(#calendars.createNow(), 'yyyyMMddHHmmss')}}" href="/ux/mo/css/style24_m.css"/>
 	
-	<script src="/ux/mo/js/jquery-3.5.1.min.js"></script>
-	<script src="/ux/mo/js/jquery.modal.min.js"></script>
-	<script src="/ux/mo/js/swiper.min.js"></script>
-	<script src="/ux/plugins/jquery.serializeObject.min.js"></script>
-	<script src="/ux/mo/js/mcxdialog_ui.js"></script>
+	<script th:src="${@environment.getProperty('domain.uximage')} + '/ux/mo/js/jquery-3.5.1.min.js'"></script>
+	<script th:src="${@environment.getProperty('domain.uximage')} + '/ux/mo/js/jquery.modal.min.js'"></script>
+	<script th:src="${@environment.getProperty('domain.uximage')} + '/ux/mo/js/swiper.min.js'"></script>
+	<script th:src="${@environment.getProperty('domain.uximage')} + '/ux/plugins/jquery.serializeObject.min.js'"></script>
+	<script th:src="${@environment.getProperty('domain.uximage')} + '/ux/mo/js/mcxdialog_ui.js'"></script>
 	<script type="text/javascript" src="https://ssl.daumcdn.net/dmaps/map_js_init/postcode.v2.js"></script>
-	<script src="/ux/plugins/lazyload.min.js"></script>
+	<script th:src="${@environment.getProperty('domain.uximage')} + '/ux/plugins/lazyload.min.js'"></script>
 
 	<script src="https://www.google.com/recaptcha/api.js" async defer></script>
 
@@ -99,8 +99,8 @@
 		</script>
 	</th:block>
 
-	<script type="text/javascript" th:src="@{'/ux/plugins/gaga/gaga.validation.js?v=' + ${#calendars.format(#calendars.createNow(), 'yyyyMMddHHmmss')}}" src="/ux/plugins/gaga/gaga.validation.js"></script>
-	<script src="/ux/sha512.min.js"></script>
+	<script type="text/javascript" th:src="${@environment.getProperty('domain.uximage')} + @{'/ux/plugins/gaga/gaga.validation.js?v=' + ${#calendars.format(#calendars.createNow(), 'yyyyMMddHHmmss')}}" src="/ux/plugins/gaga/gaga.validation.js"></script>
+	<script th:src="${@environment.getProperty('domain.uximage')} + '/ux/sha512.min.js'"></script>
 	<script>
 		String.prototype.hashCode = function() {
 			var hash = 0;

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

@@ -414,7 +414,7 @@
 						$('#ulQuickMenuCate').append('<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MAIN);"><span>홈</span></a></li>\n');
 						$('#ulQuickMenuCate').append('<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_ALL_BRAND);"><span>브랜드</span></a></li>\n');
 						
-						let allCate = [[${allCateList}]];
+						let allCate = gAllCate;
 						$.each(result, function(idx, item) {
 							if (item.contentsType == 'C' ) { // 컨텐츠유형:카테고리, 아울렛
 								$.each(allCate, function(allCateIdx, allCateItem) {
@@ -446,7 +446,7 @@
 		tag += '<ul class="quick_depth">\n';
 		tag += '<li><a href="javascript:void(0);" onclick="cfnGoToOutletMain(\'G032_103\');"><span>메인</span></a></li>\n';
 		tag += '<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(0,\'' + cateGb + '\',\'\',\'\',\'\',\'\',\'\',\'' + formalGb + '\');"><span>전체</span></a></li>\n';
-		let allCate = [[${allCateList}]];
+		let allCate = gAllCate;
 		$.each(allCate, function(allCateIdx, allCateItem) {
 			tag += '<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(0,\'' + allCateItem.cateGb + '\',' + allCateItem.cate1No + ',\'\',\'\',\'\',\'\',\'' + formalGb + '\');"><span>' + allCateItem.cate1Nm + '</span></a></li>\n';
 		});

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

@@ -97,7 +97,7 @@
 <script th:inline="javascript">
 /*<![CDATA[*/
 	// 전체카테고리 조회
-// 	let allCate;
+	let gAllCate = [[${allCateList}]];
 // 	let fnGetAllCategory = function() {
 // 		$.getJSON('/display/all/cate/list'
 // 			, function(result, status) {
@@ -266,7 +266,7 @@
 		tag += '				<p>' + outletNm + '</p>\n';
 		tag += '				<a href="javascript:void(0);" onclick="cfnGoToOutletMain(\'G032_103\');" class="more">전체보기</a>\n';
 		tag += '			</div>\n';
-		let allCate = [[${allCateList}]];
+		let allCate = gAllCate;
 		tag += '			<div class="menu">\n';
 		tag += '				<ul class="maintabs" >\n';
 		$.each(allCate, function(allCateIdx, allCateItem) {
@@ -289,7 +289,7 @@
 		let actionUrl = '/display/outlet/cate/list?cate1No=&formalGb='+formalGb;
 		$.getJSON(actionUrl , function(result, status) {
 			if (result.length > 0) {
-				let allCate = [[${allCateList}]];
+				let allCate = gAllCate;
 				$.each(result, function(idx, item) {
 					$.each(allCate, function(allCateIdx, allCateItem) {
 						if (item.cate1No == allCateItem.cate1No) {

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

@@ -110,7 +110,7 @@
 	</th:block>
 
 	<script type="text/javascript" th:src="${@environment.getProperty('domain.uximage')} + @{'/ux/plugins/gaga/gaga.validation.js?v=' + ${#calendars.format(#calendars.createNow(), 'yyyyMMddHHmmss')}}" src="/ux/plugins/gaga/gaga.validation.js"></script>
-	<script src="/ux/sha512.min.js"></script>
+	<script th:src="${@environment.getProperty('domain.uximage')} + '/ux/sha512.min.js'"></script>
 	<script>
 		String.prototype.hashCode = function() {
 			var hash = 0;