Merge branch 'eskim' into develop

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

@@ -98,9 +98,7 @@
 		     , G.ITEMKIND_CD
 		     , G.FORMAL_GB
 		     , G.LIST_PRICE
-		     -- , BP.CURR_PRICE
-		     , FN_GET_BENEFIT_PRICE(#{frontGb},G.GOODS_CD, G.CURR_PRICE,#{custGb}) AS CURR_PRICE
-		     -- , 100 - ROUND((BP.CURR_PRICE / G.LIST_PRICE) * 100 ,0) AS DC_RATE
+		     , FN_GET_APPLY_CPN1_PRICE(G.GOODS_CD, #{frontGb})  AS CURR_PRICE
 		     , G.SELF_GOODS_YN
 		     , G.GOODS_STAT
 		     , (CASE WHEN #{frontGb} = 'P' THEN G.PNT_PRATE ELSE G.PNT_MRATE END) AS PNT_RATE

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

@@ -665,7 +665,7 @@
 																		<p class="itemBrand" th:text="${lookbookGoods.brandGroupNm}">CURLYSUE 컬리수</p>
 																		<div class="itemName" th:text="${lookbookGoods.goodsFullNm}">[★2020 겨울신상★] 리버시블 경량점퍼 CPW0XQJM51 [겨울]</div>
 																		<p class="itemPrice">
-																			<th:block th:text="${#numbers.formatInteger(lookbookGoods.currPrice, 0,'COMMA')}"></th:block>
+																			<span id="itemCurrprice" th:text="${#numbers.formatInteger(lookbookGoods.currPrice, 0,'COMMA')}">1,000,000</span>
 																			<span class="itemPrice_original" th:if="${lookbookGoods.listPrice > lookbookGoods.currPrice}"  th:text="${#numbers.formatInteger(lookbookGoods.listPrice, 0,'COMMA')}">1,000,000</span>
 																			<span class="itemPercent" th:if="${lookbookGoods.dcRate > 0}" th:text="|${#numbers.formatDecimal(lookbookGoods.dcRate,0,0)}%|">30%</span>
 																		</p>
@@ -1292,7 +1292,7 @@
 				goodsImg = $(this).find('.itemPic').children('.pd_img').attr('src');
 				brandName = $(this).find('.itemBrand').text();
 				goodsName = $(this).find('.itemName').text();
-				currPrice = $(this).find('.itemBrand').text();
+				currPrice = $(this).find('#itemCurrprice').text();
 				listPrice = $(this).find('.itemPrice_original').text();
 				dcRate = $(this).find('.itemPercent').text();
 			}