몰메인 전시 딜상품 가격표시 수정

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

@@ -1717,6 +1717,7 @@
 	         , G.GOODS_CD           /*상품코드*/
 	         , G.GOODS_NM           /*상품명*/
 	         , G.GOODS_FULL_NM
+		     , G.GOODS_TYPE
 	         , G.GOODS_GB           /*상품구분*/
 	         , G.SELF_GOODS_YN      /*자사상품여부*/
 	         , G.FOREIGN_BUY_YN     /*해외구매대행여부*/
@@ -1765,6 +1766,7 @@
 	                 , TT.SYS_IMG_NM
 			         , TT.SYS_IMG_NM2
 			         , TT.VIDEOS
+	                 , G.GOODS_TYPE
 	            <choose>
 	                <when test="contentsLoc == 'SMM009' or contentsLoc == 'SMM007' or contentsLoc == 'SMM012'">
 	                 , CT.DISP_ORD
@@ -1785,7 +1787,7 @@
 	                    FROM	TB_CONTENTS CT
 	                    , TB_CONTENTS_GOODS CTG
 	                    , TB_CONTENTS_GOODS_MAIN TT
-	                    
+	                    , TB_GOODS G
 	                    <if test="contentsLoc == 'SCM003' and pageGb != null and pageGb == 'BEST'">
 	                    , TB_GOODS_SUMMARY GS
 	                    </if>
@@ -1799,6 +1801,7 @@
 	                    AND    CTG.GOODS_CD = GS.GOODS_CD
 	                    </if>
 	                    AND		CTG.GOODS_CD = TT.GOODS_CD
+	                    AND     CTG.GOODS_CD = G.GOODS_CD
 	                    AND		CT.CONTENTS_LOC = #{contentsLoc}
 	                    <if test="contentsLoc == 'SMM009' or contentsLoc == 'SMM012'">
 	                    AND 	CTG.CONTENTS_SQ = #{dispOrd}
@@ -1835,12 +1838,15 @@
 	                                                              )
 	                    </if>
 	                    AND		NOW() BETWEEN CT.DISP_STDT AND CT.DISP_EDDT
+	                    <if test="contentsLoc == 'SMM007'">
+	                    ORDER BY CTG.DISP_ORD
+	                    </if>
 	                </when>
 	                <otherwise>
 	                    FROM   TB_CATE_4SRCH C4
 	                    , TB_CATE_GOODS CG
 	                    , TB_CONTENTS_GOODS_MAIN TT
-	                    
+	                    , TB_GOODS G
 	                    <if test="contentsLoc == 'SCM003'"> <!-- 베스트 -->
 	                    , TB_GOODS_SUMMARY GS
 	                    </if>
@@ -1854,7 +1860,7 @@
 	                        </otherwise>
 	                    </choose>
 	                    AND    CG.GOODS_CD = TT.GOODS_CD
-	                    
+						AND    CG.GOODS_CD = G.GOODS_CD
 	                    <if test="contentsLoc == 'SCM003'"> <!-- 베스트 -->
 	                    AND    CG.GOODS_CD = GS.GOODS_CD
                         </if>

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

@@ -125,10 +125,13 @@
 														<div class="itemComment" th:if="${not #strings.isEmpty(goodsData.goodsTnm)}" th:text="${goodsData.goodsTnm}">#주문 폭주 상품</div>
 														<div class=" itemName" th:text="${goodsData.goodsFullNm}">가을 신상 남성 스탠다드핏 로고맨 블루 볼 캡 유니 경량다운 시보리넥 베스트</div>
 <!--														<p class="itemPrice" th:text="${#numbers.formatInteger(goodsData.currPrice,1,'COMMA')}">488,000</p>-->
-														<p class="itemPrice">
+														<p th:unless="${goodsData.goodsType=='G056_D'}" class="itemPrice">
 															<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,3,'COMMA')}">89,000</span>[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')}]]
 															<span class=" itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${(goodsData.listPrice == 0 ? 0 : #numbers.formatDecimal((goodsData.listPrice - goodsData.currPrice) / (goodsData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 														</p>
+														<p th:if="${goodsData.goodsType=='G056_D'}" class="itemPrice">
+															[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')}]] ~
+														</p>
 													</a>
 												</div>
 											</div>
@@ -185,10 +188,13 @@
 																	<p class="itemBrand" th:text="${bestItemData.brandGroupNm}">TBJ</p>
 																	<div class="itemComment" th:if="${not #strings.isEmpty(bestItemData.goodsTnm)}" th:text="${bestItemData.goodsTnm}"># 가을 느낌 물씬!</div>
 																	<div class="itemName" th:text="${bestItemData.goodsFullNm}">11111 남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
-																	<p class="itemPrice">
+																	<p th:unless="${bestItemData.goodsType=='G056_D'}" class="itemPrice">
 																		<span class="itemPrice_original" th:if="${bestItemData.currPrice != bestItemData.listPrice}" th:text="${#numbers.formatInteger(bestItemData.listPrice,3,'COMMA')}">89,000</span>[[${#numbers.formatInteger(bestItemData.currPrice,0,'COMMA')}]]
 																		<span class=" itemPercent" th:if="${bestItemData.currPrice != bestItemData.listPrice}" th:text="${(bestItemData.listPrice == 0 ? 0 : #numbers.formatDecimal((bestItemData.listPrice - bestItemData.currPrice) / (bestItemData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 																	</p>
+																	<p th:if="${bestItemData.goodsType=='G056_D'}" class="itemPrice">
+																		[[${#numbers.formatInteger(bestItemData.currPrice,0,'COMMA')}]] ~
+																	</p>
 																</a>
 															</div>
 														</div>
@@ -351,7 +357,8 @@
 																	<img alt="" class=" pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + goodsData.sysImgNm}" onerror="noneImg(this)">
 																</div>
 																<div class="itemName" th:text="${goodsData.goodsFullNm}">11111 남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
-																<p class="itemPrice" th:text="${#numbers.formatInteger(goodsData.currPrice,1,'COMMA')}">35,900</p>
+																<p th:unless="${goodsData.goodsType=='G056_D'}" class="itemPrice" th:text="${#numbers.formatInteger(goodsData.currPrice,1,'COMMA')}">35,900</p>
+																<p th:if="${goodsData.goodsType=='G056_D'}" class="itemPrice" th:text="${#numbers.formatInteger(goodsData.currPrice,1,'COMMA') + ' ~'}"></p>
 															</a>
 														</div>
 													</div>
@@ -444,10 +451,13 @@
 																		<p class="itemBrand" th:text="${goodsData.brandGroupNm}">TBJ</p>
 																		<div class="itemComment" th:if="${not #strings.isEmpty(goodsData.goodsTnm)}" th:text="${goodsData.goodsTnm}"># 가을 느낌 물씬!</div>
 																		<div class="itemName" th:text="${goodsData.goodsFullNm}">11111 남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
-																		<p class="itemPrice">
+																		<p th:unless="${goodsData.goodsType=='G056_D'}" class="itemPrice">
 																			<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')}]]
 																			<span class=" itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${(goodsData.listPrice == 0 ? 0 : #numbers.formatDecimal((goodsData.listPrice - goodsData.currPrice) / (goodsData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 																		</p>
+																		<p th:if="${goodsData.goodsType=='G056_D'}" class="itemPrice">
+																			[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')}]] ~
+																		</p>
 																	</a>
 																</div>
 															</div>

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

@@ -131,10 +131,11 @@
 														<p class="itemBrand" th:text="${goodsData.brandGroupNm}">BRAND NAME</p>
 														<div class="itemComment" th:unless="${goodsData.goodsTnm == null or goodsData.goodsTnm == ''}" th:text="${goodsData.goodsTnm}">#가을느낌 물씬!</div>
 														<div class="itemName" th:text="${goodsData.goodsFullNm}">스타 착용 여성 퍼 아플리케 오버핏 투마일 웨어링 점퍼</div>
-														<p class="itemPrice">[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')}]]
+														<p th:unless="${goodsData.goodsType=='G056_D'}" class="itemPrice">[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')}]]
 															<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,3,'COMMA')}">89,000</span>
 															<span class=" itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${(goodsData.listPrice == 0 ? 0 : #numbers.formatDecimal((goodsData.listPrice - goodsData.currPrice) / (goodsData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 														</p>
+														<p th:if="${goodsData.goodsType=='G056_D'}" class="itemPrice">[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')}]] ~</p>
 													</a>
 												</div>
 											</div>
@@ -188,10 +189,11 @@
 															<p class=" itemBrand" th:text="${bestItemData.brandGroupNm}">BRAND NAME</p>
 															<div class="itemComment" th:unless="${bestItemData.goodsTnm == null or bestItemData.goodsTnm == ''}" th:text="${bestItemData.goodsTnm}">#데일리웨어로 매일입고싶은</div>
 															<div class="itemName" th:text="${bestItemData.goodsFullNm}">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
-															<p class="itemPrice">[[${#numbers.formatInteger(bestItemData.currPrice,0,'COMMA')}]]
+															<p th:unless="${bestItemData.goodsType=='G056_D'}" class="itemPrice">[[${#numbers.formatInteger(bestItemData.currPrice,0,'COMMA')}]]
 																<span class="itemPrice_original" th:if="${bestItemData.currPrice != bestItemData.listPrice}" th:text="${#numbers.formatInteger(bestItemData.listPrice,3,'COMMA')}">89,000</span>
 																<span class=" itemPercent" th:if="${bestItemData.currPrice != bestItemData.listPrice}" th:text="${(bestItemData.listPrice == 0 ? 0 : #numbers.formatDecimal((bestItemData.listPrice - bestItemData.currPrice) / (bestItemData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 															</p>
+															<p th:if="${bestItemData.goodsType=='G056_D'}" class="itemPrice">[[${#numbers.formatInteger(bestItemData.currPrice,0,'COMMA')}]] ~</p>
 														</a>
 													</div>
 												</div>
@@ -373,10 +375,11 @@
 																</div>
 																<div class="itemComment" th:unless="${goodsData.goodsTnm == null or goodsData.goodsTnm == ''}" th:text="${goodsData.goodsTnm}">#데일리웨어로 매일입고싶은</div>
 																<div class="itemName" th:text="${goodsData.goodsFullNm}">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
-																<p class="itemPrice" th:text="${#numbers.formatInteger(goodsData.currPrice,1,'COMMA')}">80,100
+																<p th:unless="${goodsData.goodsType=='G056_D'}" class="itemPrice" th:text="${#numbers.formatInteger(goodsData.currPrice,1,'COMMA')}">80,100
 																	<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
 																	<span class=" itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${(goodsData.listPrice == 0 ? 0 : #numbers.formatDecimal((goodsData.listPrice - goodsData.currPrice) / (goodsData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 																</p>
+																<p th:if="${goodsData.goodsType=='G056_D'}" class="itemPrice">[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')}]] ~</p>
 															</a>
 														</div>
 													</div>
@@ -467,10 +470,11 @@
 																		<p class="itemBrand" th:text="${goodsData.brandGroupNm}">BRAND NAME</p>
 																		<div class="itemComment" th:unless="${goodsData.goodsTnm == null or goodsData.goodsTnm == ''}" th:text="${goodsData.goodsTnm}">#주문 폭주 상품</div>
 																		<div class="itemName" th:text="${goodsData.goodsFullNm}">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
-																		<p class="itemPrice">[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')}]]
+																		<p th:unless="${goodsData.goodsType=='G056_D'}" class="itemPrice">[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')}]]
 																			<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
 																			<span class=" itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${(goodsData.listPrice == 0 ? 0 : #numbers.formatDecimal((goodsData.listPrice - goodsData.currPrice) / (goodsData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 																		</p>
+																		<p th:if="${goodsData.goodsType=='G056_D'}" class="itemPrice">[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')}]] ~</p>
 																	</a>
 																</div>
 															</div>