Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.front into develop

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

@@ -650,13 +650,13 @@ public class TsfDisplayController extends TsfBaseController {
 			cate1.setBrandGroupNo(params.getBrandGroupNo() == null ? 0 : params.getBrandGroupNo());
 			cate1.setFrontGb(TsfSession.getFrontGb());
 			cate1.setSiteCd(TscConstants.Site.STYLE24.value());
-			cate1.setKeyword("TBJ");
+//			cate1.setKeyword("TBJ");
 			cate1.setCateGb("G032_101");
 			cate1.setCate1No(params.getCate1No());
 			mav.addObject("cateList", diquest.getCategoryList(cate1));
 
 			// 상품리스트 카테고리별 필터 목록
-			params.setKeyword("TBJ");
+//			params.setKeyword("TBJ");
 			filterList = diquest.getFilterList(params);
 		}else{
 			// 카테고리 목록
@@ -773,7 +773,7 @@ public class TsfDisplayController extends TsfBaseController {
 
 		String syncYn = commonService.getSearchEngineSyncYn();
 		if (syncYn.equals("Y")) { // 검색엔진을 통한 상품리스트 조회
-			params.setKeyword("TBJ");
+//			params.setKeyword("TBJ");
 			GoodsListResponse response = diquest.getGoodsList(params);
 			pageable.setTotalCount(response.getTotalCount());
 			dataList = response.getResponse();

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

@@ -206,6 +206,9 @@ public class TsfMypageController extends TsfBaseController {
 
 		// 주문 상태 별 수량 조회
 		mav.addObject("orderCount", coreOrderService.getOrderStatCount(order));
+
+		// 로그인여부 설정
+		mav.addObject("isLogin", TsfSession.isLogin());
 		
 		// 2021.04.21 모바일에서 사용하려고 추가
 		int totalCnt = orderService.getPagingOrdNoListCount(order);
@@ -889,6 +892,9 @@ public class TsfMypageController extends TsfBaseController {
 		// 2021.05.03 은행목록추가
 		mav.addObject("bankList", rendererService.getCommonCodeList("G942", "Y"));
 
+		// 로그인여부 설정
+		mav.addObject("isLogin", TsfSession.isLogin());
+
 		mav.setViewName(super.getDeviceViewName("/mypage/MypageCancelForm"));
 
 		return mav;
@@ -1016,6 +1022,9 @@ public class TsfMypageController extends TsfBaseController {
 		int totalCnt = orderChangeService.getPagingCreListCount(orderChange);
 		mav.addObject("totalCnt", totalCnt);
 
+		// 로그인여부 설정
+		mav.addObject("isLogin", TsfSession.isLogin());
+
 		// 주문상세상태코드 설정
 		mav.addObject("chgStatList", rendererService.getCommonCodeList("G685", "Y", new String[] {"G685_10", "G685_11", "G685_19"}));
 
@@ -1094,6 +1103,9 @@ public class TsfMypageController extends TsfBaseController {
 		order.setOrdNo(orderChange.getOrdNo());
 		mav.addObject("paymentInfo", orderService.getPaymentInfoForMypage(order));
 
+		// 로그인여부 설정
+		mav.addObject("isLogin", TsfSession.isLogin());
+
 		// KCP 전표 경로 설정
 		mav.addObject("kcpReceiptUrl", env.getProperty("pg.kcp.receipt.url"));
 
@@ -1465,6 +1477,9 @@ public class TsfMypageController extends TsfBaseController {
 		// 주문번호 설정
 		mav.addObject("ordNo", order.getOrdNo());
 
+		// 로그인여부 설정
+		mav.addObject("isLogin", TsfSession.isLogin());
+
 		// 주문목록 조회
 		Collection<GagaMap> orderList = orderService.getOrderListForMypage(order);
 

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

@@ -150,6 +150,9 @@ public class TsfNoMemberController extends TsfBaseController {
 		mav.addObject("ordNm", order.getOrdNm());
 		mav.addObject("ordPhnno", order.getOrdPhnno());
 
+		// 로그인여부 설정
+		mav.addObject("isLogin", false);
+
 		// 주문 상태 별 수량 조회
 		mav.addObject("orderCount", coreOrderService.getOrderStatCount(order));
 
@@ -524,6 +527,9 @@ public class TsfNoMemberController extends TsfBaseController {
 		mav.addObject("ordNm", order.getOrdNm());
 		mav.addObject("ordPhnno", order.getOrdPhnno());
 
+		// 로그인여부 설정
+		mav.addObject("isLogin", false);
+
 		// 취소 가능 리스트 조회
 		GagaMap map = orderChangeService.getCancelListForMypage(order);
 		Order oneData = (Order)map.get("oneData");
@@ -1085,6 +1091,9 @@ public class TsfNoMemberController extends TsfBaseController {
 		mav.addObject("ordNm", order.getOrdNm());
 		mav.addObject("ordPhnno", order.getOrdPhnno());
 
+		// 로그인여부 설정
+		mav.addObject("isLogin", false);
+
 		// 주문 상태 별 수량 조회
 		mav.addObject("orderCount", coreOrderService.getOrderStatCount(order));
 
@@ -1180,6 +1189,9 @@ public class TsfNoMemberController extends TsfBaseController {
 		mav.addObject("ordNm", orderChange.getOrdNm());
 		mav.addObject("ordPhnno", orderChange.getOrdPhnno());
 
+		// 로그인여부 설정
+		mav.addObject("isLogin", false);
+
 		// 취소상세 데이터 조회
 		GagaMap map = coreOrderChangeService.getCreCancelDetailInfo(orderChange);
 		OrderChange oneData = (OrderChange) map.get("oneData");
@@ -1512,6 +1524,9 @@ public class TsfNoMemberController extends TsfBaseController {
 		mav.addObject("ordNm", order.getOrdNm());
 		mav.addObject("ordPhnno", order.getOrdPhnno());
 
+		// 로그인여부 설정
+		mav.addObject("isLogin", false);
+
 		// 주문목록 조회
 		Collection<GagaMap> orderList = orderService.getOrderListForMypage(order);
 

src/main/webapp/WEB-INF/views/mob/mypage/MypageCancelFormMob.html

@@ -322,6 +322,7 @@
 let cancelList 		= [[${cancelList}]];
 let oneData 		= [[${oneData}]];
 let paymentInfo 	= [[${paymentInfo}]];
+var isLogin = [[${isLogin}]];
 let addPayCost 		= 0;
 
 $(document).ready(function() {

src/main/webapp/WEB-INF/views/mob/mypage/MypageCreListFormMob.html

@@ -110,6 +110,7 @@
 //AJAX 로드를 위한 변수 설정
 let custNo 		= [[${custNo}]];
 let totalCnt 	= [[${totalCnt}]];
+var isLogin = [[${isLogin}]];
 var jsonObj 	= {};
 var totalPage	= 0;
 var remainList	= 0;

src/main/webapp/WEB-INF/views/mob/mypage/MypageDeliveryInfoFormMob.html

@@ -557,6 +557,9 @@
 
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
+	let ordNo = [[${ordNo}]];
+	var isLogin = [[${isLogin}]];
+
 	$(document).ready(function() {
 		// 타이틀명
 		$('#htopTitle').text('배송조회');

src/main/webapp/WEB-INF/views/mob/mypage/MypageOrderListFormMob.html

@@ -178,6 +178,7 @@ var remainList		= 0;
 var jsonObj 		= {};
 var mypageMainYn	= [[${mypageMainYn}]];
 let customerInfo 	= [[${customerInfo}]];
+var isLogin			= [[${isLogin}]];
 var pageNo			= 0;
 
 // 초기설정

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCancelFormMob.html

@@ -321,6 +321,7 @@
 let cancelList 		= [[${cancelList}]];
 let oneData 		= [[${oneData}]];
 let paymentInfo 	= [[${paymentInfo}]];
+var isLogin 		= [[${isLogin}]];
 let addPayCost 		= 0;
 
 $(document).ready(function() {

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCreListFormMob.html

@@ -126,6 +126,7 @@ let ordNo			= [[${ordNo}]];
 let ordNm			= [[${ordNm}]];
 let ordPhnno		= [[${ordPhnno}]];
 var totalCnt		= [[${totalCnt}]];
+var isLogin			= [[${isLogin}]];
 var totalPage		= 0;
 var remainList		= 0;
 var pageNo			= 0;

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberDeliveryInfoFormMob.html

@@ -356,6 +356,8 @@
 </main>
 
 <script th:inline="javascript">
+	let ordNo = [[${ordNo}]];
+	var isLogin = [[${isLogin}]];
 	$(document).ready(function() {
 		// 타이틀명
 		$('#htopTitle').text('배송조회');

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberOrderListFormMob.html

@@ -114,6 +114,7 @@ let ordNo			= [[${ordNo}]];
 let ordNm			= [[${ordNm}]];
 let ordPhnno		= [[${ordPhnno}]];
 var totalCnt		= [[${totalCnt}]];
+var isLogin = [[${isLogin}]];
 var totalPage		= 0;
 var remainList		= 0;
 var jsonObj 		= {};

src/main/webapp/WEB-INF/views/web/display/CategoryGoodsListFormWeb.html

@@ -295,6 +295,7 @@
 		<input type="hidden" name="cate4No" th:value="${cateInfo.cate4No}"/>
 		<input type="hidden" name="sortingType" value="NEW"/>
 		<input type="hidden" name="newGoods" th:value="${cateInfo.formalGb=='G009_20'?'':'40'}" />
+		<input type="hidden" name="keyword" value=""/>
 	</form>
 
 	<script src="/ux/plugins/gaga/gaga.infinite.scrollSession.js"></script>

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

@@ -214,6 +214,7 @@
 	let cancelList = [[${cancelList}]];
 	let oneData = [[${oneData}]];
 	let paymentInfo = [[${paymentInfo}]];
+	var isLogin = [[${isLogin}]];
 	let addPayCost = 0;
 
 	$(document).ready(function() {

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

@@ -204,6 +204,7 @@
 	let oneData = [[${oneData}]];
 	let kcpReceiptUrl = [[${kcpReceiptUrl}]];
 	let refundYn = [[${refundYn}]];
+	var isLogin = [[${isLogin}]];
 
 	$(document).ready(function() {
 		// 마이페이지 LNB 설정

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

@@ -170,6 +170,7 @@
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
 	/*<![CDATA[*/
+	var isLogin = [[${isLogin}]];
 	let totalCount = 0;
 	let pageSize = 0;
 

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

@@ -320,6 +320,7 @@
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
 	let ordNo = [[${ordNo}]];
+	var isLogin = [[${isLogin}]];
 
 	$(document).ready(function() {
 		// 마이페이지 LNB 설정

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

@@ -192,6 +192,7 @@
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
 	let ordNo = [[${ordNo}]];
+	var isLogin = [[${isLogin}]];
 	let totalCount = 0;
 	let pageSize = 0;
 /*<![CDATA[*/

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

@@ -213,6 +213,7 @@
 	let cancelList = [[${cancelList}]];
 	let oneData = [[${oneData}]];
 	let paymentInfo = [[${paymentInfo}]];
+	var isLogin = [[${isLogin}]];
 	let addPayCost = 0;
 
 	$(document).ready(function() {

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

@@ -206,6 +206,7 @@
 	let oneData = [[${oneData}]];
 	let kcpReceiptUrl = [[${@environment.getProperty('pg.kcp.receipt.url')}]];
 	let refundYn = [[${refundYn}]];
+	var isLogin = [[${isLogin}]];
 
 	$(document).ready(function() {
 		// 마이페이지 LNB 설정

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

@@ -173,6 +173,7 @@
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
 	/*<![CDATA[*/
+	var isLogin = [[${isLogin}]];
 	let totalCount = 0;
 	let pageSize = 0;
 

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

@@ -237,6 +237,7 @@
 	</div>
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
+	var isLogin = [[${isLogin}]];
 	let ordNo = [[${ordNo}]];
 
 	$(document).ready(function() {

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

@@ -164,6 +164,7 @@
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
 	let ordNo = [[${ordNo}]];
+	var isLogin = [[${isLogin}]];
 	let totalCount = 0;
 	let pageSize = 0;
 /*<![CDATA[*/

src/main/webapp/biz/mypage.js

@@ -162,6 +162,10 @@ var fnCreateCart = function(param) {
 	let ordNo = $(param).attr('ordNo');
 	let ordDtlNo = $(param).attr('ordDtlNo');
 
+	if (isLogin == false) {
+		url = '/noMember/cart/add/info';
+	}
+
 	let data = {};
 	
 	data.ordNo = ordNo;