Merge branch 'develop' into card007

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

@@ -544,6 +544,7 @@ public class TsfDisplayService {
 	 */
 	public Collection<Contents> getContentsForGoods(Contents contents) {
 		Collection<Contents> contentsList = displayDao.getContentsList(contents);
+		Collection<Goods> goodsList = new ArrayList<>();
 		Cate4Srch tempContents = new Cate4Srch();
 		for (Contents data : contentsList) {
 			tempContents.setContentsLoc(data.getContentsLoc());
@@ -554,7 +555,20 @@ public class TsfDisplayService {
 				data.setFrontGb(TsfSession.getFrontGb());
 				data.setBannerList(displayDao.getContentsBannerList(data));
 			}
-			data.setGoodsList(goodsDao.getContentsCategoryGoodsList(tempContents));
+			goodsList = (goodsDao.getContentsCategoryGoodsList(tempContents));
+			if("SMM007".equals(data.getContentsLoc())){
+				int maxrow = 3;
+				if(goodsList == null || goodsList.size() < 3){
+					Cate4Srch cate = new Cate4Srch();
+					cate.setSiteCd(TscConstants.Site.STYLE24.value());
+					cate.setCateGb(TsfConstants.CateGb.BYITEM.value());
+					cate.setFrontGb(data.getFrontGb());
+					cate.setBrandGroupNo(Integer.parseInt(data.getBrandGroupNo()));
+					cate.setMaxRow(maxrow-goodsList.size());
+					goodsList.addAll(goodsDao.getContentsCategoryNewGoodsList(cate));
+				}
+			}
+			data.setGoodsList(goodsList);
 		}
 
 		log.info("getContentsForGoods contentsList.size()::{}", contentsList.size());
@@ -678,13 +692,15 @@ public class TsfDisplayService {
 	public Collection<Filter> getCategoryFilterList(Collection<Filter> filterList, String filterGb) {
 		Collection<Filter> resultList = new ArrayList<Filter>();
 		for (Filter filter : filterList) {
-			if (filter.getFilterGb().equals(filterGb)) {
-				if ("BENEFIT".equals(filterGb)) {
-					if (!filter.getFilterCd().equals("40")) {
+			if(!"".equals(filter.getFilterCd()) && !filter.getFilterCd().equals(null)){
+				if (filter.getFilterGb().equals(filterGb)) {
+					if ("BENEFIT".equals(filterGb)) {
+						if (!filter.getFilterCd().equals("40")) {
+							resultList.add(filter);
+						}
+					} else {
 						resultList.add(filter);
 					}
-				} else {
-					resultList.add(filter);
 				}
 			}
 		}

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

@@ -393,8 +393,8 @@ public class TsfPlanningService {
 	public void savePollCustAnswer(Poll poll) {
 		poll.setCustNo(TsfSession.getInfo().getCustNo());
 		// 단수형
+		int ansIndex = planningDao.getPollCustAnswerIndex();
 		if(poll.getPollQsq_10()!=null && poll.getPollQsq_10()!="") {
-			int ansIndex = planningDao.getPollCustAnswerIndex();
 			String[] pollQsq_10 =poll.getPollQsq_10().split("/");
 			for (int i = 0; i < pollQsq_10.length; i++) {
 				String[] temp = pollQsq_10[i].split("-");
@@ -412,7 +412,6 @@ public class TsfPlanningService {
 		
 		//복수형
 		if(poll.getPollQsq_20()!=null && poll.getPollQsq_20()!="") {
-			int ansIndex = planningDao.getPollCustAnswerIndex();
 			String[] pollQsq_20 =poll.getPollQsq_20().split("/");
 			for (int i = 0; i < pollQsq_20.length; i++) {
 				String[] temp = pollQsq_20[i].split("-");
@@ -431,7 +430,6 @@ public class TsfPlanningService {
 		
 		//단답형
 		if(poll.getPollQsq_30()!=null && poll.getPollQsq_30()!="") {
-			int ansIndex = planningDao.getPollCustAnswerIndex();
 			String[] pollQsq_30 =poll.getPollQsq_30().split("/");
 			for (int i = 0; i < pollQsq_30.length; i++) {
 				String[] temp = pollQsq_30[i].split("-");
@@ -449,7 +447,6 @@ public class TsfPlanningService {
 		
 		//서룰형
 		if(poll.getPollQsq_40()!=null && poll.getPollQsq_40()!="") {
-			int ansIndex = planningDao.getPollCustAnswerIndex();
 			String[] pollQsq_40 =poll.getPollQsq_40().split("/");
 			for (int i = 0; i < pollQsq_40.length; i++) {
 				String[] temp = pollQsq_40[i].split("-");

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

@@ -2177,18 +2177,12 @@ public class TsfMypageController extends TsfBaseController {
 	@RequestMapping("/account/check")
 	@ResponseBody
 	public GagaMap getAccountCheck(@RequestBody CustAccount custAccount) {
-		custAccount.setIpAddress(TsfSession.getIpAddress());
 		boolean isValid = false;
-		
-		log.info("custAccount.getAccountNm() ::: {}",custAccount.getAccountNm());
-		log.info("custAccount.getBankCd() ::: {}",custAccount.getBankCd());
-		log.info("custAccount.getAccountNo() ::: {}",custAccount.getAccountNo());
-		
 		GagaMap result = coreKcpService.checkAccount(custAccount);
 		if ("0000".equals(result.get("resCd"))) {
 			isValid = true;
 		}
-		result.set("isValid", isValid);
+		result.setBoolean("isValid", isValid);
 		return result;
 	}
 

src/main/java/com/style24/persistence/domain/searchengine/SearchEngine.java

@@ -84,6 +84,7 @@ public class SearchEngine implements Serializable {
 	private String likeIt;			// 좋아요(위시리스트에담긴상품)
 	private String mainColorCd;		// 메인컬러
 	private String selfGoodsYn;		// 자사상품여부
+	private String colorCd;
 
 //	private String adminIp;			// 검색엔진IP
 //	private String adminPort;		// 검색엔진포트
@@ -95,6 +96,8 @@ public class SearchEngine implements Serializable {
 	private String planNm;			//기획전명
 	private Integer planSq;			//기획전일련번호(SeqPlan sequence)
 	private String dtlTitle1;		//상세제목1
+	private String brandNm;
+	private String newYn;
 
 	// 이벤트 리스트
 	private String dispStdt;			//기획전 시작일시

src/main/webapp/WEB-INF/views/mob/callcenter/OneToOneQnaRegisterFormMob.html

@@ -91,7 +91,6 @@
 												<div class="info_addfile">
 													<ul>
 														<li>사진은 이미지당 10MB 이하의 JPEG, JPG, PNG 파일 2장까지 첨부 가능합니다.</li>
-														<li>파일명에 한글은 사용 불가입니다.</li>
 														<li>첨부된 사진은 문의 외의 목적으로는 사용되지 않습니다.</li>
 													</ul>
 												</div>

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

@@ -38,7 +38,7 @@
 						<li class="fn">주소 : 서울시 영등포구 은행로 11, 8층(여의도동, 일신빌딩)</li>
 						<li class="fn">사업자등록번호 : 116-81-32499 </li>
 <!--						<li class="fn">개인정보관리책임자 : 이정득 </li>-->
-						<li class="fn">통신판매업신고번호 : 제 2020-서울영등포1432</li>
+						<li class="fn">통신판매업신고번호 : 제 2020-서울영등포-1432</li>
 						<li class="fn">개인정보보호책임자 : 김명인</li>
 						<li class="fn">호스팅 서비스 : 아이스타일이십사㈜</li>
 					</ul>

src/main/webapp/WEB-INF/views/mob/display/AllBrandFormMob.html

@@ -146,6 +146,7 @@
 
 	var swiperBrand = new Swiper('.swiper-container.brand_si', {
 		slidesPerView: 3,
+		slidesPerGroup: 6,
 		slidesPerColumn: 2,
 		spaceBetween: 0,
 		pagination: {

src/main/webapp/WEB-INF/views/mob/display/BrandMainFormMob.html

@@ -125,23 +125,27 @@
 				<th:block th:if="${contentsLoc=='006' || contentsLoc=='014'||contentsLoc=='015'||contentsLoc=='016'}">
 					<!-- 배너 슬라이드 -->
 					<div class="inner wide" th:if="${brandMainLayoutData.ContentsList!=null and !brandMainLayoutData.ContentsList.empty}">
-						<div class="swiper-container br_second_slide">
-							<div class="swiper-wrapper">
-								<th:block th:each="ContentsData, ContentsStat : ${brandMainLayoutData.ContentsList}">
-									<div class="swiper-slide">
-										<a th:href="${ContentsData.strVar1}" target="_blank" title="새 창으로 열기">
-											<img th:src="${@environment.getProperty('domain.image')+ContentsData.imgPath1}" alt="">
-											<div class="s-text" id="bannerS">
-												<p class="bText">
-													<input type="hidden" name="bannerDesc" th:value="${ContentsData.strTitle1}">
-												</p>
-											</div>
-										</a>
-									</div>
-								</th:block>
+						<div class="main_1stage">
+							<div class="swiper-container post-bnnWide">
+								<div class="swiper-wrapper">
+									<th:block th:each="ContentsData, ContentsStat : ${brandMainLayoutData.ContentsList}">
+										<div class="swiper-slide">
+											<a th:href="${ContentsData.strVar1}" target="_blank" title="새 창으로 열기">
+												<div class="bnnbox"> <!-- 210528_ 삭제 : 인라인 style css 제거 -->
+													<div class="txtWrap" id="bannerS">
+														<p class="bText">
+															<input type="hidden" name="bannerDesc" th:value="${ContentsData.strTitle1}">
+														</p> <!-- 210614_ 수정 : 줄내림 방식 교체 -->
+													</div>
+													<img alt="BLUE-a" class=" vLHTC pd_img" th:src="${@environment.getProperty('domain.image')+ContentsData.imgPath1}">
+												</div>
+											</a>
+										</div>
+									</th:block>
+									<!-- Add Pagination -->
+									<div class="swiper-pagination"></div>
+								</div>
 							</div>
-							<!-- Add Pagination -->
-							<div class="swiper-pagination"></div>
 						</div>
 					</div>
 				</th:block>

src/main/webapp/WEB-INF/views/mob/display/CategoryMainFormMob.html

@@ -69,6 +69,7 @@
 									<div class="swiper-slide" th:each="item, status : ${newGoodsList}">
 										<div class="item_prod" th:if="${status.count<21}">
 											<div class="item_state">
+												<button type="button" class="itemLike" th:classappend="${item.likeIt == 'likeit'}? 'likeit' : ''"  onclick="cfnPutWishList(this);" th:attr="goodsCd=${item.goodsCd}, ithrCd='', contentsLoc='SCM001', planDtlSq=''">관심상품 추가</button>
 												<a href="javascript:void(0);" class="itemLink" th:onclick="cfnGoToGoodsDetail([[${item.goodsCd}]], '', '', 'SCM001');">
 													<div class="itemPic">
 														<th:block th:each="option,idx:${item.videos}" th:with="videoArr=${#strings.arraySplit(idx.current,':')}">
@@ -76,7 +77,6 @@
 															<iframe th:unless="${videoArr[0]=='Y'}" id="pdThumbVideo" class="pd_mov" th:src="${kollusMediaUrl+'/'+videoArr[1]+'?enable_initialize_focus=false&autoplay&mute&controls_activation=none'}" allow="fullscreen" allowFullScreen></iframe>
 														</th:block>
 														<img alt="BLACK-a" class=" vLHTC pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + item.sysImgNm}" onerror="noneImg(this)">
-														<button type="button" class="itemLike" th:classappend="${item.likeIt == 'likeit'}? 'likeit' : ''"  onclick="cfnPutWishList(this);" th:attr="goodsCd=${item.goodsCd}, ithrCd='', contentsLoc='SCM001', planDtlSq=''">관심상품 추가</button>
 													</div>
 													<p class="itemBrand" th:text="${item.brandGroupNm}">BRAND NAME</p>
 													<div class="itemName" th:text="${item.goodsFullNm}">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
@@ -100,6 +100,7 @@
 								<div class="itemsGrp">
 									<div class=" item_prod" th:each="item, status : ${bestGoodsList}">
 										<div class="item_state">
+											<button type="button" class="itemLike" th:classappend="${item.likeIt == 'likeit'}? 'likeit' : ''"  onclick="cfnPutWishList(this);" th:attr="goodsCd=${item.goodsCd}, ithrCd='', contentsLoc='SCM002', planDtlSq=''">관심상품 추가</button>
 											<a href="javascript:void(0);" class="itemLink" th:onclick="cfnGoToGoodsDetail([[${item.goodsCd}]], '', '', 'SCM002');">
 												<div class="shape" th:classappend="${status.count==1}?'ranker'"><span th:text="${status.index+1}"></span></div>
 												<div class=" itemPic">
@@ -108,7 +109,6 @@
 														<iframe th:unless="${videoArr[0]=='Y'}" id="pdThumbVideo" class="pd_mov" th:src="${kollusMediaUrl+'/'+videoArr[1]+'?enable_initialize_focus=false&autoplay&mute&controls_activation=none'}" allow="fullscreen" allowFullScreen></iframe>
 													</th:block>
 													<img alt="BLUE-a" class=" vLHTC pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + item.sysImgNm}" onerror="noneImg(this)">
-													<button type="button" class="itemLike" th:classappend="${item.likeIt == 'likeit'}? 'likeit' : ''"  onclick="cfnPutWishList(this);" th:attr="goodsCd=${item.goodsCd}, ithrCd='', contentsLoc='SCM002', planDtlSq=''">관심상품 추가</button>
 												</div>
 												<p class="itemBrand" th:text="${item.brandGroupNm}">BRAND NAME</p>
 												<div class=" itemName" th:text="${item.goodsFullNm}">여성 체인 프린트 큐롯 스커트 프린트 큐롯 스커트</div>

src/main/webapp/WEB-INF/views/mob/display/MallMainFormMob.html

@@ -271,7 +271,7 @@
 																<div class="itemPic">
 																	<img alt="" class=" pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + goodsData.sysImgNm}" onerror="noneImg(this)">
 																</div>
-																<p class="itemBrand" th:text="${goodsData.brandEnm}">TBJ</p>
+																<p class="itemBrand" th:text="${goodsData.brandGroupNm}">TBJ</p>
 																<div class="itemName" th:text="${goodsData.goodsNm}">11111 남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
 																<div class="itemComment" th:text="${goodsData.goodsTnm}"># 가을 느낌 물씬!</div>
 																<p class="itemPrice">

src/main/webapp/WEB-INF/views/mob/display/SearchGoodsListFormMob.html

@@ -1039,6 +1039,7 @@
 
 	<!-- //2021.06.18 검색화면 로그스크립트 삽입 -->
 	<script type="text/javascript">
+		var searchKeyword = '[[${params.keyword}]]';
 		window._eglqueue = window._eglqueue || [];
 		_eglqueue.push(['setVar', 'cuid', eglqueueCuid]);
 		_eglqueue.push(['setVar', 'searchTerm', [[${params.keyword}]]]);

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

@@ -655,8 +655,9 @@ var fnChooseFile = function(obj) {
 					                reader.onload = function (e) { $(".pics").find("img").last().attr("src", e.target.result); }
 
 					                reader.readAsDataURL(rotateFile);
+
 					            }, fileType)
-					        }, { orientation: true });
+					        }, { orientation: 1});
 						}
 				); 
 		}

src/main/webapp/WEB-INF/views/web/callcenter/OneToOneQnaRegisterFormWeb.html

@@ -98,7 +98,6 @@
 												<div class="info_addfile">
 													<ul>
 														<li>- 사진은 최대 20MB 이하의 JPG,PNG,GIF <span>파일2장까지 첨부 가능</span>합니다.</li>
-														<li>- 파일명에 한글은 사용불가입니다.</li>
 														<li>- 첨부된 사진은 문의 외의 목적으로는 사용되지 않습니다.</li>
 													</ul>
 												</div>

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

@@ -79,8 +79,8 @@
 									</p>
 								</div>
 								<div class="btn_box">
-									<button class="btn btn_default" th:unless="${lbInfo.lookbookGb=='BL'}" onclick="cfnGoToPage(_PAGE_MAIN);"><span>메인으로 가기</span></button>
-									<button class="btn btn_default" th:if="${lbInfo.lookbookGb=='BL'}" th:onclick="cfnGoToBrandMain([[${lbInfo.brandCd}]]);"><span th:text="${brandGroupInfo.brandGroupNm+' 홈으로 가기'}"><em>TBJ</em>&nbsp;메인으로 가기 </span></button>
+									<button class="btn btn_default" th:unless="${lbInfo.lookbookGb=='BL'}" onclick="cfnGoToPage(_PAGE_MAIN);"><span>홈으로 가기</span></button>
+									<button class="btn btn_default" th:if="${lbInfo.lookbookGb=='BL'}" th:onclick="cfnGoToBrandMain([[${lbInfo.brandCd}]]);"><span th:text="${brandGroupInfo.brandGroupNm+' 홈으로 가기'}"><em>TBJ</em>&nbsp;홈으로 가기 </span></button>
 								</div>
 							</div>
 						</div>

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

@@ -222,7 +222,9 @@
 		tag += '							<p class="itemBrand">'+obj2+'</p>\n';
 		tag += '							<div class="itemName">'+obj3+'</div>\n';
 		tag += '							<span class="itemPrice_original">'+obj4.addComma()+'</span>\n';
-		tag += '							<p class="itemPrice">'+obj5.addComma()+'\n';
+		if(obj4 != obj5){
+			tag += '							<p class="itemPrice">'+obj5.addComma()+'\n';
+		}
 		if(obj6>0){
 			tag += '								<span class="itemPercent">'+obj6+'%</span>\n';
 		}

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

@@ -79,8 +79,8 @@
 									</p>
 								</div>
 								<div class="btn_box">
-									<button class="btn btn_default" th:unless="${lbInfo.lookbookGb=='BL'}" onclick="cfnGoToPage(_PAGE_MAIN);"><span>메인으로 가기</span></button>
-									<button class="btn btn_default" th:if="${lbInfo.lookbookGb=='BL'}" th:onclick="cfnGoToBrandMain([[${lbInfo.brandCd}]]);"><span th:text="${brandGroupInfo.brandGroupNm+' 홈으로 가기'}"><em>TBJ</em>&nbsp;메인으로 가기 </span></button>
+									<button class="btn btn_default" th:unless="${lbInfo.lookbookGb=='BL'}" onclick="cfnGoToPage(_PAGE_MAIN);"><span>홈으로 가기</span></button>
+									<button class="btn btn_default" th:if="${lbInfo.lookbookGb=='BL'}" th:onclick="cfnGoToBrandMain([[${lbInfo.brandCd}]]);"><span th:text="${brandGroupInfo.brandGroupNm+' 홈으로 가기'}"><em>TBJ</em>&nbsp;홈으로 가기 </span></button>
 								</div>
 							</div>
 						</div>

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

@@ -1102,9 +1102,10 @@
 
 	<!-- //2021.06.18 검색화면 로그스크립트 삽입 -->
 	<script type="text/javascript">
+		var searchKeyword = '[[${params.keyword}]]';
 		window._eglqueue = window._eglqueue || [];
 		_eglqueue.push(['setVar', 'cuid', eglqueueCuid]);
-		_eglqueue.push(['setVar', 'searchTerm', [[${params.keyword}]]]);
+		_eglqueue.push(['setVar', 'searchTerm', searchKeyword]);
 		_eglqueue.push(['setVar', 'userId', hCustId]); // optional
 		_eglqueue.push(['track', 'search']);
 		(function (s, x) {

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

@@ -130,7 +130,7 @@
 		for (var i = 0; i < date.length; i++) {
 			$("#searchDt").append(	"<li onclick='fnChangeDate(this.value)' value='"+ date[i].year + "" + date[i].month + "'>" + date[i].year	+ "년" +  "  " + date[i].month + "월 </li>")
 		}
-		$(".select").append("<li class='selected' value='"+date[0].year+""+date[0].month+"'>"+ date[0].year + "년" +  "  " + date[0].month + "월 </li>"); // 현재년도 선택 */ 
+		$(".select").html(date[0].year + "년"  +  "  " + date[0].month + "월"); // 현재년도 선택 */ 
 	}
 	appendYear($("#searchDt"));
 

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

@@ -132,7 +132,7 @@
 		for (var i = 0; i < date.length; i++) {
 			$("#searchDt").append(	"<li onclick='fnChangeDate(this.value)' value='"+ date[i].year + "" + date[i].month + "'>" + date[i].year	+ "년" +  "  " + date[i].month + "월 </li>")
 		}
-		$(".select").append("<li onclick='fnChangeDate(this.value)' value='"+date[0].year+""+date[0].month+"'>"+ date[0].year + "년"  +  "  " + date[0].month + "월 </li>"); // 현재년도 선택 */ 
+		$(".select").html(date[0].year + "년"  +  "  " + date[0].month + "월"); // 현재년도 선택 */ 
 	}
 	appendYear($("#searchDt"));
 
@@ -267,7 +267,7 @@
 		});
 		// 셀렉트박스 데이터 설정
 		fnChangeDate();
-
+		
 	});
 
 </script>

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

@@ -377,7 +377,6 @@
 				</div>
 			</div>
 <script type="text/javascript" src="/ux/plugins/gaga/gaga.kollus.js"></script>
-<script type="text/javascript" src="/ux/plugins/load-image.all.min.js"></script>
 <!-- <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/exif-js"></script> -->
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
@@ -595,16 +594,6 @@ var fnChooseFile = function(obj) {
 							// 업로드한 파일명 설정
 							$(".pics").children().eq(0).append("<input type='hidden' name='orgFileNmArr' id='orgFileNm"+(picLength+1)+"' value='"+result.oldFileName+"'>");
 							$(".pics").children().eq(0).append("<input type='hidden' name='sysFileNmArr' id='sysFileNm"+(picLength+1)+"' value='"+result.newFileName+"'>");
-							
-							var limg = loadImage(file, function (img, data) {
-					            img.toBlob(function (blob) {
-					                var rotateFile = new File([blob], file.name, { type: fileType });
-					                var reader = new FileReader();
-					                reader.onload = function (e) { $(".pics").find("img").eq(0).attr("src", e.target.result); }
-
-					                reader.readAsDataURL(rotateFile);
-					            }, fileType)
-					        }, { orientation: true });
 						}
 				); 
 		}else{