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

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

@@ -652,7 +652,7 @@
 		/* TsfDisplay.getGoodsListCategoryFilterList */
 		SELECT FILTER_GB
 		     , CASE WHEN FILTER_GB = 'SIZE' THEN
-		                SUBSTRING_INDEX(FILTER_CD,'|',1) AS FILTER_CD
+		                SUBSTRING_INDEX(FILTER_CD,'|',1)
 		            ELSE
 		                FILTER_CD
 		       END       AS FILTER_CD

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

@@ -1694,6 +1694,16 @@
 		    AND    BENEFIT_GB = #{newGoods}
 		    )
 		</if>
+		<if test='benefitArr != null and benefitArr.length > 0'>
+		            AND    EXISTS (SELECT 1
+		                           FROM   TB_GOODS_BENEFIT
+		                           WHERE  GOODS_CD = G.GOODS_CD
+		                           AND    BENEFIT_GB IN
+		                           <foreach collection="benefitArr" item="item" index="index"  open="(" close=")" separator=",">
+		                               #{item}
+		                           </foreach>
+		                        )
+		        </if>
 		) G
 		WHERE  1 = 1
 		<if test="priceFrom != null and priceFrom != ''">
@@ -1841,6 +1851,16 @@
 		                           AND    BENEFIT_GB = #{newGoods}
 		                         )
 		        </if>
+		        <if test='benefitArr != null and benefitArr.length > 0'>
+		            AND    EXISTS (SELECT 1
+		                           FROM   TB_GOODS_BENEFIT
+		                           WHERE  GOODS_CD = G.GOODS_CD
+		                           AND    BENEFIT_GB IN
+		                           <foreach collection="benefitArr" item="item" index="index"  open="(" close=")" separator=",">
+		                               #{item}
+		                           </foreach>
+		                        )
+		        </if>
 		      ) G
 		      WHERE  1 = 1
 		      <if test="priceFrom != null and priceFrom != ''">
@@ -1925,8 +1945,7 @@
 		                    </otherwise>
 		                </choose>
 		                FROM   TAB_GOODS G
-		                JOIN   TAB_OPTION O ON G.GOODS_CD = O.GOODS_CD
-		                <!--LEFT OUTER JOIN TAB_OPTION O ON G.GOODS_CD = O.GOODS_CD-->
+		                LEFT OUTER JOIN TAB_OPTION O ON G.GOODS_CD = O.GOODS_CD
 		        ) ORIGINAL
 		        WHERE  1 = 1
 		        <if test="pageable != null and pageable.endRow != null and pageable.endRow > 0">
@@ -1936,10 +1955,12 @@
 		, TAB_GOODS_IMG AS (
 		        /* 상품의 이미지 */
 		        SELECT GOODS_CD
+		        , MAIN_COLOR_CD
 		        , MAX(SYS_IMG_NM)  AS SYS_IMG_NM
 		        , MAX(SYS_IMG_NM2) AS SYS_IMG_NM2
 		        FROM   (
 		              SELECT G.GOODS_CD
+		              , GI.COLOR_CD AS MAIN_COLOR_CD
 		              , CASE WHEN GI.DEFAULT_IMG_YN = 'Y' THEN GI.SYS_IMG_NM ELSE NULL END   AS SYS_IMG_NM
 		              , CASE WHEN GI.MOUSEOVER_IMG_YN = 'Y' THEN GI.SYS_IMG_NM ELSE NULL END AS SYS_IMG_NM2
 		              FROM   TAB_ALL_GOODS G
@@ -1947,7 +1968,7 @@
 		              WHERE  G.GOODS_CD = GI.GOODS_CD
 		              AND    G.MAIN_COLOR_CD = GI.COLOR_CD
 		        ) Z
-		        GROUP  BY GOODS_CD
+		        GROUP  BY GOODS_CD , MAIN_COLOR_CD
 		)
 		SELECT G.BRAND_GROUP_NM
 		      , G.GOODS_CD
@@ -2019,7 +2040,7 @@
 		    </otherwise>
 		</choose>
 		FROM   TAB_ALL_GOODS G
-		LEFT OUTER JOIN TAB_GOODS_IMG GI ON G.GOODS_CD = GI.GOODS_CD
+		LEFT OUTER JOIN TAB_GOODS_IMG GI ON G.GOODS_CD = GI.GOODS_CD AND G.MAIN_COLOR_CD = GI.MAIN_COLOR_CD
 		<if test="custNo != null and custNo > 0"> <!-- 로그인 했으면 -->
 		    LEFT OUTER JOIN TB_WISHLIST W ON G.GOODS_CD = W.GOODS_CD
 		    AND    W.CUST_NO = #{custNo}
@@ -2136,6 +2157,16 @@
 		                       AND    BENEFIT_GB = #{newGoods}
 		                      )
 		        </if>
+		        <if test='benefitArr != null and benefitArr.length > 0'>
+		        AND    EXISTS (SELECT 1
+		                       FROM   TB_GOODS_BENEFIT
+		                       WHERE  GOODS_CD = G.GOODS_CD
+		                       AND    BENEFIT_GB IN
+		                       <foreach collection="benefitArr" item="item" index="index"  open="(" close=")" separator=",">
+		                       #{item}
+		                       </foreach>
+		                      )
+		        </if>
 		       ) G
 		WHERE  1 = 1
 		<if test="priceFrom != null and priceFrom != ''">
@@ -2263,6 +2294,16 @@
 		                           AND    BENEFIT_GB = #{newGoods}
 		                         )
 		            </if>
+		            <if test='benefitArr != null and benefitArr.length > 0'>
+		            AND    EXISTS (SELECT 1
+		                           FROM   TB_GOODS_BENEFIT
+		                           WHERE  GOODS_CD = G.GOODS_CD
+		                           AND    BENEFIT_GB IN
+		                           <foreach collection="benefitArr" item="item" index="index"  open="(" close=")" separator=",">
+		                           #{item}
+		                           </foreach>
+		                          )
+		            </if>
 		           ) G
 		    WHERE  1 = 1
 		    <if test="priceFrom != null and priceFrom != ''">

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

@@ -239,20 +239,20 @@
 		               SELECT SUM(RM_PNT_AMT)
 		               FROM   TB_CUST_POINT
 		               WHERE  CUST_NO = C.CUST_NO
-		               AND    EXP_BE_DT <![CDATA[<]]> NOW()
-		               AND    EXP_CMP_DT IS NOT NULL
+		               AND    (EXP_BE_DT <![CDATA[<]]> NOW() OR EXP_CMP_DT IS NOT NULL)
 		               ), 0)                           AS EXPIRE_PNT_AMT -- 소멸포인트
 		     , IFNULL((
 		               SELECT SUM(CPH.PNT_AMT) AS PNT_AMT
 		               FROM   TB_CUST_POINT_HST CPH
-		               WHERE  CPH.OCCUR_GB IN ('G069_12', 'G069_13')       -- 적립예정, 적립취소
+		               WHERE  CPH.CUST_NO = C.CUST_NO
 		               AND    CPH.PNT_UPLOAD_STAT IN ('G070_10')           -- 반영예정
-		               AND    CPH.CUST_NO = #{custNo}
+		               AND    CPH.OCCUR_GB IN ('G069_12', 'G069_13')       -- 적립예정, 적립취소
 		               ), 0)                           AS EXPECTED_PNT_AMT -- 적립예정포인트
 		     , IFNULL((
 		                SELECT SUM(RM_PNT_AMT) AS RM_PNT_AMT
 		                FROM  TB_CUST_POINT
-		                WHERE EXP_BE_DT > NOW()
+		                WHERE CUST_NO = C.CUST_NO
+		                AND   EXP_BE_DT > NOW()
 		                AND   EXP_BE_DT <![CDATA[<]]> DATE_ADD(NOW(),INTERVAL 31 DAY)
 		               ), 0)                          AS EXPECTED_EXPIRE_PNT_AMT -- 소멸예정포인트(30일)
 		FROM   TB_CUSTOMER C

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

@@ -715,36 +715,41 @@ $(document).ready( function() {
 	// 브랜드메인 배너 <br> 처리
 	$('.bMainTitle').each(function (){
 		let tag = '';
-		var brText = $(this).find("input[name=mainTitle]").val().replaceAll("<BR>", "<br>").replaceAll("<bR>", "<br>").replaceAll("<Br>", "<br>").replaceAll("<br/>", "<br>");
-		if(brText.indexOf('<br>') > -1){
-			var reText = brText.split("<br>");
-			tag += '</dd>';
-			tag += reText[0];
-			// tag += '<br>';
-			tag += '<dd>';
-			tag += reText[1];
-		}else{
-			tag += brText;
+		if(!gagajf.isNull($(this).find("input[name=mainTitle]").val())){
+			var brText = $(this).find("input[name=mainTitle]").val().replaceAll("<BR>", "<br>").replaceAll("<bR>", "<br>").replaceAll("<Br>", "<br>").replaceAll("<br/>", "<br>");
+			if(brText.indexOf('<br>') > -1){
+				var reText = brText.split("<br>");
+				tag += '</dd>';
+				tag += reText[0];
+				// tag += '<br>';
+				tag += '<dd>';
+				tag += reText[1];
+			}else{
+				tag += brText;
+			}
+			$(this).append(tag);
 		}
-		$(this).append(tag);
 	});
 
 	// 브랜드소개 <br> 처리
-	var brandDesc = $("#brandDesc").find("input[name=brandNote]").val().replaceAll("<BR>", "<br>").replaceAll("<bR>", "<br>").replaceAll("<Br>", "<br>");
-	if(!gagajf.isNull(brandDesc)){
-		if(brandDesc.indexOf('<br>') > -1){
-			let tag = '';
-			var reText = brandDesc.split("<br>");
-			tag += reText[0];
-			tag += '<br>';
-			tag += reText[1];
-			$("#brandDesc .desc").append(tag);
-		}else{
-			let tag = '';
-			tag += brandDesc;
-			$("#brandDesc .desc").append(tag);
+	if(!gagajf.isNull($("#brandDesc").find("input[name=brandNote]").val())){
+		var brandDesc = $("#brandDesc").find("input[name=brandNote]").val().replaceAll("<BR>", "<br>").replaceAll("<bR>", "<br>").replaceAll("<Br>", "<br>");
+		if(!gagajf.isNull(brandDesc)){
+			if(brandDesc.indexOf('<br>') > -1){
+				let tag = '';
+				var reText = brandDesc.split("<br>");
+				tag += reText[0];
+				tag += '<br>';
+				tag += reText[1];
+				$("#brandDesc .desc").append(tag);
+			}else{
+				let tag = '';
+				tag += brandDesc;
+				$("#brandDesc .desc").append(tag);
+			}
 		}
 	}
+
 });
 /*]]>*/
 </script>

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

@@ -39,7 +39,7 @@
 								<th:block th:each="item, stat : ${lookbookDetailList}">
 									<div class="swiper-slide">
 										<div class="bt_lb_item">
-											<img class="vLHTC lb_img" style="width:auto;height:660px;" th:src="${@environment.getProperty('domain.image')+item.sysFileNm+'?RS=460'}" alt="BLUE-a"/>
+											<img class="vLHTC lb_img" th:src="${@environment.getProperty('domain.image')+item.sysFileNm+'?RS=460'}" alt="BLUE-a"/>
 											<th:block th:if="${item.lookbookGoodsList != null and !item.lookbookGoodsList.empty}" th:each="goodsItem, goodsStatus : ${item.lookbookGoodsList}">
 												<div class="item_picker" th:style="${'left:'+goodsItem.xlim+'%; top:'+goodsItem.ylim+'%;'}">
 													<button type="button" th:onclick="fnLookbookGoodsPopup([[${goodsItem.sysImgNm}]],[[${goodsItem.brandGroupNm}]],[[${goodsItem.goodsFullNm}]],[[${goodsItem.listPrice}]],[[${goodsItem.currPrice}]],[[${goodsItem.dcRate}]],[[${goodsItem.goodsCd}]],[[${goodsItem.stockQty}]],[[${goodsItem.soldoutYn}]])"><span class="ico ico_picker"></span></button>

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

@@ -1296,7 +1296,7 @@ $(document).ready(function() {
 	// 몰메인 <br> 태그
 	$('.mainTitle').each(function (){
 		let tag = '';
-		var brText = $(this).find("input[name=mainTitlee]").val().replaceAll("<BR>", "<br>").replaceAll("<bR>", "<br>").replaceAll("<Br>", "<br>");
+		var brText = $(this).find("input[name=mainTitlee]").val().replace("<BR>", "<br>").replace("<bR>", "<br>").replace("<Br>", "<br>");
 		if(brText.indexOf('<br>') > -1){
 			var reText = brText.split("<br>");
 			tag += '</dd>';
@@ -1312,93 +1312,103 @@ $(document).ready(function() {
 	// 가로긴배너 슬라이드
 	$('.silderBannerArea').each(function (){
 		let tag = '';
-		var noteText = $(this).find("input[name=bannerNote]").val().replaceAll("<BR>", "<br>").replaceAll("<bR>", "<br>").replaceAll("<Br>", "<br>");
-		if(noteText.indexOf('<br>') > -1){
-			var reText = noteText.split("<br>");
-			tag += reText[0];
-			tag += '<br>';
-			tag += reText[1];
-		}else{
-			tag += noteText;
+		if(!gagajf.isNull($(this).find("input[name=bannerNote]").val())) {
+			var noteText = $(this).find("input[name=bannerNote]").val().replace("<BR>", "<br>").replace("<bR>", "<br>").replace("<Br>", "<br>");
+			if (noteText.indexOf('<br>') > -1) {
+				var reText = noteText.split("<br>");
+				tag += reText[0];
+				tag += '<br>';
+				tag += reText[1];
+			} else {
+				tag += noteText;
+			}
+			$(this).find('.noteArea').append(tag);
 		}
-		$(this).find('.noteArea').append(tag);
 	});
 
 	// 스타일리포트 <br> 태그
 	$('.styleArea').each(function (){
 		let tag = '';
 		let tag2 = '';
-		var titleText = $(this).find("input[name=styleTitle]").val().replaceAll("<BR>", "<br>").replaceAll("<bR>", "<br>").replaceAll("<Br>", "<br>");
-		var noteText = $(this).find("input[name=styleNote]").val().replaceAll("<BR>", "<br>").replaceAll("<bR>", "<br>").replaceAll("<Br>", "<br>");
-
-		if(titleText.indexOf('<br>') > -1){
-			var reText = titleText.split("<br>");
-			tag += reText[0];
-			tag += '<br>';
-			tag += reText[1];
-		}else{
-			tag += titleText;
+		if(!gagajf.isNull($(this).find("input[name=styleTitle]").val())) {
+			var titleText = $(this).find("input[name=styleTitle]").val().replace("<BR>", "<br>").replace("<bR>", "<br>").replace("<Br>", "<br>");
+			if(titleText.indexOf('<br>') > -1){
+				var reText = titleText.split("<br>");
+				tag += reText[0];
+				tag += '<br>';
+				tag += reText[1];
+			}else{
+				tag += titleText;
+			}
+			$(this).find('.styleTitleC').append(tag);
 		}
 
-		if(noteText.indexOf('<br>') > -1){
-			var reText = noteText.split("<br>");
-			tag2 += reText[0];
-			tag2 += '<br>';
-			tag2 += reText[1];
-		}else{
-			tag2 += noteText;
+		if(!gagajf.isNull($(this).find("input[name=styleNote]").val())) {
+			var noteText = $(this).find("input[name=styleNote]").val().replace("<BR>", "<br>").replace("<bR>", "<br>").replace("<Br>", "<br>");
+			if(noteText.indexOf('<br>') > -1){
+				var reText = noteText.split("<br>");
+				tag2 += reText[0];
+				tag2 += '<br>';
+				tag2 += reText[1];
+			}else{
+				tag2 += noteText;
+			}
+			$(this).find('.styleNoteC').append(tag2);
 		}
-
-		$(this).find('.styleTitleC').append(tag);
-		$(this).find('.styleNoteC').append(tag2);
 	});
 
 	// 잇아이템 <br> 태그
-	var id004Text = $("#id004").find("input[name=title]").val().replaceAll("<BR>", "<br>").replaceAll("<bR>", "<br>").replaceAll("<Br>", "<br>");
-	if(id004Text.indexOf('<br>') > -1){
-		let tag = '';
-		var reText = id004Text.split("<br>");
-		tag += reText[0];
-		tag += '<br>';
-		tag += reText[1];
-		$("#id004").append(tag);
-	}else{
-		let tag = '';
-		tag += id004Text;
-		$("#id004").append(tag);
-	}
-
-	// 핫딜 <br> 태그
-	var id006Text = $("#id006").find("input[name=title]").val().replaceAll("<BR>", "<br>").replaceAll("<bR>", "<br>").replaceAll("<Br>", "<br>");
-	if(!gagajf.isNull(id006Text)){
-		if(id006Text.indexOf('<br>') > -1){
+	if(!gagajf.isNull($("#id004").find("input[name=title]").val())){
+		var id004Text = $("#id004").find("input[name=title]").val().replace("<BR>", "<br>").replace("<bR>", "<br>").replace("<Br>", "<br>");
+		if(id004Text.indexOf('<br>') > -1){
 			let tag = '';
-			var reText = id006Text.split("<br>");
+			var reText = id004Text.split("<br>");
 			tag += reText[0];
 			tag += '<br>';
 			tag += reText[1];
-			$("#id006").append(tag);
+			$("#id004").append(tag);
 		}else{
 			let tag = '';
-			tag += id006Text;
-			$("#id006").append(tag);
+			tag += id004Text;
+			$("#id004").append(tag);
+		}
+	}
+
+	// 핫딜 <br> 태그
+	if(!gagajf.isNull($("#id006").find("input[name=title]").val())){
+		var id006Text = $("#id006").find("input[name=title]").val().replace("<BR>", "<br>").replace("<bR>", "<br>").replace("<Br>", "<br>");
+		if(!gagajf.isNull(id006Text)){
+			if(id006Text.indexOf('<br>') > -1){
+				let tag = '';
+				var reText = id006Text.split("<br>");
+				tag += reText[0];
+				tag += '<br>';
+				tag += reText[1];
+				$("#id006").append(tag);
+			}else{
+				let tag = '';
+				tag += id006Text;
+				$("#id006").append(tag);
+			}
 		}
 	}
 
 	// 브랜드픽 <br> 태그
 	$('#id007 .title').each(function (){
 		let tag = '';
-		var brText = $(this).find("input[name=title]").val().replaceAll("<BR>", "<br>").replaceAll("<bR>", "<br>").replaceAll("<Br>", "<br>");
-
-		if(brText.indexOf('<br>') > -1){
-			var reText = brText.split("<br>");
-			tag += reText[0];
-			tag += '<br>';
-			tag += reText[1];
-		}else{
-			tag += brText;
+		if(!gagajf.isNull($(this).find("input[name=title]").val())){
+			var brText = $(this).find("input[name=title]").val().replace("<BR>", "<br>").replace("<bR>", "<br>").replace("<Br>", "<br>");
+
+			if(brText.indexOf('<br>') > -1){
+				var reText = brText.split("<br>");
+				tag += reText[0];
+				tag += '<br>';
+				tag += reText[1];
+			}else{
+				tag += brText;
+			}
+			$(this).append(tag);
 		}
-		$(this).append(tag);
 	});
 });
 /*]]>*/