112233

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

@@ -174,7 +174,7 @@ public class TsfOrderController extends TsfBaseController {
 		Collection<Order> goodsCpnList 	= (Collection<Order>) goodsCartCpnMap.get("goodsCpnList");
 		Collection<Order> cartCpnList 	= (Collection<Order>) goodsCartCpnMap.get("cartCpnList");
 		
-		// 3.2.1 상품쿠폰, 장바구니쿠폰 적용된 상품 목록
+		// 3.2.1 상품기준 ---> 상품쿠폰 적용된 상품 목록
 		Collection<Order> goodsApplyCpnList = coreOrderService.getGoodsCpnApplyList(tmtbGoodsApplyList, goodsCpnList);
 		
 		// 3.3 배송비쿠폰목록 조회

src/main/webapp/WEB-INF/views/web/order/OrderFormWeb.html

@@ -364,13 +364,17 @@
 																				<div class="coupon">
 																					<div class="item_gd">
 																						<figure>
-																							<span th:text="${goods.goodsCd}"></span>
 																							<span class="thumb"><img src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
 																							<figcaption>
 																								<div class="brand" th:text="${goods.brandEnm}+' '+${goods.brandKnm}"></div>
 																								<div class="name" th:text="${goods.goodsNm}"></div>
 																								<div class="price">
-																									<span class="selling_price"  th:text="${#numbers.formatInteger(goods.currPrice, 1, 'COMMA')}"></span>
+																									<th:block th:if="${goods.tmtbDcAmt} > 0">
+																										<span class="selling_price"  th:text="${#numbers.formatInteger(goods.tmtbDcAmt, 1, 'COMMA')}"></span>
+																									</th:block>
+																									<th:block th:if="${goods.tmtbDcAmt} < 1">
+																										<span class="selling_price"  th:text="${#numbers.formatInteger(goods.currPrice, 1, 'COMMA')}"></span>
+																									</th:block>
 																								</div>
 																							</figcaption>
 																						</figure>
@@ -380,7 +384,7 @@
 																						<select id="" class="select_hidden">
 																							<option value="">선택안함</option>
 																							<th:block th:each="goodsCpn, k : ${goods.goodsCpnList}">
-																								<option th:value="${goodsCpn.cpnId}" th:text="${goodsCpn.cpnId}+'|'+${goodsCpn.cpnNm}"></option>
+																								<option th:value="${goodsCpn.cpnId}" th:text="${goodsCpn.cpnId}+'|'+${goodsCpn.cpnNm}+'|'+${goodsCpn.cpnDcAmt}"></option>
 																							</th:block>
 																						</select>
 																					</div>
@@ -795,7 +799,6 @@
 														<figure>
 															<span class="thumb"><img src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
 															<figcaption>
-																<span th:text="${goods.goodsCd}"></span>
 																<div class="brand" th:text="${goods.brandEnm} + ' ' + ${goods.brandKnm}"></div>
 																<div class="name" th:text="${goods.goodsNm}"></div>
 																<div class="option" th:each="opt, index : ${goods.itemNmArr}">
@@ -824,7 +827,6 @@
 														<figure>
 															<span class="thumb"><img src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
 															<figcaption>
-																<span th:text="${goods.goodsCd}"></span>
 																<div class="brand" th:text="${goods.brandEnm} + ' ' + ${goods.brandKnm}"></div>
 																<div class="name" th:text="${goods.goodsNm}"></div>
 																<div class="option">
@@ -853,7 +855,6 @@
 														<figure>
 															<span class="thumb"><img src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
 															<figcaption>
-																<span th:text="${goods.goodsCd}"></span>
 																<div class="brand" th:text="${goods.brandEnm} + ' ' + ${goods.brandKnm}"></div>
 																<div class="name" th:text="${goods.goodsNm}"></div>
 																<div class="option">
@@ -952,7 +953,7 @@
 <!-- 사은품지급안내 팝업 -->
 <div class="modal fade od_pop infoGift_pop" id="infoGiftPop" tabindex="-1" role="dialog" aria-labelledby="infoGiftLabel" aria-hidden="true"></div>
 
-<script type="text/javascript">
+<script th:inline="javascript">
 
 $(document).ready( function() {
 	
@@ -1199,7 +1200,7 @@ $(document).ready( function() {
 	}
 </script>
 
-<script type="text/javascript">
+<script th:inline="javascript">
 	// 컨텐츠 호출
 	$(document).ready( function() {
 		// 1. 총알배송가능 지역, 총알배송 가능 시간 체크