주문서 개발중

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

@@ -209,7 +209,6 @@ public class TsfOrderController extends TsfBaseController {
 		// 103. 할인정보
 		mav.addObject("tmtbGoodsApplyList"				, tmtbGoodsApplyList);					// 다다익선상품 적용목록
 		mav.addObject("goodsApplyCpnList"				, goodsApplyCpnList);					// 상품적용쿠폰
-		mav.addObject("goodsCpnList"					, goodsCpnList);						// 상품쿠폰목록
 		mav.addObject("cartCpnList"						, cartCpnList);							// 장바구니쿠폰목록
 		mav.addObject("delvCpnList"						, delvCpnList);							// 배송비쿠폰목록
 		mav.addObject("prePntDcAmt"						, prePntDcAmt);							// 선포인트정보
@@ -328,6 +327,10 @@ public class TsfOrderController extends TsfBaseController {
 	public ModelAndView freegiftInfoPop(Order order) {
 		
 		ModelAndView mav = new ModelAndView();
+		
+		
+		
+		
 		mav.setViewName(super.getDeviceViewName("order/OrderFreegiftInfoPop"));
 		
 		return mav;

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

@@ -358,42 +358,44 @@
 																<div class="coupon_list">
 																	<ul>
 																		<!--  상품쿠폰 -->
-																		<th:block th:if="${goodsApplyCpnList.size() > 0}">
-																			<th:block th:each="goods, i : ${goodsApplyCpnList}">
-																				<li>
-																					<div class="coupon">
-																						<div class="item_gd">
-																							<figure>
-																								<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>
-																									</div>
-																								</figcaption>
-																							</figure>
-																						</div>
-																						<div class="form_field">
-																							<select id="" class="select_hidden">
-																								<option value="">선택안함</option>
-																								<th:block th:eath="goodsCpn, k : ${goodsCpnList}">
-																									<option th:value="${goodsCpn.cpnId}" th:text="${goodsCpn.cpnId}+'|'+${goodsCpn.cpnNm}"></option>
-																								</th:block>
-																							</select>
-																						</div>
-																						<div class="cp_discount">
-																							<span class="cp_amount">-10,000원 할인적용</span>
-																							<button type="button" class="btn_del_coupon" id="">
-																								<span>쿠폰적용해제</span>
-																							</button>
-																						</div>
+																		<th:block th:each="goods, i : ${goodsApplyCpnList}">
+																			<th:block th:if="${goods.goodsCpnList.size() > 0}">
+																			<li>
+																				<div class="coupon">
+																					<div class="item_gd">
+																						<figure>
+																							<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>
+																								</div>
+																							</figcaption>
+																						</figure>
+																					</div>
+																					
+																					<div class="form_field">
+																						<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>
+																							</th:block>
+																						</select>
 																					</div>
-																				</li>
+
+																					<div class="cp_discount">
+																						<span class="cp_amount">-10,000원 할인적용</span>
+																						<button type="button" class="btn_del_coupon" id="">
+																							<span>쿠폰적용해제</span>
+																						</button>
+																					</div>
+																				</div>
+																			</li>
 																			</th:block>
 																		</th:block>
 																		<!--  상품쿠폰 -->
-																		
+
 																		<!--  장바구니쿠폰 -->
 																		<th:block th:if="${cartCpnList.size() > 0}">
 																			<li>
@@ -792,7 +794,7 @@
 														<figure>
 															<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="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}">
 																	<span th:text="${goods.optCdArr[index.index]}"></span> 
@@ -821,7 +823,7 @@
 															<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="brand" th:text="${goods.brandEnm} + ' ' + ${goods.brandKnm}"></div>
 																<div class="name" th:text="${goods.goodsNm}"></div>
 																<div class="option">
 																	<span th:text="${goods.optCd}"></span> 
@@ -849,7 +851,7 @@
 														<figure>
 															<span class="thumb"><img src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
 															<figcaption>
-																<div class="brand" th:text="${goods.brandEnm}"></div>
+																<div class="brand" th:text="${goods.brandEnm} + ' ' + ${goods.brandKnm}"></div>
 																<div class="name" th:text="${goods.goodsNm}"></div>
 																<div class="option">
 																	<span th:text="${goods.optCd}"></span>