11111

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

@@ -99,12 +99,7 @@ public class TsfOrderController extends TsfBaseController {
 		
 		// 3. 할인구간정보조회
 		// 3.1 장바구니상품 즉시할인, 다다익선 할인 금액 적용 정보 조회 (주문상세목록)
-<<<<<<< HEAD
-		Collection<Order> tmtbGoodsApplyList = cartService.getMoreBetterAmtList(order);		
-=======
-		order.setCartSqs(order.getCartSqArr());
 		Collection<Order> tmtbGoodsApplyList = cartService.getMoreBetterAmtList(order);
->>>>>>> refs/remotes/origin/xodud1202
 		
 		// 3.2 장바구니상품 상품쿠폰, 장바구니쿠폰 정보 조회
 		Collection<Order> goodsCartCpnApplyGoodsList = coreOrderService.getGoodsCartCpnApplyGoodsList(order);

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

@@ -601,16 +601,22 @@
 									<h4 class="subH3 mb20" id="shotDelvTitle">STYLE24 총알배송<span>오늘 자정까지 도착</span></h4>
 									<h4 class="subH3 mb20" id="wmsDelvTitle">STYLE24 일반배송</h4>
 									<div class="gd_list">
+
 										<th:block th:each="goods, status : ${wmsCartList}">
+											
 											<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}"></div>
 														<div class="name" th:text="${goods.goodsNm}"></div>
-														<div class="option">
-															<span th:text="${goods.optCd}"></span>
-															<span>수량:<em th:text="${goods.goodsQty}"></em>개</span>
+														<div class="option" th:each="opt, index : ${cart.itemNmArr}">
+														
+                    										<span class="option">옵션:<em th:text="${cart.itemNmArr[index.index]} + '_' + ${cart.optCdArr[index.index]}"></em></span>
+                    										
+                    										
+															<span th:text="${cart.itemNmArr[index.index]}"></span>
+															<span>수량:<em th:text="${cart.goodsQty}"></em>개</span>
 														</div>
 														<div class="price">
 															<span class="selling_price" th:text="${goods.currPrice}"></span>
@@ -619,7 +625,12 @@
 												</figure>
 											</div>
 										</th:block>
+										
+										
+										
 									</div>
+									
+									
 								</div>
 								<!-- //총알배송, 일반배송 -->