Merge remote-tracking branch 'origin/develop' into jsh77b

src/main/java/com/style24/front/biz/thirdparty/SearchEngineDiquest.java

@@ -220,6 +220,7 @@ public class SearchEngineDiquest {
 		log.info("///[getGoodsList] paramMap: {}", paramMap);
 
 		try {
+			
 			JSONObject jsonObj = SearchService.getGoodsList(paramMap);
 			log.info("///[getGoodsList] jsonObj: {}", jsonObj.toJSONString());
 

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

@@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 import org.springframework.mobile.device.Device;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -63,7 +64,7 @@ import lombok.extern.slf4j.Slf4j;
 
 /**
  * 전시 Controller
- * 
+ *
  * @author gagamel
  * @since 2020. 12. 29
  */
@@ -102,6 +103,9 @@ public class TsfDisplayController extends TsfBaseController {
 	@Autowired
 	private EigeneaiApi eigeneaiApi;
 
+	@Autowired
+	private Environment env;
+
 	/**
 	 * PC보기. 모바일에서 <PC> 형태로 볼 때
 	 * @return
@@ -258,12 +262,12 @@ public class TsfDisplayController extends TsfBaseController {
 	@GetMapping("/mall/main/form3")
 	public ModelAndView mallMain3(Device device, @RequestParam HashMap<String, String> paramMap) {
 		ModelAndView mav = new ModelAndView();
-		
+
 		mav.setViewName(super.getDeviceViewName("display/MallMainForm3"));
 
 		return mav;
 	}
-	
+
 	/**
 	 * 몰 메인 테스트 폼
 	 * @return
@@ -386,8 +390,8 @@ public class TsfDisplayController extends TsfBaseController {
 
 		return mav;
 	}
-	
-		
+
+
 	/**
 	 * GNB탭 > 브랜드그룹 목록
 	 * @param contents - 컨텐츠 정보
@@ -902,12 +906,26 @@ public class TsfDisplayController extends TsfBaseController {
 		}
 
 		Collection<SearchEngine> dataList = new ArrayList<SearchEngine>();
-		
+
 		log.info("params.getSortingType() ::: {}", params.getSortingType());
 
-		GoodsListResponse response = diquest.getGoodsList(params);
-		pageable.setTotalCount(response.getTotalCount());
-		dataList = response.getResponse();
+//		GoodsListResponse response = diquest.getGoodsList(params);
+//		pageable.setTotalCount(response.getTotalCount());
+//		dataList = response.getResponse();
+//		result.set("paging", pageable);
+//		result.set("dataList", dataList);
+
+		String profiles = env.getProperty("spring.profiles.active").toLowerCase();
+		GoodsListResponse response = null;
+		if ("style".equals(profiles) || "stage".equals(profiles) || "locp".equals(profiles)) { // 검색엔진을 통한 상품리스트 조회
+			response = diquest.getGoodsList(params);
+			pageable.setTotalCount(response.getTotalCount());
+			dataList = response.getResponse();
+		} else { // DB를 통한 상품리스트 조회
+			pageable.setTotalCount(goodsService.getSearchGoodsCount(params));
+			params.setPageable(pageable);
+			dataList = goodsService.getSearchGoodsList(params);
+		}
 		result.set("paging", pageable);
 		result.set("dataList", dataList);
 
@@ -1223,16 +1241,18 @@ public class TsfDisplayController extends TsfBaseController {
 		log.info("getSearchGoodsList params::{}", params);
 		// 검색엔진 연동 여부
 //		String syncYn = commonService.getSearchEngineSyncYn();
-//		if (syncYn.equals("Y")) { // 검색엔진을 통한 상품리스트 조회
-		GoodsListResponse response = diquest.getGoodsList(params);
-		pageable.setTotalCount(response.getTotalCount());
-		dataList = response.getResponse();
-//		} else { // DB를 통한 상품리스트 조회
-//			pageable.setTotalCount(goodsService.getSearchGoodsCount(params));
-//			params.setPageable(pageable);
-//			dataList = goodsService.getSearchGoodsList(params);
-//		}
-		recommendList = response.getRecommend();
+		String profiles = env.getProperty("spring.profiles.active").toLowerCase();
+		GoodsListResponse response = null;
+		if ("style".equals(profiles) || "stage".equals(profiles) || "locp".equals(profiles)) { // 검색엔진을 통한 상품리스트 조회
+			response = diquest.getGoodsList(params);
+			pageable.setTotalCount(response.getTotalCount());
+			dataList = response.getResponse();
+			recommendList = response.getRecommend();
+		} else { // DB를 통한 상품리스트 조회
+			pageable.setTotalCount(goodsService.getSearchGoodsCount(params));
+			params.setPageable(pageable);
+			dataList = goodsService.getSearchGoodsList(params);
+		}
 
 		result.set("paging", pageable);
 		result.set("dataList", dataList);
@@ -1240,7 +1260,7 @@ public class TsfDisplayController extends TsfBaseController {
 
 		return result;
 	}
-	
+
 	/**
 	 * 검색상품 리스트 수량 조회
 	 * 검색팝업창에서 추천솔루선 리턴이 0일 때, 검색엔진 결과가 있는지 확인용
@@ -1253,7 +1273,7 @@ public class TsfDisplayController extends TsfBaseController {
 	@ResponseBody
 	public GagaMap getSearchGoodsListCnt(@RequestBody SearchEngine params) {
 		GagaMap result = new GagaMap();
-		
+
 		if (TsfSession.isLogin()) {
 			params.setCustNo(TsfSession.getInfo().getCustNo());
 		}
@@ -1261,10 +1281,10 @@ public class TsfDisplayController extends TsfBaseController {
 		params.setFrontGb(TsfSession.getFrontGb());
 		params.setCustGb(TsfSession.getCustGb());
 		log.info("getSearchGoodsList params::{}", params);
-		
+
 		// 검색엔진을 통한 상품리스트 조회
 		GoodsListResponse response = diquest.getGoodsList(params);
-		
+
 		result.set("response_cnt", response.getTotalCount());
 
 		return result;

src/main/webapp/biz/goods.js

@@ -17,7 +17,7 @@ var fnGoodsTogetherSearch = function(params) {
 			if (result != null) {
 				$("#goodsTogetherbArea").css("display", "block");
 				$("#goodsTogetherbArea").html(result);
-				
+
 				// 위시처리- 로그인 되어 있을시
 		  		if (cfCheckLogin()) {
 		  			//이상품과 함께본 상품
@@ -49,7 +49,7 @@ var fnGoodsTogetherSearch = function(params) {
 // 추천 상품
 var fnGoodsRecommendSearch = function(params) {
 	//gagajf.ajaxSubmit("/goods/detail/recommend/frame", "html", "goodsRecommendbArea", params);
-	
+
 	$.ajax( {
 		type		: "POST",
 		url 		: '/goods/detail/recommend/frame',
@@ -95,7 +95,7 @@ var fnGoodsRecommendSearch = function(params) {
 // 비슷한 상품
 var fnGoodsLikeSearch = function(params) {
 	//gagajf.ajaxSubmit("/goods/detail/like/frame", "html", "goodsLikebArea", params);
-	
+
 	$.ajax( {
 		type		: "POST",
 		url 		: '/goods/detail/like/frame',
@@ -144,7 +144,7 @@ var fnEpCouponDown = function(afLinkCd, goodsCd, maxRownum){
 	if (typeof (afLinkCd) == 'undefined' || gagajf.isNull(afLinkCd)){
 		return false;
 	}
-	
+
 	let data = {afLinkCd : afLinkCd
 				, goodsCd : goodsCd
 				, maxRownum : maxRownum
@@ -168,15 +168,15 @@ var fnEpCouponDown = function(afLinkCd, goodsCd, maxRownum){
 				tag += '							COUPON\n';
 				tag += '						</p>\n';
 				tag += '						<p class="cp_cont">\n';
-				if (coupon.dcWay == 'G240_11'){		//할인율 
+				if (coupon.dcWay == 'G240_11'){		//할인율
 					tag += '							<span class="unit_percent">\n';
 					tag += '								최대<em class="number">'+coupon.dcVal+'</em><em class="unit">%</em>\n';
 					tag += '							</span>\n';
-					
-				}else{	
+
+				}else{
 					tag += '							<span class="unit_won">\n';
 					tag += '								<em class="number">'+coupon.dcVal.addComma()+'</em><em class="unit">원</em>\n';
-					tag += '							</span>\n';	
+					tag += '							</span>\n';
 				}
 				tag += '						</p>\n';
 				tag += '					</div>\n';
@@ -187,7 +187,7 @@ var fnEpCouponDown = function(afLinkCd, goodsCd, maxRownum){
 				tag += '						<li>할인대상 및 금액은 상시 변경됩니다.</li>\n';
 				tag += '						<li>제휴 사이트와 정보연동 시간차이로 판매정보가 불일치할 수 있습니다.</li>\n';
 				tag += '						<li>본 쿠폰은 제휴 사이트를 통해 들어온 고객님만 발급 및 사용이 가능합니다.</li>\n';
-				tag += '					</ul>\n';						
+				tag += '					</ul>\n';
 				tag += '				</div>\n';
 				tag += '			</div>\n';
 				tag += '		</div>\n';
@@ -212,7 +212,7 @@ var fnEpCoupondown = function(afLinkCd, goodsCd){
 		cfnGoToPage(_PAGE_LOGIN);
 		return false;
 	}
-	
+
 	gagajf.ajaxJsonSubmit(_PAGE_GOODS_EP_CPN_DOWNLOAD, JSON.stringify({goodsCd: goodsCd, afLinkCd: afLinkCd}), fnEpCouponDownCallBack);
 }
 
@@ -286,7 +286,7 @@ var fnCreateGoodsList = function(result, ithrCd, contentLoc, goodsUrl, lastPage,
 			}
 			// tag += '		<img class=" vLHTC pd_img" src="' + item.sysImgNm + '" data-img="' + item.sysImgNm2 + '" onerror="noneImg(this)">';
 			var imgUrl = "//image.istyle24.com/Upload/ProductImage/";
-			tag += '		<img class=" vLHTC pd_img" src="' + goodsUrl + '/' + item.sysImgNm.replace(imgUrl,"") + '" data-img="' + goodsUrl + '/' + item.sysImgNm2.replace(imgUrl,"") + '" onerror="noneImg(this)">';
+			tag += '		<img class=" vLHTC pd_img" src="' + goodsUrl + '/' + (item.sysImgNm ? item.sysImgNm.replace(imgUrl,"") : '') + '" data-img="' + goodsUrl + '/' + (item.sysImgNm2 ? item.sysImgNm2.replace(imgUrl,"") : '') + '" onerror="noneImg(this)">';
 			if (!gagajf.isNull(item.sizes) && item.selfGoodsYn == 'Y') {
 				var sizeArr = item.sizes.split(",");
 				var minSize;
@@ -654,13 +654,13 @@ var fnFilterSliderMove = function (min, max){
 	var $inputFrom = $("#price_input_from");
 	var $inputTo = $("#price_input_to");
 	var instance;
-	
+
 	instance = $range.data("ionRangeSlider");
 	instance.update({
 		from: min
 	});
 	//$inputFrom.val(min);
-	
+
 	instance.update({
 		to: max
 	});
@@ -828,7 +828,7 @@ var fnSortingChange = function (obj, sortingType, stat, appGb){
 		$("#sorting"+sortingType).addClass("on");
 		$("#filter").text($("#sorting"+sortingType).find('span').text());
 	}
-	
+
 	$(obj).addClass("on");
 	if(stat=='back'){
 		$("#sorting"+sortingType).addClass("on");