Merge branch 'develop' into card007

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

@@ -805,6 +805,8 @@ public class TsfDisplayService {
 				Goods tempBest = new Goods();
 				tempBest.setBrandGroupNm(tempData.getProduct().getBrandName());
 				tempBest.setGoodsCd(tempData.getProduct().getItemId());
+				tempBest.setMainColorCd("");
+				tempBest.setGoodsNm(tempData.getProduct().getItemName());
 				tempBest.setGoodsFullNm(tempData.getProduct().getItemName());
 				tempBest.setListPrice((int) tempData.getProduct().getOriginalPrice());
 				tempBest.setCurrPrice((int) tempData.getProduct().getSalePrice());

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

@@ -175,7 +175,10 @@ public class TsfGoodsController extends TsfBaseController {
 		if (StringUtils.isEmpty(paramsGoods.getColorCd())) {
 			paramsGoods.setColorCd(goods.getMainColorCd());
 			paramsGoods.setOptCd1(goods.getMainColorCd());
-		} else {
+		}else if ("null".equals(paramsGoods.getColorCd())) {
+			paramsGoods.setColorCd(goods.getMainColorCd());
+			paramsGoods.setOptCd1(goods.getMainColorCd());
+		}else {
 			paramsGoods.setOptCd1(paramsGoods.getColorCd());
 		}
 

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

@@ -659,7 +659,7 @@
 		      INNER JOIN TB_COMMON_CODE D ON C.PRMT_TARGET_CD  = D.CD 
 		                                  AND D.CD_GB = 'G941'
 		                                  AND D.USE_YN ='Y'
-		      WHERE NOW() BETWEEN A.PRMT_STD AND A.PRMT_EDD
+		      WHERE NOW() BETWEEN A.PRMT_STD AND ADDDATE(A.PRMT_EDD, INTERVAL 1 DAY)
 		      AND A.DISP_YN  = 'Y'
 		      <if test="prmtGb != null and prmtGb != '' ">
 		      AND A.PRMT_GB = #{prmtGb} -- A:프로모션, B:무이자

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

@@ -310,7 +310,7 @@
 				$.each(result.dataList, function (idx, item){
 					tag += '<div class="item_prod">\n';
 					tag += '	<div class="item_state">\n';
-					tag += '		<button type="button" class="itemLike" goodsCd=\''+item.goodsCd+'\' onclick="wishlistDelete(this)">관심상품 추가</button>\n';
+					tag += '		<button type="button" class="itemLike"  onclick="wishlistDelete(this)" goodsCd="'+item.goodsCd+'" goodsNm="'+ item.goodsNm+'" ithrCd="" contentsLoc="IN10_01" planDtlSq="">관심상품 추가</button>\n';
 					tag += '		<a href="javascript:void(0);" class="itemLink" onclick="cfnGoToGoodsDetail(\''+item.goodsCd+'\', \''+item.colorCd+'\')">\n';
 					tag += '<div class="shape ';
 					if(idx==0){

src/main/webapp/WEB-INF/views/mob/goods/CardPrmtFormMob.html

@@ -79,7 +79,8 @@
 				</div>
 				</th:block>
 				<th:block th:each="cardInfo, status : ${cardInfoList}" >
-				<div class="benefit_blk"  th:if="${cardInfo.prmtGb == 'B' and not #strings.isEmpty(cardInfo.note) and cardInfo.rownum ==  1}">
+<!--				<div class="benefit_blk"  th:if="${cardInfo.prmtGb == 'B' and not #strings.isEmpty(cardInfo.note) and cardInfo.rownum ==  1}">-->
+				<div class="benefit_blk"  th:if="${cardInfo.prmtGb == 'B' and cardInfo.note != '<p><br></p>' and cardInfo.rownum ==  1}">
 					<h6>부분 무이자 할부</h6>
 					<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(cardInfo.note))}"></th:block>
 				</div>

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

@@ -54,7 +54,7 @@ var ajaxWishList = function () {
 						if (item.regDtMonth == month[i].regDt) {
 							html += '		<div class="item_prod">\n';
 							html += '			<div class="item_state">\n';
-							html += '				<button type="button" class="itemLike likeit" goodsCd=\''+item.goodsCd+'\' onclick="wishlistDelete(this)">관심상품 추가</button>\n';
+							html += '				<button type="button" class="itemLike likeit" goodsCd=\''+item.goodsCd+'\' goodsNm="'+ item.goodsNm+'" ithrCd="" contentsLoc="IN17_01" planDtlSq="" onclick="wishlistDelete(this)">관심상품 추가</button>\n';
 							html += '				<a href="javascript:void(0);" class="itemLink" onclick="cfnGoToGoodsDetail(\''+item.goodsCd+'\',\'\',\'IN17_01\')">\n';
 							html += '					<div class="itemPic">\n';
 							html += '						<img class="vLHTC pd_img"  src="' + _uploadGoodsUrl + '/' + item.sysImgNm + '">\n';

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

@@ -192,8 +192,8 @@
 					html += '<div class="swiper-slide">\n';
 					html += '	<div class="item_prod">\n';
 					html += '		<div class="item_state">\n';
-					html += '		<button type="button" class="itemLike" onclick="wishlistDelete(this)">관심상품 추가</button>\n';
-					html += '		<a href="javascript:void(0);" class="itemLink" onclick="cfnGoToGoodsDetail(\''+item.itemId+'\')">\n';
+					html += '		<button type="button" class="itemLike" onclick="cfnPutWishList(this)" goodsCd="'+item.itemId+'" goodsNm="'+ item.itemName+'" ithrCd="" contentsLoc="IN10_01" planDtlSq="">관심상품 추가</button>\n';
+					html += '		<a href="javascript:void(0);" class="itemLink" onclick="cfnGoToGoodsDetail(\''+item.itemId+'\',\'\',\'IN10_01\')">\n';
 					html += '				<div class="itemPic">\n';
 					html += '					<img alt="" class="vLHTC pd_img" src="' + item.imageUrl + '">\n';
 					html += '				</div>\n';
@@ -239,8 +239,8 @@
 			$.each(result.dataList, function (idx, item){
 				tag += '<div class="item_prod">\n';
 				tag += '	<div class="item_state">\n';
-				tag += '		<button type="button" class="itemLike" goodsCd=\''+item.goodsCd+'\' onclick="wishlistDelete(this)">관심상품 추가</button>\n';
-				tag += '		<a href="javascript:void(0);" class="itemLink" onclick="cfnGoToGoodsDetail(\''+item.goodsCd+'\', \''+item.colorCd+'\')">\n';
+				tag += '		<button type="button" class="itemLike" onclick="wishlistDelete(this)" goodsCd="'+item.goodsCd+'" goodsNm="'+ item.goodsNm+'" ithrCd="" contentsLoc="IN10_01" planDtlSq="">관심상품 추가</button>\n';
+				tag += '		<a href="javascript:void(0);" class="itemLink" onclick="cfnGoToGoodsDetail(\''+item.goodsCd+'\', \''+item.mainColorCd+'\',\'IN10_01\')">\n';
 				tag += '<div class="shape ';
 				if(idx==0){
 					tag += ' ranker';

src/main/webapp/WEB-INF/views/web/goods/CardPrmtFormWeb.html

@@ -83,7 +83,8 @@
 				</div>
 				</th:block>
 				<th:block th:each="cardInfo, status : ${cardInfoList}" >
-				<div class="benefit_blk"  th:if="${cardInfo.prmtGb == 'B' and not #strings.isEmpty(cardInfo.note) and cardInfo.rownum ==  1}">
+<!--				<div class="benefit_blk"  th:if="${cardInfo.prmtGb == 'B' and not #strings.isEmpty(cardInfo.note) and cardInfo.rownum ==  1}">-->
+				<div class="benefit_blk"  th:if="${cardInfo.prmtGb == 'B' and cardInfo.note != '<p><br></p>' and cardInfo.rownum ==  1}">
 					<h6>부분 무이자 할부</h6>
 					<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(cardInfo.note))}"></th:block>
 				</div>

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

@@ -75,7 +75,7 @@ var ajaxWishList = function () {
 						if (item.regDtMonth == month[i].regDt) {
 							html+='		<div class="item_prod">\n';
 							html+='			<div class="item_state">\n';
-							html+='				<button type="button" class="itemLike likeit" goodsCd=\''+item.goodsCd+'\' onclick="wishlistDelete(this)">관심상품 추가</button>\n';
+							html+='				<button type="button" class="itemLike likeit" goodsCd=\''+item.goodsCd+'\'  goodsNm="'+ item.goodsNm+'" ithrCd="" contentsLoc="IN17_01" planDtlSq="" onclick="wishlistDelete(this)">관심상품 추가</button>\n';
 							html+='				<a href="javascript:void(0);" class="itemLink" onclick="cfnGoToGoodsDetail(\''+item.goodsCd+'\',\'\',\'IN17_01\')">\n';
 							html+='					<div class="itemPic">\n';
 							html+='						<img alt="" class=" vLHTC pd_img" src="' + _uploadGoodsUrl + '/' + item.sysImgNm + '?RS=550">\n';