이태영 - 20210323 장바구니 임시커밋

src/main/java/com/style24/front/biz/service/TsfCartService.java

@@ -342,7 +342,7 @@ public class TsfCartService {
 		}
 
 		// 자사 / 입점업체 리스트 분리
-		order = getCartDelvGoodsCntList(cartGoodsList);
+		order = getCartDelvGoodsCntList(cartGoodsList, order);
 
 		// 장바구니 업체별 배송비 계산
 		setCartListDelvFeeInfo(cartGoodsList, order);
@@ -550,7 +550,7 @@ public class TsfCartService {
 	 * @author xodud1202
 	 * @since 2021. 02. 02
 	 */
-	public Order getCartDelvGoodsCntList(Collection<Order> cartGoodsList) {
+	public Order getCartDelvGoodsCntList(Collection<Order> cartGoodsList, Order paramOrder) {
 
 		// 1. 장바구니 상품 배송단위별 건수 체크 로직 (자사:총알배송, 자사:일반배송, 입점업체, 예약배송)
 		Order delvOrder = new Order();
@@ -579,7 +579,11 @@ public class TsfCartService {
 
 			// 1.3 배송정책별 상품 구분
 			if ("SHOT".equals(order.getCartDelvFeeCd())) {
-				shotCartList.add(order);
+				if(paramOrder.getShotDelvUseYn() != null && "N".equals(paramOrder.getShotDelvUseYn())) {
+					wmsCartList.add(order);
+				} else {
+					shotCartList.add(order);
+				}
 			} else if ("WMS".equals(order.getCartDelvFeeCd())) {
 				wmsCartList.add(order);
 			} else {
@@ -792,19 +796,19 @@ public class TsfCartService {
 			cart.getCartCompsList().add(new Cart());
 
 			for(Cart comp : cart.getCartCompsList()) {
-				if("Y".equals(cart.getSelfGoodsYn())) {
+				//if("Y".equals(cart.getSelfGoodsYn())) {
 					comp.setCartColorList(cartDao.selectCartGoodsColorList(cart));
 
-					if("Y".equals(cart.getSelfGoodsYn())) {		// 자사 상품은 TB_GOODS_IMG.COLOR_CD = TB_OPTION.OPT_CD1
+				//	if("Y".equals(cart.getSelfGoodsYn())) {		// 자사 상품은 TB_GOODS_IMG.COLOR_CD = TB_OPTION.OPT_CD1
 						for(Cart color : comp.getCartColorList()) {
 							color.setCartSq(cart.getCartSq());
 							color.setCartImgList(cartDao.selectCartSelfGoodsOptionImgList(color));
 							color.setCartSizeList(cartDao.selectCartGoodsSizeList(color));
 						}
-					}
-				} else {
-					comp.setCartColorList(cartDao.selectCartGoodsSizeList(cart));
-				}
+				//	}
+				//} else {
+				//	comp.setCartColorList(cartDao.selectCartGoodsSizeList(cart));
+				//}
 			}
 
 			if(!"Y".equals(cart.getSelfGoodsYn())) {			// 입점 상품은 TB_GOODS_IMG.COLOR_CD = TB_GOODS.MAIN_COLOR_CD
@@ -818,7 +822,8 @@ public class TsfCartService {
 	}
 
 	@Transactional("shopTxnManager")
-	public void updateCartOption(Cart param) {
+	public GagaMap updateCartOption(Cart param) {
+		GagaMap result = new GagaMap();
 		param.setJsessionId(TsfSession.getSessionId());
 		param.setFrontGb(TsfSession.getFrontGb());
 
@@ -841,10 +846,14 @@ public class TsfCartService {
 		goods = goodsService.getGoodsInfo(goods);
 
 		if (goods == null) {
-			throw new IllegalArgumentException("상품 정보가 존재하지 않습니다.");
+			result.put("status", "FAIL");
+			result.put("message", "상품 정보가 존재하지 않습니다.");
+			return result;
 		}
 		if (TscConstants.GoodsStat.SOLDOUT.value().equals(goods.getGoodsStat())) {
-			throw new IllegalArgumentException("품절입니다.");
+			result.put("status", "FAIL");
+			result.put("message", "품절입니다.");
+			return result;
 		}
 		
 		// 현재 장바구니 수량
@@ -866,7 +875,9 @@ public class TsfCartService {
 			String stockResult = goodsService.getCheckStock(checkParam);
 
 			if (!"SUCCESS".equals(stockResult)) {
-				throw new IllegalArgumentException(stockResult);
+				result.put("status", "FAIL");
+				result.put("message", stockResult);
+				return result;
 			}
 		}
 
@@ -897,7 +908,9 @@ public class TsfCartService {
 			// 동일 상품 존재시
 			if (cartList != null && cartList.size() > 0) {		// 장바구니 기존재
 				if (cartList.size() > 1) {						// 장바구니 조회 결과 이상시 insert or select 수정 필요
-					throw new IllegalArgumentException("장바구니 조회에 실패하였습니다. 관리자에게 문의해주세요.");
+					result.put("status", "FAIL");
+					result.put("message", "장바구니 조회에 실패하였습니다. 관리자에게 문의해주세요.");
+					return result;
 				} else {
 					// 기존 존재 장바구니 UPDATE
 					Cart cart = new Cart();
@@ -940,7 +953,9 @@ public class TsfCartService {
 			Collection<Integer> cartSqList = cartDao.selectHasNormalDealItemCartList(param);
 			if (cartSqList != null && cartSqList.size() > 0) {			// 장바구니 기존재
 				if (cartSqList.size() > 1) {							// 장바구니 조회 결과 이상시 insert or select 수정 필요
-					throw new IllegalArgumentException("장바구니 조회에 실패하였습니다. 관리자에게 문의해주세요.");
+					result.put("status", "FAIL");
+					result.put("message", "장바구니 조회에 실패하였습니다. 관리자에게 문의해주세요.");
+					return result;
 				} else {
 					param.setCartSq(cartSqList.iterator().next());
 					cartDao.updateCartInfo(param);				// 장바구니 기존 데이터에 UPDATE(수량증가)
@@ -964,5 +979,9 @@ public class TsfCartService {
 				cartDao.insertCartDetailHst(param);                // 장바구니 수정 이력 저장
 			}
 		}
+
+		result.put("status", "SUCCESS");
+
+		return result;
 	}
 }

src/main/java/com/style24/front/biz/service/TsfGoodsService.java

@@ -256,6 +256,10 @@ public class TsfGoodsService {
 
 			stockCheck = goodsDao.getGoodsStockInfo(stockCheck);					// 구성 상품 재고 조회
 
+			if(stockCheck == null) {
+				return "재고체크 실패했습니다. 새로고침 후 다시 시도해주세요.";
+			}
+
 			Goods compsInfo = new Goods();
 			compsInfo.setGoodsCd(param.getGoodsCd());
 			compsInfo.setCompsGoodsCd(param.getItemCd());
@@ -265,7 +269,7 @@ public class TsfGoodsService {
 
 			// 재고 체크
 			if (param.getGoodsQty() * compsInfo.getQty() > stockCheck.getCurrStockQty()) {
-				return param.getItemCd() + "의 재고가 충분하지 않습니다.";
+				return compsInfo.getGoodsNm() + " 옵션의 재고가 충분하지 않습니다.";
 			}
 		} else {
 			GoodsStock stockCheck = new GoodsStock();								// 재고 조회 결과
@@ -274,8 +278,12 @@ public class TsfGoodsService {
 
 			stockCheck = goodsDao.getGoodsStockInfo(stockCheck);					// 구성 상품 재고 조회
 
+			if(stockCheck == null) {
+				return "재고체크 실패했습니다. 새로고침 후 다시 시도해주세요.";
+			}
+
 			if (param.getGoodsQty() > stockCheck.getCurrStockQty()) {
-				return param.getGoodsCd() + "의 재고가 충분하지 않습니다.";
+				return "옵션의 재고가 충분하지 않습니다.";
 			}
 		}
 

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

@@ -109,6 +109,9 @@ public class TsfCartController extends TsfBaseController {
 	// @ResponseBody
 	@PostMapping("/goods/list")
 	public String selectCartGoodsList(Order param, Model model) {
+		log.info("CHECK INFO >>> {}", param.getShotDelvUseYn());
+
+
 		// 총알배송 가능 여부 체크
 		int shotCanYn = coreOrderService.getDailyDeliveryCheck(param);
 
@@ -122,23 +125,25 @@ public class TsfCartController extends TsfBaseController {
 		} else {
 			SimpleDateFormat format = new SimpleDateFormat ( "MM/dd");
 			Date time = new Date();
+			param.setShotCanYn("N");
 			param.setShotDelvDt(format.format(time));
+		}
 
-			param.setShotCanYn("N");
-			param.setShotDelvYn("N");
+		// TODO 테스트 후 삭제할것.
+		// param.setShotCanYn("Y");
+
+		if(param.getShotDelvUseYn() == null) {
+			param.setShotDelvUseYn(param.getShotCanYn());
 		}
 
 		// 장바구니 정보 조회
 		Order order = cartService.getCartGoodsList(param);
+		order.setShotDelvUseYn(param.getShotDelvUseYn());
 		order.setShotCanYn(param.getShotCanYn());
 		order.setShotDelvDt(param.getShotDelvDt());
-		order.setShotDelvYn(param.getShotDelvYn());
 
 		model.addAttribute("loginInfo", TsfSession.getInfo());
 		model.addAttribute("order", order);
-		model.addAttribute("shotCartList", order.getShotCartList());
-		model.addAttribute("wmsCartList", order.getWmsCartList());
-		model.addAttribute("delvCartList", order.getDelvCartList());
 		model.addAttribute("IMG_PATH", env.getProperty("upload.goods.view"));
 
 		return super.getDeviceViewName("cart/CartListAjaxForm");
@@ -219,8 +224,15 @@ public class TsfCartController extends TsfBaseController {
 	 */
 	@ResponseBody
 	@PostMapping("/change/option")
-	public GagaResponse updateCartOption(@RequestBody Cart param) {
-		cartService.updateCartOption(param);
-		return super.ok(message.getMessage("SUCC_0001"));
+	public GagaMap updateCartOption(@RequestBody Cart param) {
+		GagaMap result = new GagaMap();
+
+		result = cartService.updateCartOption(param);
+
+		if("SUCCESS".equals(result.get("status"))) {
+			result.put("message", message.getMessage("SUCC_0009"));
+		}
+
+		return result;
 	}
 }

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

@@ -565,7 +565,9 @@
 					 , CASE WHEN C.CUST_NO = 0 AND C.GOODS_QTY > G.DAY_MAX_ORD_QTY THEN 1 ELSE 0 END AS NOCUST_TODAY_ORD
 					 /*, CASE WHEN G.GOODS_TYPE != 'G056_S' AND G.SELF_GOODS_YN = 'Y' THEN (SELECT SYS_IMG_NM FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = CD.OPT_CD1 AND DEFAULT_IMG_YN = 'Y' LIMIT 1)
 							ELSE (SELECT SYS_IMG_NM FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = G.MAIN_COLOR_CD AND DEFAULT_IMG_YN = 'Y' LIMIT 1) END AS SYS_IMG_NM*/
-					 , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = IFNULL(G.MAIN_COLOR_CD,'XX') AND DEFAULT_IMG_YN = 'Y') AS SYS_IMG_NM
+					 /* , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = IFNULL(G.MAIN_COLOR_CD,'XX') AND DEFAULT_IMG_YN = 'Y') AS SYS_IMG_NM */
+					 , CASE WHEN G.GOODS_TYPE != 'G056_S' AND G.SELF_GOODS_YN = 'Y' THEN (SELECT SYS_IMG_NM FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = CD.OPT_CD1 AND DEFAULT_IMG_YN = 'Y' LIMIT 1)
+							ELSE (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = IFNULL(G.MAIN_COLOR_CD,'XX') AND DEFAULT_IMG_YN = 'Y' LIMIT 1) END AS SYS_IMG_NM
 				FROM   TB_CART C
 				INNER  JOIN TB_CART_DETAIL CD
 				ON     C.CART_SQ = CD.CART_SQ

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

@@ -447,6 +447,7 @@
 		     , GC.GOODS_TYPE
 		     , GC.QTY
 		     , G.GOODS_STAT
+			 , G.GOODS_NM
 		  FROM TB_GOODS_COMPOSE GC
 		 INNER JOIN TB_GOODS G
 		    ON GC.COMPS_GOODS_CD = G.GOODS_CD

src/main/webapp/WEB-INF/views/web/cart/CartChangeOptionPopupWeb.html

@@ -33,6 +33,85 @@
 				</div>
 				<div class="area_order">
 					<th:block th:each="comp, status : ${cart.cartCompsList}">
+						<!-- 세트상품 옵션 -->
+						<th:block th:if="${setType.equals(cart.goodsType)}">
+							<div class="opt_select">
+								<div class="opt_header">
+									<span class="title" th:text="${comp.goodsNm}"></span>
+								</div>
+								<div class="opt_header">
+									<span class="title">옵션1</span>
+									<th:block th:each="color, index : ${comp.cartColorList}" th:if="${color.cartColorNm != null}">
+										<span class="text" th:text="${color.cartColorNm}"></span>
+									</th:block>
+								</div>
+
+								<!-- 컬러 변경시 만들어줄 size option -->
+								<th:block th:each="color, index : ${comp.cartColorList}">
+									<span style="display:none;">
+										<select th:classappend="|color_${color.goodsCd}_${color.optCd1}|">
+											<th:block th:each="size, i : ${color.cartSizeList}">
+												<th:block th:if="${color.optCd1.equals(size.optCd1)}">
+													<option th:value="${size.optCd}" th:text="${size.optCd2}"></option>
+												</th:block>
+											</th:block>
+										</select>
+									</span>
+								</th:block>
+
+								<form class="form_wrap">
+									<div class="form_field">
+										<div class="select_custom item_opt1 setColorSelect">
+											<div class="combo">
+												<th:block th:each="color, index : ${comp.cartColorList}" th:if="${color.cartColorNm != null}">
+													<div class="select" th:text="${color.cartColorNm}"></div>
+												</th:block>
+												<ul class="list">
+													<!-- 선택처리 class="selected" / 선택불가 aria-disabled="true" 추가  -->
+													<th:block th:each="color, index : ${comp.cartColorList}">
+														<li th:classappend="${color.cartColorNm != null} ? selected" th:text="${color.colorNm}"></li>
+													</th:block>
+													<!--<li class="selected">카키/95</li>
+													<li aria-disabled="true">옐로우/105</li>-->
+												</ul>
+											</div>
+										</div>
+									</div>
+								</form>
+							</div>
+							<div class="opt_select">
+								<div class="opt_header">
+									<span class="title">옵션2</span>
+									<th:block th:each="color, index : ${comp.cartColorList}" th:if="${color.cartColorNm != null}">
+										<th:block th:each="size, i : ${color.cartSizeList}" th:if="${size.cartOptCd != null}">
+											<span class="text" th:text="${size.optCd2}"></span>
+										</th:block>
+									</th:block>
+								</div>
+								<form class="form_wrap">
+									<div class="form_field">
+										<div class="select_custom item_opt2 setSizeSelect">
+											<div class="combo">
+												<th:block th:each="color, index : ${comp.cartColorList}" th:if="${color.cartColorNm != null}">
+													<th:block th:each="size, i : ${color.cartSizeList}" th:if="${size.cartOptCd != null}">
+														<div class="select" th:classappend="|size_${comp.goodsCd}|" th:text="${size.optCd2}" th:data="${color.goodsCd}"></div>
+													</th:block>
+													<ul class="list">
+														<th:block th:each="size, i : ${color.cartSizeList}" th:if="${color.optCd1.equals(size.optCd1)}">
+															<!-- 선택처리 class="selected" / 선택불가 aria-disabled="true" 추가  -->
+															<li th:classappend="${size.cartOptCd != null} ? selected" th:data="${comp.cartDtlSq}" th:optCd="${size.optCd}" th:value="${size.optCd}" th:text="${size.optCd2}"></li>
+															<!--<li class="selected">블랙/95</li>
+															<li aria-disabled="true">블랙/105</li>-->
+														</th:block>
+													</ul>
+												</th:block>
+											</div>
+										</div>
+									</div>
+								</form>
+							</div>
+						</th:block>
+
 						<!-- 자사 일반 상품 옵션 -->
 						<th:block th:if="${!setType.equals(cart.goodsType) and 'Y'.equals(cart.selfGoodsYn)}">
 							<div class="opt_color">
@@ -70,12 +149,10 @@
 								</div>
 							</div>
 						</th:block>
-						<!-- 세트상품 옵션 -->
-						<th:block th:if="${setType.equals(cart.goodsType)}">
+
+						<!-- 입점업체 -->
+						<th:block th:if="${!setType.equals(cart.goodsType) and 'N'.equals(cart.selfGoodsYn)}">
 							<div class="opt_select">
-								<div class="opt_header">
-									<span class="title" th:text="${comp.goodsNm}"></span>
-								</div>
 								<div class="opt_header">
 									<span class="title">옵션1</span>
 									<th:block th:each="color, index : ${comp.cartColorList}" th:if="${color.cartColorNm != null}">
@@ -136,7 +213,7 @@
 													<ul class="list">
 														<th:block th:each="size, i : ${color.cartSizeList}" th:if="${color.optCd1.equals(size.optCd1)}">
 															<!-- 선택처리 class="selected" / 선택불가 aria-disabled="true" 추가  -->
-															<li th:classappend="${size.cartOptCd != null} ? selected" th:data="${comp.cartDtlSq}" th:optCd="${size.optCd}" th:value="${size.optCd}" th:text="${size.optCd2}"></li>
+															<li th:classappend="${size.cartOptCd != null} ? selected" th:data="${color.cartDtlSq}" th:optCd="${size.optCd}" th:value="${size.optCd}" th:text="${size.optCd2}"></li>
 															<!--<li class="selected">블랙/95</li>
 															<li aria-disabled="true">블랙/105</li>-->
 														</th:block>
@@ -264,11 +341,12 @@
 					, goodsQty : $("input[name=goodsQty]").val()
 				}
 			} else {
-				optCds.push($(".selfGoodsColor").val());
+				// optCds.push($(".selfGoodsColor").val());
 				itemCds.push(cart.goodsCd);
-				$(".selfGoodsColor option").each(function() {
+				$(".setSizeSelect .selected").each(function() {
 					if($(this).attr("data") > 0) {
 						cartDtlSqArr.push($(this).attr("data"));
+						optCds.push($(this).attr("optCd"));
 					}
 				});
 
@@ -289,10 +367,14 @@
 				contentType: 'application/json',
 				dataType : 'json',
 				data : JSON.stringify(data),
+				error : function(e) {
+					alert(e.message);
+				},
 				success : function(result) {
-					alert(result.message);
+					mcxDialog.alert(result.message);
 					$(".closeCartOptionModal").trigger("click");
-					getCartList();
+					let data = {shotDelvUseYn : $("input[name=shotDelvUseYn]:checked").val()};
+					getCartList(data);
 				}
 			});
 		}

src/main/webapp/WEB-INF/views/web/cart/CartListAjaxFormWeb.html

@@ -13,1090 +13,1146 @@
  * 1.0  2021.02.02   xodud1202   최초 작성
  *******************************************************************************
  -->
-<form id="cartListForm" method="post" action="/order/noMember">
-	<!--<input type="hidden" name="cartCpnDcAmt" id="cartCpnDcAmt" th:value="${param.cartCpnDcAmt}" />-->
-
-	<!-- CONT-BODY -->
-	<div class="od_cont">
-		<div class="sec_head">
-			<div class="tbl type4">
-				<table>
-					<colgroup>
-						<col width="170">
-						<col width="*">
-					</colgroup>
-					<tbody>
-					<tr>
-						<th>
-							배송방법 선택
-						</th>
-						<td>
-							<div class="form_field">
-								<div>
-									<input type="radio" name="shotDelvUseYn" id="blt_ship1" value="Y" th:checked="${order.shotCanYn.equals('Y')}">
-									<label for="blt_ship1"><span><em class="tag primary_line">총알배송</em><span th:text="|${order.shotDelvDt}일 24:00 까지 도착|"></span></span></label>
-								</div>
-								<div>
-									<input type="radio" name="shotDelvUseYn" id="blt_ship2" value="N" th:checked="${!order.shotCanYn.equals('Y')}">
-									<label for="blt_ship2"><span>총알 배송 안함</span></label>
+<div id="cartAjaxArea">
+	<form id="cartListForm" method="post" action="/order/noMember">
+		<!--<input type="hidden" name="cartCpnDcAmt" id="cartCpnDcAmt" th:value="${param.cartCpnDcAmt}" />-->
+
+		<!-- CONT-BODY -->
+		<div class="od_cont">
+			<div class="sec_head shotDelvSelect">
+				<div class="tbl type4">
+					<table>
+						<colgroup>
+							<col width="170">
+							<col width="*">
+						</colgroup>
+						<tbody>
+						<tr>
+							<th>
+								배송방법 선택
+							</th>
+							<td>
+								<div class="form_field">
+									<div>
+										<input type="radio" name="shotDelvUseYn" id="blt_ship1" value="Y" th:checked="${order.shotDelvUseYn != null and order.shotDelvUseYn.equals('Y')}">
+										<label for="blt_ship1"><span><em class="tag primary_line">총알배송</em><span th:text="|${order.shotDelvDt}일 24:00 까지 도착|"></span></span></label>
+									</div>
+									<div>
+										<input type="radio" name="shotDelvUseYn" id="blt_ship2" value="N" th:checked="${order.shotDelvUseYn != null and !order.shotDelvUseYn.equals('Y')}">
+										<label for="blt_ship2"><span>총알 배송 안함</span></label>
+									</div>
 								</div>
-							</div>
-						</td>
-					</tr>
-					</tbody>
-				</table>
+							</td>
+						</tr>
+						</tbody>
+					</table>
+				</div>
 			</div>
-		</div>
-		<div class="sec_body">
-			<div class="sec_select">
-				<div>
-					<div class="form_field">
-						<input id="od_item_all" type="checkbox"><label for="od_item_all"><span>전체선택</span></label>
+			<div class="sec_body">
+				<div class="sec_select">
+					<div>
+						<div class="form_field">
+							<input id="od_item_all" type="checkbox" checked="checked"><label for="od_item_all"><span>전체선택</span></label>
+						</div>
+						<button type="button" class="btn btn_default btn_sm"><span>선택삭제</span></button>
 					</div>
-					<button type="button" class="btn btn_default btn_sm"><span>선택삭제</span></button>
 				</div>
-			</div>
-			<div class="sec_part" th:if="${shotCartList.size() > 0 or wmsCartList.size() > 0}">
-				<h3 class="subH2">
-					STYLE24 배송
-				</h3>
-				<div class="area_part" th:if="${shotCartList.size() > 0}">
-					<h4 class="subH2">
-						총알배송
-						<span class="tit_info">오늘 자정까지 도착</span>
-					</h4>
-					<div class="part_goods">
-						<div class="goods_cont">
-							<!-- 주문상품 -->
-							<th:block th:each="cart, status : ${shotCartList}">
-								<div class="cartInfo goods_info wmsCartInfo">
-									<input type="hidden" name="applyQtySectionYn" th:value="${cart.applyQtySectionYn}" />
-									<input type="hidden" name="applyAmtSectionYn" th:value="${cart.applyAmtSectionYn}" />
-									<input type="hidden" name="qtyTmtbSq" th:value="${cart.qtyTmtbSq}" />
-									<input type="hidden" name="qtyTmtbNm" th:value="${cart.qtyTmtbNm}" />
-									<input type="hidden" name="amtTmtbSq" th:value="${cart.amtTmtbSq}" />
-									<input type="hidden" name="amtTmtbNm" th:value="${cart.amtTmtbNm}" />
-									<input type="hidden" name="currPrice" th:value="${cart.currPrice}" />
-									<input type="hidden" name="soldoutYn" th:value="${cart.soldoutYn}" />
-									<input type="hidden" name="tmtbDcAmt" th:value="${cart.tmtbDcAmt}" />
-									<input type="hidden" name="cartSq" th:value="${cart.cartSq}" />
-
-									<div class="order_desc">
-										<div class="form_box">
-											<div class="form_field">
-												<input th:id="|od_item_${cart.cartSq}|" name="cartSqArr" type="checkbox" th:value="${cart.cartSq}" th:checked="${cart.soldoutYn.equals('N')}" th:disabled="${cart.soldoutYn.equals('Y')}"/>
-												<label th:for="|od_item_${cart.cartSq}|">
-													<span class="sr-only">상품선택</span>
-												</label>
+				<div class="sec_part" th:if="${order.shotCartList.size() > 0 or order.wmsCartList.size() > 0}">
+					<h3 class="subH2">
+						STYLE24 배송
+					</h3>
+					<div class="area_part shotList" th:if="${order.shotCartList != null and order.shotCartList.size() > 0}">
+						<h4 class="subH2">
+							총알배송
+							<span class="tit_info">오늘 자정까지 도착</span>
+						</h4>
+						<div class="part_goods">
+							<div class="goods_cont">
+								<!-- 주문상품 -->
+								<th:block th:each="cart, status : ${order.shotCartList}">
+									<div class="cartInfo goods_info shotCartInfo">
+										<input type="hidden" name="applyQtySectionYn" th:value="${cart.applyQtySectionYn}" />
+										<input type="hidden" name="applyAmtSectionYn" th:value="${cart.applyAmtSectionYn}" />
+										<input type="hidden" name="qtyTmtbSq" th:value="${cart.qtyTmtbSq}" />
+										<input type="hidden" name="qtyTmtbNm" th:value="${cart.qtyTmtbNm}" />
+										<input type="hidden" name="amtTmtbSq" th:value="${cart.amtTmtbSq}" />
+										<input type="hidden" name="amtTmtbNm" th:value="${cart.amtTmtbNm}" />
+										<input type="hidden" name="currPrice" th:value="${cart.currPrice}" />
+										<input type="hidden" name="soldoutYn" th:value="${cart.soldoutYn}" />
+										<input type="hidden" name="tmtbDcAmt" th:value="${cart.tmtbDcAmt}" />
+										<input type="hidden" name="cartSq" th:value="${cart.cartSq}" />
+
+										<div class="order_desc">
+											<div class="form_box">
+												<div class="form_field">
+													<input th:id="|od_item_${cart.cartSq}|" name="cartSqArr" type="checkbox" th:value="${cart.cartSq}" th:checked="${cart.soldoutYn.equals('N')}" th:disabled="${cart.soldoutYn.equals('Y')}"/>
+													<label th:for="|od_item_${cart.cartSq}|">
+														<span class="sr-only">상품선택</span>
+													</label>
+												</div>
 											</div>
-										</div>
-										<div class="goods_box">
-											<div class="gd_item">
-												<a href="">
-													<span class="thumb">
-														<img th:src="${IMG_PATH} + '/' + ${cart.sysImgNm}" src="/" width="100%" alt="">
-													</span>
-													<p>
-														<span class="brand" th:text="|${cart.brandEnm} ${cart.brandKnm}|"></span>
-													</p>
+											<div class="goods_box">
+												<div class="gd_item">
+													<a th:href="|javascript:fnGoToGoodsDetail('${cart.goodsCd}')|">
+														<span class="thumb">
+															<img th:src="${IMG_PATH} + '/' + ${cart.sysImgNm}" src="/" width="100%" alt="">
+														</span>
+														<p>
+															<span class="brand" th:text="|${cart.brandEnm} ${cart.brandKnm}|"></span>
+														</p>
+														<p>
+															<span class="name" th:text="${cart.goodsNm}"></span>
+														</p>
+													</a>
+												</div>
+												<div class="gd_opt">
+													<div class="option_wrap">
+														<span class="title sr-only">주문 옵션</span>
+														<th:block th:each="opt, index : ${cart.itemNmArr}">
+															<th:block th:if="${cart.goodsType.equals('G056_S')}">
+																<span class="option" th:text="${cart.itemNmArr[index.index]} + ' / ' + ${cart.colorNmArr[index.index]} + ' / ' + ${cart.optCd2Arr[index.index]}"></span>
+															</th:block>
+															<th:block th:if="${!cart.goodsType.equals('G056_S')}">
+																<span class="option" th:text="${cart.colorNmArr[index.index]} + ' / ' + ${cart.optCd2Arr[index.index]}"></span>
+															</th:block>
+														</th:block>
+													</div>
+												</div>
+												<div class="gd_calc">
 													<p>
-														<span class="name" th:text="${cart.goodsNm}"></span>
+														<span class="count">수량&nbsp;<em th:text="${cart.goodsQty}"></em>개</span>
 													</p>
-												</a>
-											</div>
-											<div class="gd_opt">
-												<div class="option_wrap">
-													<span class="title sr-only">주문 옵션</span>
-													<th:block th:each="opt, index : ${cart.itemNmArr}">
-														<th:block th:if="${cart.goodsType.equals('G056_S')}">
-															<span class="option" th:text="${cart.itemNmArr[index.index]} + ' / ' + ${cart.colorNmArr[index.index]} + ' / ' + ${cart.optCd2Arr[index.index]}"></span>
-														</th:block>
-														<th:block th:if="${!cart.goodsType.equals('G056_S')}">
-															<span class="option" th:text="${cart.colorNmArr[index.index]} + ' / ' + ${cart.optCd2Arr[index.index]}"></span>
-														</th:block>
-													</th:block>
+												</div>
+												<div class="gd_exinfo">
+													<p th:if="${!#strings.isEmpty(cart.delvResDt)}"><span class="tag primary_line">총알배송</span><span th:text="|${cart.delvResDt} 배송예정|"></span></p>
+													<p th:if="${cart.qtyTmtbSq > 0 and cart.applyQtySectionYn == 'Y'}" class="applyTmtb"><span class="tag primary">SALE</span>다다익선 할인 적용</p>
+													<p th:if="${cart.qtyTmtbSq > 0 and cart.applyQtySectionYn == 'N'}" class="notApplyTmtb"><a href="" class="btn_moresale"><span class="tag primary">SALE</span>다다익선 상품보기</a></p>
+													<p th:if="${cart.amtTmtbSq > 0 and cart.applyAmtSectionYn == 'Y'}" class="applyTmtb"><span class="tag primary">SALE</span>다다익선 할인 적용</p>
+													<p th:if="${cart.amtTmtbSq > 0 and cart.applyAmtSectionYn == 'N'}" class="notApplyTmtb"><a href="" class="btn_moresale"><span class="tag primary">SALE</span>다다익선 상품보기</a></p>
+													<p th:if="${cart.soldoutYn.equals('Y')}">해당 상품은 구매 불가능한 상품입니다.</p>
 												</div>
 											</div>
-											<div class="gd_calc">
+											<div class="calc_box">
+												<th:block  th:if="${cart.tmtbDcAmt < cart.currPrice}">
+													<p><span class="price_org"><em th:text="${#numbers.formatInteger(cart.currPrice, 1, 'COMMA')}"></em>원</span></p>
+													<p><span class="price_sale"><em th:text="${#numbers.formatInteger(cart.tmtbDcAmt, 1, 'COMMA')}"></em>원</span></p>
+												</th:block>
+												<th:block th:if="${cart.tmtbDcAmt == cart.currPrice}">
+													<p><span class="price_sale"><em th:text="${#numbers.formatInteger(cart.currPrice, 1, 'COMMA')}"></em>원</span></p>
+												</th:block>
 												<p>
-													<span class="count">수량&nbsp;<em th:text="${cart.goodsQty}"></em>개</span>
+													<span class="point">
+														<em th:text="${#numbers.formatInteger(cart.savePntAmt, 1, 'COMMA')}"></em><stong>P</stong>&nbsp;적립예정
+													</span>
 												</p>
 											</div>
-											<div class="gd_exinfo">
-												<p th:if="${!#strings.isEmpty(cart.delvResDt)}"><span class="tag primary_line">총알배송</span><span th:text="|${cart.delvResDt} 배송예정|"></span></p>
-												<p th:if="${cart.qtyTmtbSq > 0 and cart.applyQtySectionYn == 'Y'}"><span class="tag primary">SALE</span>다다익선 할인 적용</p>
-												<p th:if="${cart.amtTmtbSq > 0 and cart.applyAmtSectionYn == 'Y'}"><span class="tag primary">SALE</span>다다익선 할인 적용</p>
-												<p th:if="${cart.qtyTmtbSq > 0 and cart.applyQtySectionYn == 'N'}"><a href="" class="btn_moresale"><span class="tag primary">SALE</span>다다익선 상품보기</a></p>
-												<p th:if="${cart.amtTmtbSq > 0 and cart.applyAmtSectionYn == 'N'}"><a href="" class="btn_moresale"><span class="tag primary">SALE</span>다다익선 상품보기</a></p>
-												<p th:if="${cart.soldoutYn.equals('Y')}">해당 상품은 구매 불가능한 상품입니다.</p>
-											</div>
-										</div>
-										<div class="calc_box">
-											<th:block  th:if="${cart.tmtbDcAmt < cart.currPrice}">
-												<p><span class="price_org"><em th:text="${#numbers.formatInteger(cart.currPrice, 1, 'COMMA')}"></em>원</span></p>
-												<p><span class="price_sale"><em th:text="${#numbers.formatInteger(cart.tmtbDcAmt, 1, 'COMMA')}"></em>원</span></p>
-											</th:block>
-											<th:block th:if="${cart.tmtbDcAmt == cart.currPrice}">
-												<p><span class="price_sale"><em th:text="${#numbers.formatInteger(cart.currPrice, 1, 'COMMA')}"></em>원</span></p>
-											</th:block>
-											<p>
-												<span class="point">
-													<em th:text="${#numbers.formatInteger(cart.savePntAmt, 1, 'COMMA')}"></em><stong>P</stong>&nbsp;적립예정
-												</span>
-											</p>
-										</div>
-										<div class="button_box">
-											<p th:if="${cart.soldoutYn.equals('Y')}"><button type="button" class="btn btn_dark btn_sm" disabled=""><span>구매 불가</span></button></p>
-											<p th:if="${cart.soldoutYn.equals('N')}"><button type="button" class="btn btn_primary btn_sm" th:onclick="|fnSubmitNoMember(${cart.cartSq})|"><span>바로 구매</span></button></p>
-
-											<p><button type="button" class="btn btn_default btn_sm" th:onclick="|fnChangeCartOptCd(${cart.cartSq})|"><span>옵션 / 수량 변경</span></button></p>
-											<div class="util">
-												<span>
-													<button type="button" class="btn_favorite" th:classappend="${cart.wishCnt > 0} ? active" onclick="cfnPutWishList(this)" th:goodsCd="${cart.goodsCd}" th:ithrCd="${cart.ithrCd}" th:contentsLoc="${cart.contentsLoc}">
-														<span><i class="ico ico_like2"></i><em class="sr-only">관심상품 추가</em></span>
-													</button>
-												</span>
-												<span>
-													<button type="button" class="btn_delete" th:onclick="|deleteCart(${cart.cartSq})|">
-														<span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span>
-													</button>
-												</span>
+											<div class="button_box">
+												<p th:if="${cart.soldoutYn.equals('Y')}"><button type="button" class="btn btn_dark btn_sm" disabled=""><span>구매 불가</span></button></p>
+												<p th:if="${cart.soldoutYn.equals('N')}"><button type="button" class="btn btn_primary btn_sm" th:onclick="|fnSubmitNoMember(${cart.cartSq})|"><span>바로 구매</span></button></p>
+
+												<p><button type="button" class="btn btn_default btn_sm" th:onclick="|fnChangeCartOptCd(${cart.cartSq})|"><span>옵션 / 수량 변경</span></button></p>
+												<div class="util">
+													<span>
+														<button type="button" class="btn_favorite" th:classappend="${cart.wishCnt > 0} ? active" onclick="cfnPutWishList(this)" th:goodsCd="${cart.goodsCd}" th:ithrCd="${cart.ithrCd}" th:contentsLoc="${cart.contentsLoc}">
+															<span><i class="ico ico_like2"></i><em class="sr-only">관심상품 추가</em></span>
+														</button>
+													</span>
+													<span>
+														<button type="button" class="btn_delete" th:onclick="|deleteCart(${cart.cartSq})|">
+															<span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span>
+														</button>
+													</span>
+												</div>
 											</div>
 										</div>
 									</div>
-								</div>
-							</th:block>
-							<!-- //주문상품 -->
+								</th:block>
+								<!-- //주문상품 -->
+							</div>
 						</div>
 					</div>
-				</div>
-				<div class="area_part" th:if="${wmsCartList.size() > 0}">
-					<h4 class="subH2">
-						일반배송
-					</h4>
-					<div class="part_goods">
-						<div class="goods_cont">
-							<!-- 주문상품 -->
-							<th:block th:each="cart, status : ${wmsCartList}">
-								<div class="goods_info goods_info wmsCartInfo">
-									<input type="hidden" name="applyQtySectionYn" th:value="${cart.applyQtySectionYn}" />
-									<input type="hidden" name="applyAmtSectionYn" th:value="${cart.applyAmtSectionYn}" />
-									<input type="hidden" name="qtyTmtbSq" th:value="${cart.qtyTmtbSq}" />
-									<input type="hidden" name="qtyTmtbNm" th:value="${cart.qtyTmtbNm}" />
-									<input type="hidden" name="amtTmtbSq" th:value="${cart.amtTmtbSq}" />
-									<input type="hidden" name="amtTmtbNm" th:value="${cart.amtTmtbNm}" />
-									<input type="hidden" name="currPrice" th:value="${cart.currPrice}" />
-									<input type="hidden" name="soldoutYn" th:value="${cart.soldoutYn}" />
-									<input type="hidden" name="tmtbDcAmt" th:value="${cart.tmtbDcAmt}" />
-									<input type="hidden" name="cartSq" th:value="${cart.cartSq}" />
-
-									<div class="order_desc">
-										<div class="form_box">
-											<div class="form_field">
-												<input th:id="|od_item_${cart.cartSq}|" name="cartSqArr" type="checkbox" th:value="${cart.cartSq}" th:checked="${cart.soldoutYn.equals('N')}" th:disabled="${cart.soldoutYn.equals('Y')}">
-												<label th:for="|od_item_${cart.cartSq}|">
-													<span class="sr-only">상품선택</span>
-												</label>
-											</div>
-										</div>
-										<div class="goods_box">
-											<div class="gd_item">
-												<a href="">
-													<span class="thumb"><img th:src="${IMG_PATH} + '/' + ${cart.sysImgNm}" src="/" width="100%" alt=""></span>
-													<p><span class="brand" th:text="|${cart.brandEnm} ${cart.brandKnm}|"></span></p>
-													<p><span class="name" th:text="${cart.goodsNm}"></span></p>
-												</a>
+					<div class="area_part wmsList" th:if="${order.wmsCartList != null and order.wmsCartList.size() > 0}">
+						<h4 class="subH2">
+							일반배송
+						</h4>
+						<div class="part_goods">
+							<div class="goods_cont">
+								<!-- 주문상품 -->
+								<th:block th:each="cart, status : ${order.wmsCartList}">
+									<div class="cartInfo goods_info wmsCartInfo">
+										<input type="hidden" name="applyQtySectionYn" th:value="${cart.applyQtySectionYn}" />
+										<input type="hidden" name="applyAmtSectionYn" th:value="${cart.applyAmtSectionYn}" />
+										<input type="hidden" name="qtyTmtbSq" th:value="${cart.qtyTmtbSq}" />
+										<input type="hidden" name="qtyTmtbNm" th:value="${cart.qtyTmtbNm}" />
+										<input type="hidden" name="amtTmtbSq" th:value="${cart.amtTmtbSq}" />
+										<input type="hidden" name="amtTmtbNm" th:value="${cart.amtTmtbNm}" />
+										<input type="hidden" name="currPrice" th:value="${cart.currPrice}" />
+										<input type="hidden" name="soldoutYn" th:value="${cart.soldoutYn}" />
+										<input type="hidden" name="tmtbDcAmt" th:value="${cart.tmtbDcAmt}" />
+										<input type="hidden" name="cartSq" th:value="${cart.cartSq}" />
+
+										<div class="order_desc">
+											<div class="form_box">
+												<div class="form_field">
+													<input th:id="|od_item_${cart.cartSq}|" name="cartSqArr" type="checkbox" th:value="${cart.cartSq}" th:checked="${cart.soldoutYn.equals('N')}" th:disabled="${cart.soldoutYn.equals('Y')}">
+													<label th:for="|od_item_${cart.cartSq}|">
+														<span class="sr-only">상품선택</span>
+													</label>
+												</div>
 											</div>
-											<div class="gd_opt">
-												<div class="option_wrap">
-													<span class="title sr-only">주문 옵션</span>
-													<th:block th:each="opt, index : ${cart.itemNmArr}">
-														<th:block th:if="${cart.goodsType.equals('G056_S')}">
-															<span class="option" th:text="${cart.itemNmArr[index.index]} + ' / ' + ${cart.colorNmArr[index.index]} + ' / ' + ${cart.optCd2Arr[index.index]}"></span>
-														</th:block>
-														<th:block th:if="${!cart.goodsType.equals('G056_S')}">
-															<span class="option" th:text="${cart.colorNmArr[index.index]} + ' / ' + ${cart.optCd2Arr[index.index]}"></span>
+											<div class="goods_box">
+												<div class="gd_item">
+													<a th:href="|javascript:fnGoToGoodsDetail('${cart.goodsCd}')|">
+														<span class="thumb"><img th:src="${IMG_PATH} + '/' + ${cart.sysImgNm}" src="/" width="100%" alt=""></span>
+														<p><span class="brand" th:text="|${cart.brandEnm} ${cart.brandKnm}|"></span></p>
+														<p><span class="name" th:text="${cart.goodsNm}"></span></p>
+													</a>
+												</div>
+												<div class="gd_opt">
+													<div class="option_wrap">
+														<span class="title sr-only">주문 옵션</span>
+														<th:block th:each="opt, index : ${cart.itemNmArr}">
+															<th:block th:if="${cart.goodsType.equals('G056_S')}">
+																<span class="option" th:text="${cart.itemNmArr[index.index]} + ' / ' + ${cart.colorNmArr[index.index]} + ' / ' + ${cart.optCd2Arr[index.index]}"></span>
+															</th:block>
+															<th:block th:if="${!cart.goodsType.equals('G056_S')}">
+																<span class="option" th:text="${cart.colorNmArr[index.index]} + ' / ' + ${cart.optCd2Arr[index.index]}"></span>
+															</th:block>
 														</th:block>
-													</th:block>
+													</div>
+												</div>
+												<div class="gd_calc">
+													<p><span class="count">수량&nbsp;<em th:text="${cart.goodsQty}"></em>개</span></p>
 												</div>
-											</div>
-											<div class="gd_calc">
-												<p><span class="count">수량&nbsp;<em th:text="${cart.goodsQty}"></em>개</span></p>
-											</div>
-											<div class="gd_exinfo">
 												<div class="gd_exinfo">
-													<p th:if="${!#strings.isEmpty(cart.delvResDt)}" th:text="|${cart.delvResDt} 배송예정|"></p>
-													<p th:if="${cart.qtyTmtbSq > 0 and cart.applyQtySectionYn == 'Y'}"><span class="tag primary">SALE</span>다다익선 할인 적용</p>
-													<p th:if="${cart.amtTmtbSq > 0 and cart.applyAmtSectionYn == 'Y'}"><span class="tag primary">SALE</span>다다익선 할인 적용</p>
-													<p th:if="${cart.qtyTmtbSq > 0 and cart.applyQtySectionYn == 'N'}"><a href="" class="btn_moresale"><span class="tag primary">SALE</span>다다익선 상품보기</a></p>
-													<p th:if="${cart.amtTmtbSq > 0 and cart.applyAmtSectionYn == 'N'}"><a href="" class="btn_moresale"><span class="tag primary">SALE</span>다다익선 상품보기</a></p>
-													<p th:if="${cart.soldoutYn.equals('Y')}">해당 상품은 구매 불가능한 상품입니다.</p>
+													<div class="gd_exinfo">
+														<p th:if="${!#strings.isEmpty(cart.delvResDt)}" th:text="|${cart.delvResDt} 배송예정|"></p>
+														<p th:if="${cart.qtyTmtbSq > 0 and cart.applyQtySectionYn == 'Y'}" class="applyTmtb"><span class="tag primary">SALE</span>다다익선 할인 적용</p>
+														<p th:if="${cart.qtyTmtbSq > 0 and cart.applyQtySectionYn == 'N'}" class="notApplyTmtb"><a href="" class="btn_moresale"><span class="tag primary">SALE</span>다다익선 상품보기</a></p>
+														<p th:if="${cart.amtTmtbSq > 0 and cart.applyAmtSectionYn == 'Y'}" class="applyTmtb"><span class="tag primary">SALE</span>다다익선 할인 적용</p>
+														<p th:if="${cart.amtTmtbSq > 0 and cart.applyAmtSectionYn == 'N'}" class="notApplyTmtb"><a href="" class="btn_moresale"><span class="tag primary">SALE</span>다다익선 상품보기</a></p>
+														<p th:if="${cart.soldoutYn.equals('Y')}">해당 상품은 구매 불가능한 상품입니다.</p>
+													</div>
 												</div>
 											</div>
-										</div>
-										<div class="calc_box">
-											<th:block  th:if="${cart.tmtbDcAmt < cart.currPrice}">
-												<p><span class="price_org"><em th:text="${#numbers.formatInteger(cart.currPrice, 1, 'COMMA')}"></em>원</span></p>
-												<p><span class="price_sale"><em th:text="${#numbers.formatInteger(cart.tmtbDcAmt, 1, 'COMMA')}"></em>원</span></p>
-											</th:block>
-											<th:block th:if="${cart.tmtbDcAmt == cart.currPrice}">
-												<p><span class="price_sale"><em th:text="${#numbers.formatInteger(cart.currPrice, 1, 'COMMA')}"></em>원</span></p>
-											</th:block>
-											<p>
-												<span class="point">
-													<em th:text="${#numbers.formatInteger(cart.savePntAmt, 1, 'COMMA')}"></em><stong>P</stong>&nbsp;적립예정
-												</span>
-											</p>
-										</div>
-										<div class="button_box">
-											<p th:if="${cart.soldoutYn.equals('Y')}"><button type="button" class="btn btn_dark btn_sm" disabled=""><span>구매 불가</span></button></p>
-											<p th:if="${cart.soldoutYn.equals('N')}"><button type="button" class="btn btn_primary btn_sm" th:onclick="|fnSubmitNoMember(${cart.cartSq})|"><span>바로 구매</span></button></p>
-
-											<p><button type="button" class="btn btn_default btn_sm" th:onclick="|fnChangeCartOptCd(${cart.cartSq})|"><span>옵션 / 수량 변경</span></button></p>
-											<div class="util">
-												<span>
-													<button type="button" class="btn_favorite" th:classappend="${cart.wishCnt > 0} ? active" onclick="cfnPutWishList(this)" th:goodsCd="${cart.goodsCd}" th:ithrCd="${cart.ithrCd}" th:contentsLoc="${cart.contentsLoc}">
-														<span><i class="ico ico_like2"></i><em class="sr-only">관심상품 추가</em></span>
-													</button>
-												</span>
-												<span>
-													<button type="button" class="btn_delete" th:onclick="|deleteCart(${cart.cartSq})|">
-														<span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span>
-													</button>
-												</span>
+											<div class="calc_box">
+												<th:block  th:if="${cart.tmtbDcAmt < cart.currPrice}">
+													<p><span class="price_org"><em th:text="${#numbers.formatInteger(cart.currPrice, 1, 'COMMA')}"></em>원</span></p>
+													<p><span class="price_sale"><em th:text="${#numbers.formatInteger(cart.tmtbDcAmt, 1, 'COMMA')}"></em>원</span></p>
+												</th:block>
+												<th:block th:if="${cart.tmtbDcAmt == cart.currPrice}">
+													<p><span class="price_sale"><em th:text="${#numbers.formatInteger(cart.currPrice, 1, 'COMMA')}"></em>원</span></p>
+												</th:block>
+												<p>
+													<span class="point">
+														<em th:text="${#numbers.formatInteger(cart.savePntAmt, 1, 'COMMA')}"></em><stong>P</stong>&nbsp;적립예정
+													</span>
+												</p>
+											</div>
+											<div class="button_box">
+												<p th:if="${cart.soldoutYn.equals('Y')}"><button type="button" class="btn btn_dark btn_sm" disabled=""><span>구매 불가</span></button></p>
+												<p th:if="${cart.soldoutYn.equals('N')}"><button type="button" class="btn btn_primary btn_sm" th:onclick="|fnSubmitNoMember(${cart.cartSq})|"><span>바로 구매</span></button></p>
+
+												<p><button type="button" class="btn btn_default btn_sm" th:onclick="|fnChangeCartOptCd(${cart.cartSq})|"><span>옵션 / 수량 변경</span></button></p>
+												<div class="util">
+													<span>
+														<button type="button" class="btn_favorite" th:classappend="${cart.wishCnt > 0} ? active" onclick="cfnPutWishList(this)" th:goodsCd="${cart.goodsCd}" th:ithrCd="${cart.ithrCd}" th:contentsLoc="${cart.contentsLoc}">
+															<span><i class="ico ico_like2"></i><em class="sr-only">관심상품 추가</em></span>
+														</button>
+													</span>
+													<span>
+														<button type="button" class="btn_delete" th:onclick="|deleteCart(${cart.cartSq})|">
+															<span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span>
+														</button>
+													</span>
+												</div>
 											</div>
 										</div>
 									</div>
-								</div>
-							</th:block>
-							<!-- //주문상품 -->
+								</th:block>
+								<!-- //주문상품 -->
+							</div>
 						</div>
 					</div>
-				</div>
 
-				<!-- 자사 배송비 -->
-				<div class="goods_foot" style="margin-top:40px;">
-					<div class="order_delivery" th:classappend="|delv_${order.cartDelvFeeCd}|">
-						<span class="dlvr_fee" th:if="${order.wmsDelvFee == 0}">배송비 무료</span>
-						<span class="dlvr_fee" th:if="${order.wmsDelvFee > 0}">배송비&nbsp;<em th:text="|배송비 ${#numbers.formatInteger(order.wmsDelvFee, 1, 'COMMA')}|"></em>원</span>
-						<a href="#" class="btn_popup_save" th:if="${order.wmsDelvFee > 0}">배송비 SAVE 상품 보기</a>
+					<!-- 자사 배송비 -->
+					<div class="goods_foot" style="margin-top:40px;">
+						<div class="order_delivery selfGoodsDelv" th:classappend="|delv_${order.cartDelvFeeCd}|">
+							<span class="dlvr_fee" th:if="${order.wmsDelvFee == 0}">배송비 무료</span>
+							<span class="dlvr_fee" th:if="${order.wmsDelvFee > 0}">배송비&nbsp;<em th:text="${#numbers.formatInteger(order.wmsDelvFee, 1, 'COMMA')}"></em>원</span>
+							<a href="#" class="btn_popup_save" th:if="${order.wmsDelvFee > 0}">배송비 SAVE 상품 보기</a>
+						</div>
 					</div>
 				</div>
-			</div>
 
 
-			<div class="sec_part" th:if="${delvCartList != null and delvCartList.size() > 0}">
-				<h3 class="subH2">업체직배송</h3>
-				<div class="area_part">
-					<th:block th:each="cart, status : ${delvCartList}">
-						<div class="part_goods">
-							<div class="goods_cont">
-								<!-- 주문상품 -->
-								<div class="goods_info cartInfo delvCartInfo">
-									<input type="hidden" name="applyQtySectionYn" th:value="${cart.applyQtySectionYn}" />
-									<input type="hidden" name="applyAmtSectionYn" th:value="${cart.applyAmtSectionYn}" />
-									<input type="hidden" name="qtyTmtbSq" th:value="${cart.qtyTmtbSq}" />
-									<input type="hidden" name="qtyTmtbNm" th:value="${cart.qtyTmtbNm}" />
-									<input type="hidden" name="amtTmtbSq" th:value="${cart.amtTmtbSq}" />
-									<input type="hidden" name="amtTmtbNm" th:value="${cart.amtTmtbNm}" />
-									<input type="hidden" name="currPrice" th:value="${cart.currPrice}" />
-									<input type="hidden" name="soldoutYn" th:value="${cart.soldoutYn}" />
-									<input type="hidden" name="tmtbDcAmt" th:value="${cart.tmtbDcAmt}" />
-									<input type="hidden" name="cartSq" th:value="${cart.cartSq}" />
-
-									<div class="order_desc">
-										<div class="form_box">
-											<div class="form_field">
-												<input th:id="|od_item_${cart.cartSq}|" name="cartSqArr" type="checkbox" th:value="${cart.cartSq}" th:checked="${cart.soldoutYn.equals('N')}" th:disabled="${cart.soldoutYn.equals('Y')}">
-												<label th:for="|od_item_${cart.cartSq}|">
-													<span class="sr-only">상품선택</span>
-												</label>
-											</div>
-										</div>
-										<div class="goods_box">
-											<div class="gd_item">
-												<a href="">
-													<span class="thumb"><img th:src="${IMG_PATH} + '/' + ${cart.sysImgNm}" src="/" width="100%" alt=""></span>
-													<p><span class="brand" th:text="|${cart.brandEnm} ${cart.brandKnm}|"></span></p>
-													<p><span class="name" th:text="${cart.goodsNm}"></span></p>
-												</a>
+				<div class="sec_part delvList" th:if="${order.delvCartList != null and order.delvCartList.size() > 0}">
+					<h3 class="subH2">업체직배송</h3>
+					<div class="area_part">
+						<th:block th:each="cart, status : ${order.delvCartList}">
+							<div class="part_goods">
+								<div class="goods_cont">
+									<!-- 주문상품 -->
+									<div class="cartInfo goods_info delvCartInfo">
+										<input type="hidden" name="applyQtySectionYn" th:value="${cart.applyQtySectionYn}" />
+										<input type="hidden" name="applyAmtSectionYn" th:value="${cart.applyAmtSectionYn}" />
+										<input type="hidden" name="qtyTmtbSq" th:value="${cart.qtyTmtbSq}" />
+										<input type="hidden" name="qtyTmtbNm" th:value="${cart.qtyTmtbNm}" />
+										<input type="hidden" name="amtTmtbSq" th:value="${cart.amtTmtbSq}" />
+										<input type="hidden" name="amtTmtbNm" th:value="${cart.amtTmtbNm}" />
+										<input type="hidden" name="currPrice" th:value="${cart.currPrice}" />
+										<input type="hidden" name="soldoutYn" th:value="${cart.soldoutYn}" />
+										<input type="hidden" name="tmtbDcAmt" th:value="${cart.tmtbDcAmt}" />
+										<input type="hidden" name="cartSq" th:value="${cart.cartSq}" />
+
+										<div class="order_desc">
+											<div class="form_box">
+												<div class="form_field">
+													<input th:id="|od_item_${cart.cartSq}|" name="cartSqArr" type="checkbox" th:value="${cart.cartSq}" th:checked="${cart.soldoutYn.equals('N')}" th:disabled="${cart.soldoutYn.equals('Y')}">
+													<label th:for="|od_item_${cart.cartSq}|">
+														<span class="sr-only">상품선택</span>
+													</label>
+												</div>
 											</div>
-											<div class="gd_opt">
-												<div class="option_wrap">
-													<span class="title sr-only">주문 옵션</span>
-													<th:block th:each="opt, index : ${cart.itemNmArr}">
-														<th:block th:if="${cart.goodsType.equals('G056_S')}">
-															<span class="option" th:text="${cart.itemNmArr[index.index]} + ' / ' + ${cart.colorNmArr[index.index]} + ' / ' + ${cart.optCd2Arr[index.index]}"></span>
-														</th:block>
-														<th:block th:if="${!cart.goodsType.equals('G056_S')}">
-															<span class="option" th:text="${cart.colorNmArr[index.index]} + ' / ' + ${cart.optCd2Arr[index.index]}"></span>
+											<div class="goods_box">
+												<div class="gd_item">
+													<a th:href="|javascript:fnGoToGoodsDetail('${cart.goodsCd}')|">
+														<span class="thumb"><img th:src="${IMG_PATH} + '/' + ${cart.sysImgNm}" src="/" width="100%" alt=""></span>
+														<p><span class="brand" th:text="|${cart.brandEnm} ${cart.brandKnm}|"></span></p>
+														<p><span class="name" th:text="${cart.goodsNm}"></span></p>
+													</a>
+												</div>
+												<div class="gd_opt">
+													<div class="option_wrap">
+														<span class="title sr-only">주문 옵션</span>
+														<th:block th:each="opt, index : ${cart.itemNmArr}">
+															<th:block th:if="${cart.goodsType.equals('G056_S')}">
+																<span class="option" th:text="${cart.itemNmArr[index.index]} + ' / ' + ${cart.colorNmArr[index.index]} + ' / ' + ${cart.optCd2Arr[index.index]}"></span>
+															</th:block>
+															<th:block th:if="${!cart.goodsType.equals('G056_S')}">
+																<span class="option" th:text="${cart.colorNmArr[index.index]} + ' / ' + ${cart.optCd2Arr[index.index]}"></span>
+															</th:block>
 														</th:block>
-													</th:block>
+													</div>
+												</div>
+												<div class="gd_calc">
+													<p><span class="count">수량&nbsp;<em th:text="${cart.goodsQty}"></em>개</span></p>
+												</div>
+												<div class="gd_exinfo">
+													<p th:if="${!#strings.isEmpty(cart.delvResDt)}" th:text="|${cart.delvResDt} 배송예정|"></p>
+													<p th:if="${cart.qtyTmtbSq > 0 and cart.applyQtySectionYn == 'Y'}" class="applyTmtb"><span class="tag primary">SALE</span>다다익선 할인 적용</p>
+													<p th:if="${cart.qtyTmtbSq > 0 and cart.applyQtySectionYn == 'N'}" class="notApplyTmtb"><a href="" class="btn_moresale"><span class="tag primary">SALE</span>다다익선 상품보기</a></p>
+													<p th:if="${cart.amtTmtbSq > 0 and cart.applyAmtSectionYn == 'Y'}" class="applyTmtb"><span class="tag primary">SALE</span>다다익선 할인 적용</p>
+													<p th:if="${cart.amtTmtbSq > 0 and cart.applyAmtSectionYn == 'N'}" class="notApplyTmtb"><a href="" class="btn_moresale"><span class="tag primary">SALE</span>다다익선 상품보기</a></p>
+													<p th:if="${cart.soldoutYn.equals('Y')}">해당 상품은 구매 불가능한 상품입니다.</p>
 												</div>
 											</div>
-											<div class="gd_calc">
-												<p><span class="count">수량&nbsp;<em th:text="${cart.goodsQty}"></em>개</span></p>
-											</div>
-											<div class="gd_exinfo">
-												<p th:if="${!#strings.isEmpty(cart.delvResDt)}" th:text="|${cart.delvResDt} 배송예정|"></p>
-												<p th:if="${cart.qtyTmtbSq > 0 and cart.applyQtySectionYn == 'Y'}"><span class="tag primary">SALE</span>다다익선 할인 적용</p>
-												<p th:if="${cart.amtTmtbSq > 0 and cart.applyAmtSectionYn == 'Y'}"><span class="tag primary">SALE</span>다다익선 할인 적용</p>
-												<p th:if="${cart.qtyTmtbSq > 0 and cart.applyQtySectionYn == 'N'}"><a href="" class="btn_moresale"><span class="tag primary">SALE</span>다다익선 상품보기</a></p>
-												<p th:if="${cart.amtTmtbSq > 0 and cart.applyAmtSectionYn == 'N'}"><a href="" class="btn_moresale"><span class="tag primary">SALE</span>다다익선 상품보기</a></p>
-												<p th:if="${cart.soldoutYn.equals('Y')}">해당 상품은 구매 불가능한 상품입니다.</p>
+											<div class="calc_box">
+												<th:block  th:if="${cart.tmtbDcAmt < cart.currPrice}">
+													<p><span class="price_org"><em th:text="${#numbers.formatInteger(cart.currPrice, 1, 'COMMA')}"></em>원</span></p>
+													<p><span class="price_sale"><em th:text="${#numbers.formatInteger(cart.tmtbDcAmt, 1, 'COMMA')}"></em>원</span></p>
+												</th:block>
+												<th:block th:if="${cart.tmtbDcAmt == cart.currPrice}">
+													<p><span class="price_sale"><em th:text="${#numbers.formatInteger(cart.currPrice, 1, 'COMMA')}"></em>원</span></p>
+												</th:block>
+												<p>
+													<span class="point">
+														<em th:text="${#numbers.formatInteger(cart.savePntAmt, 1, 'COMMA')}"></em><stong>P</stong>&nbsp;적립예정
+													</span>
+												</p>
 											</div>
-										</div>
-										<div class="calc_box">
-											<th:block  th:if="${cart.tmtbDcAmt < cart.currPrice}">
-												<p><span class="price_org"><em th:text="${#numbers.formatInteger(cart.currPrice, 1, 'COMMA')}"></em>원</span></p>
-												<p><span class="price_sale"><em th:text="${#numbers.formatInteger(cart.tmtbDcAmt, 1, 'COMMA')}"></em>원</span></p>
-											</th:block>
-											<th:block th:if="${cart.tmtbDcAmt == cart.currPrice}">
-												<p><span class="price_sale"><em th:text="${#numbers.formatInteger(cart.currPrice, 1, 'COMMA')}"></em>원</span></p>
-											</th:block>
-											<p>
-												<span class="point">
-													<em th:text="${#numbers.formatInteger(cart.savePntAmt, 1, 'COMMA')}"></em><stong>P</stong>&nbsp;적립예정
-												</span>
-											</p>
-										</div>
-										<div class="button_box">
-											<p th:if="${cart.soldoutYn.equals('Y')}"><button type="button" class="btn btn_dark btn_sm" disabled=""><span>구매 불가</span></button></p>
-											<p th:if="${cart.soldoutYn.equals('N')}"><button type="button" class="btn btn_primary btn_sm" th:onclick="|fnSubmitNoMember(${cart.cartSq})|"><span>바로 구매</span></button></p>
-
-											<p><button type="button" class="btn btn_default btn_sm" th:onclick="|fnChangeCartOptCd(${cart.cartSq})|"><span>옵션 / 수량 변경</span></button></p>
-											<div class="util">
-												<span>
-													<button type="button" class="btn_favorite" th:classappend="${cart.wishCnt > 0} ? active" onclick="cfnPutWishList(this)" th:goodsCd="${cart.goodsCd}" th:ithrCd="${cart.ithrCd}" th:contentsLoc="${cart.contentsLoc}">
-														<span><i class="ico ico_like2"></i><em class="sr-only">관심상품 추가</em></span>
-													</button>
-												</span>
-												<span>
-													<button type="button" class="btn_delete" th:onclick="|deleteCart(${cart.cartSq})|">
-														<span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span>
-													</button>
-												</span>
+											<div class="button_box">
+												<p th:if="${cart.soldoutYn.equals('Y')}"><button type="button" class="btn btn_dark btn_sm" disabled=""><span>구매 불가</span></button></p>
+												<p th:if="${cart.soldoutYn.equals('N')}"><button type="button" class="btn btn_primary btn_sm" th:onclick="|fnSubmitNoMember(${cart.cartSq})|"><span>바로 구매</span></button></p>
+
+												<p><button type="button" class="btn btn_default btn_sm" th:onclick="|fnChangeCartOptCd(${cart.cartSq})|"><span>옵션 / 수량 변경</span></button></p>
+												<div class="util">
+													<span>
+														<button type="button" class="btn_favorite" th:classappend="${cart.wishCnt > 0} ? active" onclick="cfnPutWishList(this)" th:goodsCd="${cart.goodsCd}" th:ithrCd="${cart.ithrCd}" th:contentsLoc="${cart.contentsLoc}">
+															<span><i class="ico ico_like2"></i><em class="sr-only">관심상품 추가</em></span>
+														</button>
+													</span>
+													<span>
+														<button type="button" class="btn_delete" th:onclick="|deleteCart(${cart.cartSq})|">
+															<span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span>
+														</button>
+													</span>
+												</div>
 											</div>
 										</div>
 									</div>
+									<!-- //주문상품 -->
 								</div>
-								<!-- //주문상품 -->
-							</div>
 
-							<!-- 입점업체 배송비 -->
-							<div class="goods_foot" th:if="${'Y'.equals(cart.addDelvFeeYn)}">
-							<!-- <div class="goods_foot" th:if="${cart.compCnt == status.index + 1}"> -->
-								<div class="order_delivery" th:classappend="|delv_${cart.delvFeeCd}|">
-									<span class="dlvr_fee" th:if="${cart.delvFee == 0}">배송비 무료</span>
-									<span class="dlvr_fee" th:if="${cart.delvFee > 0}">배송비&nbsp;<em th:text="${#numbers.formatInteger(cart.delvFee, 1, 'COMMA')}"></em>원</span>
-									<span class="dlvr_shop"><em th:text="${cart.supplyCompNm}"></em>&nbsp;업체직배송</span>
-									<a href="#" class="btn_popup_save" th:if="${cart.delvFee > 0}">배송비 SAVE 상품 보기</a>
+								<!-- 입점업체 배송비 -->
+								<div class="goods_foot" th:if="${'Y'.equals(cart.addDelvFeeYn)}">
+								<!-- <div class="goods_foot" th:if="${cart.compCnt == status.index + 1}"> -->
+									<div class="order_delivery" th:classappend="|delv_${cart.delvFeeCd}|">
+										<span class="dlvr_fee" th:if="${cart.delvFee == 0}">배송비 무료</span>
+										<span class="dlvr_fee" th:if="${cart.delvFee > 0}">배송비&nbsp;<em th:text="${#numbers.formatInteger(cart.delvFee, 1, 'COMMA')}"></em>원</span>
+										<span class="dlvr_shop"><em th:text="${cart.supplyCompNm}"></em>&nbsp;업체직배송</span>
+										<a href="#" class="btn_popup_save" th:if="${cart.delvFee > 0}">배송비 SAVE 상품 보기</a>
+									</div>
 								</div>
 							</div>
-						</div>
-					</th:block>
+						</th:block>
+					</div>
 				</div>
 			</div>
 		</div>
-	</div>
-	<div class="od_side">
-		<div class="area_order">
-			<div class="tit_box">
-				<h3>결제 정보</h3>
-				<span><em class="number" th:text="${order.totCartCnt}"></em>개의 상품</span>
+		<div class="od_side">
+			<div class="area_order">
+				<div class="tit_box">
+					<h3>결제 정보</h3>
+					<span><em class="number" th:text="${order.totCartCnt}"></em>개의 상품</span>
+				</div>
+				<div class="od_amount_box">
+					<dl>
+						<div>
+							<dt>상품금액</dt>
+							<dd><em class="sumCurrPrice" th:text="${#numbers.formatInteger(order.sumOrdAmt, 1, 'COMMA')}"></em>원</dd>
+						</div>
+						<div>
+							<dt>배송비</dt>
+							<dd><em class="totDelvFee" th:text="${#numbers.formatInteger(order.totDelvFee, 1, 'COMMA')}"></em> 원</dd>
+						</div>
+						<div>
+							<dt>할인금액</dt>
+							<dd><span class="disc_amount"><em class="totDcAmt" id="totDcAmt" th:text="${#numbers.formatInteger(order.totDcAmt, 1, 'COMMA')}"></em> 원</span></dd>
+						</div>
+					</dl>
+				</div>
+				<div class="totalprice_box">
+					<dl>
+						<dt>총 결제 예정 금액</dt>
+						<dd><span class="sumRealPayAmt" id="sumRealPayAmt" th:text="${#numbers.formatInteger(order.sumRealPayAmt + order.totDelvFee, 1, 'COMMA')}"></span> 원</dd>
+					</dl>
+				</div>
+				<div class="btn_box">
+					<button class="btn btn_primary btn_block btn_md" onclick="fnSubmitNoMember('all')"><span>구매하기</span></button>
+				</div>
 			</div>
-			<div class="od_amount_box">
-				<dl>
-					<div>
-						<dt>상품금액</dt>
-						<dd><em class="sumCurrPrice" th:text="${#numbers.formatInteger(order.sumOrdAmt, 1, 'COMMA')}"></em>원</dd>
+			<div class="area_salecoupon">
+				<h4>할인코드 입력</h4>
+				<div class="form_field">
+					<div class="input_wrap form_full">
+						<label class="input_label sr-only">할인코드입력</label>
+						<input type="text" id="serialCpnNm" class="form_control" placeholder="할인코드를 입력해주세요.">
 					</div>
-					<div>
-						<dt>배송비</dt>
-						<dd><em class="totDelvFee" th:text="${#numbers.formatInteger(order.totDelvFee, 1, 'COMMA')}"></em> 원</dd>
-					</div>
-					<div>
-						<dt>할인금액</dt>
-						<dd><span class="disc_amount"><em class="totDcAmt" id="totDcAmt" th:text="${#numbers.formatInteger(order.totDcAmt, 1, 'COMMA')}"></em> 원</span></dd>
-					</div>
-				</dl>
-			</div>
-			<div class="totalprice_box">
-				<dl>
-					<dt>총 결제 예정 금액</dt>
-					<dd><span class="sumRealPayAmt" id="sumRealPayAmt" th:text="${#numbers.formatInteger(order.sumRealPayAmt + order.totDelvFee, 1, 'COMMA')}"></span> 원</dd>
-				</dl>
-			</div>
-			<div class="btn_box">
-				<button class="btn btn_primary btn_block btn_md" onclick="fnSubmitNoMember('all')"><span>구매하기</span></button>
-			</div>
-		</div>
-		<div class="area_salecoupon">
-			<h4>할인코드 입력</h4>
-			<div class="form_field">
-				<div class="input_wrap form_full">
-					<label class="input_label sr-only">할인코드입력</label>
-					<input type="text" id="serialCpnNm" class="form_control" placeholder="할인코드를 입력해주세요.">
+					<button type="button" class="btn btn_dark btn_sm" onclick="serialCpnApply()"><span>적용</span></button>
 				</div>
-				<button type="button" class="btn btn_dark btn_sm" onclick="serialCpnApply()"><span>적용</span></button>
-			</div>
-			<div class="coupon_box">
-				<div class="coupon">
-					<div>
-						<p class="cp_name">
-							TBJ 시즌오프 20% 할인쿠폰
-						</p>
-						<p class="cp_cont">
-							<!--<span><em>12,399,900</em>원</span>
-							<span><em>40</em>%</span>-->
-							<span class="cp_dc_val"></span>
-						</p>
-						<p class="cp_condition">
-							<!--500,000원 이상 구매 시 최대 50,000원 할인
-							<span><em class="tag primary_line">99장 보유</em></span>-->
+				<div class="coupon_box">
+					<div class="coupon">
+						<div>
+							<p class="cp_name">
+								TBJ 시즌오프 20% 할인쿠폰
+							</p>
+							<p class="cp_cont">
+								<!--<span><em>12,399,900</em>원</span>
+								<span><em>40</em>%</span>-->
+								<span class="cp_dc_val"></span>
+							</p>
+							<p class="cp_condition">
+								<!--500,000원 이상 구매 시 최대 50,000원 할인
+								<span><em class="tag primary_line">99장 보유</em></span>-->
+							</p>
+						</div>
+						<p class="cp_date">
+							<span>2021.01.01</span>&nbsp;~&nbsp;<span>2021.12.30</span>
 						</p>
 					</div>
-					<p class="cp_date">
-						<span>2021.01.01</span>&nbsp;~&nbsp;<span>2021.12.30</span>
-					</p>
+					<button type="button" class="btn_underline" id="btn_couponInfo_pop">
+						<span>사용안내</span>
+					</button>
 				</div>
-				<button type="button" class="btn_underline" id="btn_couponInfo_pop">
-					<span>사용안내</span>
-				</button>
 			</div>
 		</div>
-	</div>
-	<div class="clear"></div>
-	<!-- // CONT-BODY -->
-</form>
-
-<!-- 옵션변경 팝업 -->
-<div class="modal fade od_pop opt_modify_pop" id="optModifyPop" tabindex="-1" role="dialog" aria-labelledby="optModifyLabel" aria-hidden="true"></div>
-<!-- //옵션변경 팝업 -->
-
-<!-- 즉시구매 form -->
-<form id="cartInfoForm" method="post" action="/order/noMember"></form>
-
-<script th:inline="javascript">
-	let sumRealPayAmt = [[${order.sumRealPayAmt + order.totDelvFee}]];
-	let totDcAmt = [[${order.totDcAmt}]];
-
-	function NotApplyTmtbCartList() {
-		let tmtbSq = 0;
-		let tmtbNm = "";
-		let goodsList = {
-			brandNm : "",
-			goodsNm : "",
-			currPrice : 0,
-			imgPath : ""
-		}
-	}
-
-	$(document).ready(function() {
-		/*let compsList = [];
-		let temp 			= new Object;
-		temp.goodsCd 		= "AOW13QDM76";
-		temp.optCd 			= "13256848-4";
-		temp.goodsQty 		= 1;
-		temp.goodsType 		= "G056_N";
-		temp.cartGb 		= "C";
-		temp.afLinkCd 		= "afLinkCd";
-		temp.ithrCd 		= "G027_ZZZ";
-		temp.contentsLoc 	= "G028_YYY";
-		temp.planDtlSq 		= "123";
-		compsList.push(temp);
-		cfnAddCart(compsList);*/
-
-		if([[${!order.shotCanYn.equals('Y')}]]) {
-			// $(".shotDelvSelect").hide();
-		}
-
-		$("#cartListForm .area_salecoupon .coupon_box").hide();
-
-		let loginInfo = [[${loginInfo}]];
-		if(!loginInfo || loginInfo.custNo == null || loginInfo.custNo == 0) {
-			$("#cartListForm .area_salecoupon").hide();
+		<div class="clear"></div>
+		<!-- // CONT-BODY -->
+	</form>
+
+	<!-- 옵션변경 팝업 -->
+	<div class="modal fade od_pop opt_modify_pop" id="optModifyPop" tabindex="-1" role="dialog" aria-labelledby="optModifyLabel" aria-hidden="true"></div>
+	<!-- //옵션변경 팝업 -->
+
+	<!-- 즉시구매 form -->
+	<form id="cartInfoForm" method="post" action="/order/noMember"></form>
+
+	<script th:inline="javascript">
+		let sumRealPayAmt = [[${order.sumRealPayAmt + order.totDelvFee}]];
+		let totDcAmt = [[${order.totDcAmt}]];
+
+		function NotApplyTmtbCartList() {
+			let tmtbSq = 0;
+			let tmtbNm = "";
+			let goodsList = {
+				brandNm : "",
+				goodsNm : "",
+				currPrice : 0,
+				imgPath : ""
+			}
 		}
 
-		// 다다익선 할인 대상(미적용) 리스트
-		notApplyTmtbAreaList();
-
-		/* 세트상품 장바구니 */
-		/*let compsList = [];
-		let temp = new Object;
-		temp.goodsCd = "STYS00000002";
-		temp.itemCd = "CMW1GQJM91";
-		temp.optCd = "10127856-3";
-		temp.goodsQty = 1;
-		temp.goodsType = "G056_S";
-		temp.cartGb = "C";
-		temp.afLinkCd = "afLinkCd";
-		temp.ithrCd = "G027_ZZZ";
-		temp.contentsLoc = "G028_YYY";
-		temp.planDtlSq = "123";
-		compsList.push(temp);
-		temp = new Object;
-		temp.goodsCd = "STYS00000002";
-		temp.itemCd = "CMW0GQTS53";
-		temp.optCd = "10127620-2";
-		temp.goodsQty = 1;
-		temp.goodsType = "G056_S";
-		temp.cartGb = "C";
-		temp.afLinkCd = "afLinkCd";
-		temp.ithrCd = "G027_ZZZ";
-		temp.contentsLoc = "G028_YYY";
-		temp.planDtlSq = "123";
-		compsList.push(temp);
-		temp = new Object;
-		temp.goodsCd = "STYS00000002";
-		temp.itemCd = "CNF1GADN51";
-		temp.optCd = "11873201-4";
-		temp.goodsQty = 1;
-		temp.goodsType = "G056_S";
-		temp.cartGb = "C";
-		temp.afLinkCd = "afLinkCd";
-		temp.ithrCd = "G027_ZZZ";
-		temp.contentsLoc = "G028_YYY";
-		temp.planDtlSq = "123";
-		compsList.push(temp);
-
-		cfnAddCart(compsList);*/
-
-		/*let compsList = [];
-		let temp = new Object;
-		temp.goodsCd = "14373686";
-		temp.optCd = "챠콜그레이150";
-		temp.goodsQty = 2;
-		temp.goodsType = "G056_D";
-		temp.dealGoodsCd = "STYD000000025"
-		temp.cartGb = "O";
-		temp.afLinkCd = "afLinkCd";
-		temp.ithrCd = "G027_ZZZ";
-		temp.contentsLoc = "G028_YYY";
-		temp.planDtlSq = "123";
-		compsList.push(temp);
-
-		temp = new Object;
-		temp.goodsCd = "14373710";
-		temp.optCd = "L핑크130";
-		temp.goodsQty = 3;
-		temp.goodsType = "G056_D";
-		temp.dealGoodsCd = "STYD000000025"
-		temp.cartGb = "O";
-		temp.afLinkCd = "afLinkCd";
-		temp.ithrCd = "G027_ZZZ";
-		temp.contentsLoc = "G028_YYY";
-		temp.planDtlSq = "123";
-		compsList.push(temp);
-
-		cfnAddCart(compsList);*/
-	});
-
-	function notApplyTmtbAreaList() {
-		let notApplyQtyTmtbList = new Array();
-		let notApplyAmtTmtbList = new Array();
-
-		// 수량 다다익선 조회
-		$("#cartListForm input[name=qtyTmtbSq]").each(function (index) {
-			if($(this).val() != "0" && $(this).parent().find("input[name=applyQtySectionYn]").val() == "N") {
-				let obj = new Object();
-				obj.tmtbSq = $(this).val();
-				obj.tmtbNm = $(this).parent().find("input[name=qtyTmtbNm]").val();
-				obj.currPrice = $(this).parent().find("input[name=currPrice]").val();
-				obj.goodsNm = $(this).parent().find(".info_box").find(".name").text();
-				obj.brandNm = $(this).parent().find(".info_box").find(".brand").text();
-				obj.imgPath = $(this).parent().find(".info_item").find(".thumb_box img").attr("src");
-
-				notApplyQtyTmtbList.push(obj);
+		$(document).ready(function() {
+			/*let compsList = [];
+			let temp 			= new Object;
+			temp.goodsCd 		= "AOW13QDM76";
+			temp.optCd 			= "13256848-4";
+			temp.goodsQty 		= 1;
+			temp.goodsType 		= "G056_N";
+			temp.cartGb 		= "C";
+			temp.afLinkCd 		= "afLinkCd";
+			temp.ithrCd 		= "G027_ZZZ";
+			temp.contentsLoc 	= "G028_YYY";
+			temp.planDtlSq 		= "123";
+			compsList.push(temp);
+			cfnAddCart(compsList);*/
+
+			if([[${!order.shotCanYn.equals('Y')}]]) {
+				$(".shotDelvSelect").hide();
 			}
 
-			if($(this).parent().find("input[name=applyAmtSectionYn]").val() == "N") {	   // 다다익선 금액은 기본상품만 가져오면됨 (N은 기본상품에 걸려있음)
-				let obj = new Object();
-				obj.tmtbSq = $(this).parent().find("input[name=amtTmtbSq]").val();
-				obj.tmtbNm = $(this).parent().find("input[name=amtTmtbNm]").val();
+			$("#cartListForm .area_salecoupon .coupon_box").hide();
 
-				notApplyAmtTmtbList.push(obj);
+			let loginInfo = [[${loginInfo}]];
+			if(!loginInfo || loginInfo.custNo == null || loginInfo.custNo == 0) {
+				$("#cartListForm .area_salecoupon").hide();
 			}
+
+			// 다다익선 할인 대상(미적용) 리스트
+			notApplyTmtbAreaList();
+
+			/* 세트상품 장바구니 */
+			/*let compsList = [];
+			let temp = new Object;
+			temp.goodsCd = "STYS00000002";
+			temp.itemCd = "CMW1GQJM91";
+			temp.optCd = "10127856-3";
+			temp.goodsQty = 1;
+			temp.goodsType = "G056_S";
+			temp.cartGb = "C";
+			temp.afLinkCd = "afLinkCd";
+			temp.ithrCd = "G027_ZZZ";
+			temp.contentsLoc = "G028_YYY";
+			temp.planDtlSq = "123";
+			compsList.push(temp);
+			temp = new Object;
+			temp.goodsCd = "STYS00000002";
+			temp.itemCd = "CMW0GQTS53";
+			temp.optCd = "10127620-2";
+			temp.goodsQty = 1;
+			temp.goodsType = "G056_S";
+			temp.cartGb = "C";
+			temp.afLinkCd = "afLinkCd";
+			temp.ithrCd = "G027_ZZZ";
+			temp.contentsLoc = "G028_YYY";
+			temp.planDtlSq = "123";
+			compsList.push(temp);
+			temp = new Object;
+			temp.goodsCd = "STYS00000002";
+			temp.itemCd = "CNF1GADN51";
+			temp.optCd = "11873201-4";
+			temp.goodsQty = 1;
+			temp.goodsType = "G056_S";
+			temp.cartGb = "C";
+			temp.afLinkCd = "afLinkCd";
+			temp.ithrCd = "G027_ZZZ";
+			temp.contentsLoc = "G028_YYY";
+			temp.planDtlSq = "123";
+			compsList.push(temp);
+
+			cfnAddCart(compsList);*/
+
+			/*let compsList = [];
+			let temp = new Object;
+			temp.goodsCd = "14373686";
+			temp.optCd = "챠콜그레이150";
+			temp.goodsQty = 2;
+			temp.goodsType = "G056_D";
+			temp.dealGoodsCd = "STYD000000025"
+			temp.cartGb = "O";
+			temp.afLinkCd = "afLinkCd";
+			temp.ithrCd = "G027_ZZZ";
+			temp.contentsLoc = "G028_YYY";
+			temp.planDtlSq = "123";
+			compsList.push(temp);
+
+			temp = new Object;
+			temp.goodsCd = "14373710";
+			temp.optCd = "L핑크130";
+			temp.goodsQty = 3;
+			temp.goodsType = "G056_D";
+			temp.dealGoodsCd = "STYD000000025"
+			temp.cartGb = "O";
+			temp.afLinkCd = "afLinkCd";
+			temp.ithrCd = "G027_ZZZ";
+			temp.contentsLoc = "G028_YYY";
+			temp.planDtlSq = "123";
+			compsList.push(temp);
+
+			cfnAddCart(compsList);*/
 		});
 
-		// 수량 다다익선 정렬
-		var t = new Object();
-		for (let i = 0; i < notApplyQtyTmtbList.length; i++) {
-			for (let j = 0; j < notApplyQtyTmtbList.length - i - 1; j++) {
-				if (notApplyQtyTmtbList[j].tmtbSq > notApplyQtyTmtbList[j + 1].tmtbSq) {
-					t = notApplyQtyTmtbList[j];
-					notApplyQtyTmtbList[j] = notApplyQtyTmtbList[j + 1];
-					notApplyQtyTmtbList[j + 1] = t;
+		function notApplyTmtbAreaList() {
+			/*let notApplyQtyTmtbList = new Array();
+			let notApplyAmtTmtbList = new Array();
+
+			// 수량 다다익선 조회
+			$("#cartListForm input[name=qtyTmtbSq]").each(function (index) {
+				if($(this).val() != "0" && $(this).parent().find("input[name=applyQtySectionYn]").val() == "N") {
+					let obj = new Object();
+					obj.tmtbSq = $(this).val();
+					obj.tmtbNm = $(this).parent().find("input[name=qtyTmtbNm]").val();
+					obj.currPrice = $(this).parent().find("input[name=currPrice]").val();
+					obj.goodsNm = $(this).parent().find(".info_box").find(".name").text();
+					obj.brandNm = $(this).parent().find(".info_box").find(".brand").text();
+					obj.imgPath = $(this).parent().find(".info_item").find(".thumb_box img").attr("src");
+
+					notApplyQtyTmtbList.push(obj);
 				}
-			}
-		}
 
-		fnCreateNotApplyTmtbAreaList(notApplyQtyTmtbList, notApplyAmtTmtbList);
-	}
-
-	function fnCreateNotApplyTmtbAreaList(notApplyQtyTmtbList, notApplyAmtTmtbList) {
-		// 정렬 후 같은 다다익선 상품은 한 배열로 묶음
-		let tmtbQtyList = new Array();
-
-		for (let i = 0; i < notApplyQtyTmtbList.length; i++) {
-			let goods = notApplyQtyTmtbList[i];
-			let tmtbInfo = new Object();
-			let chk = false;
-			for (let j = 0; j < tmtbQtyList.length; j++) {
-				let tmtb = tmtbQtyList[j];
-				if (goods.tmtbSq == tmtb.tmtbSq) {
-					tmtbInfo = tmtbQtyList[j];
-					chk = true;
-				}
-			}
+				if($(this).parent().find("input[name=applyAmtSectionYn]").val() == "N") {	   // 다다익선 금액은 기본상품만 가져오면됨 (N은 기본상품에 걸려있음)
+					let obj = new Object();
+					obj.tmtbSq = $(this).parent().find("input[name=amtTmtbSq]").val();
+					obj.tmtbNm = $(this).parent().find("input[name=amtTmtbNm]").val();
 
-			// 현재 상품 정보
-			let goodsInfo = new Object();
-			goodsInfo.brandNm = goods.brandNm;
-			goodsInfo.goodsNm = goods.goodsNm;
-			goodsInfo.imgPath = goods.imgPath;
-			goodsInfo.currPrice = goods.currPrice;
+					notApplyAmtTmtbList.push(obj);
+				}
+			});
 
-			// 현재 상품 정보 다다익선 정보에 세팅
-			if (chk) {
-				tmtbInfo.goodsList.push(goodsInfo);
-			} else {
-				let obj = new Object();
-				obj.tmtbSq = goods.tmtbSq;
-				obj.tmtbNm = goods.tmtbNm;
-				obj.goodsList = new Array();
-				obj.goodsList.push(goodsInfo);
-				tmtbQtyList.push(obj);
+			// 수량 다다익선 정렬
+			var t = new Object();
+			for (let i = 0; i < notApplyQtyTmtbList.length; i++) {
+				for (let j = 0; j < notApplyQtyTmtbList.length - i - 1; j++) {
+					if (notApplyQtyTmtbList[j].tmtbSq > notApplyQtyTmtbList[j + 1].tmtbSq) {
+						t = notApplyQtyTmtbList[j];
+						notApplyQtyTmtbList[j] = notApplyQtyTmtbList[j + 1];
+						notApplyQtyTmtbList[j + 1] = t;
+					}
+				}
 			}
+
+			fnCreateNotApplyTmtbAreaList(notApplyQtyTmtbList, notApplyAmtTmtbList);*/
 		}
 
-		// 수량 다다익선 HTML 작성
-		let tmtbHtml = "";
-		for(let i = 0 ; i < tmtbQtyList.length ; i++) {
-			let tmtb = tmtbQtyList[i];
-			tmtbHtml += '<div class="more_sale qtyNotApplyTmtbList">';
-			for(let j = 0 ; j < tmtb.goodsList.length ; j++) {
-				let goods = tmtb.goodsList[j];
-				tmtbHtml += '<div class="item_gd">\n' +
-					'				<figure>\n' +
-					'					<a href="">\n' +
-					'						<span class="thumb"><img src="';
-				tmtbHtml += goods.imgPath;
-				tmtbHtml += '" alt=""></span>\n' +
-					'					</a>\n' +
-					'					<figcaption>\n' +
-					'						<a href="">\n' +
-					'							<div class="brand">';
-				tmtbHtml += goods.brandNm;
-				tmtbHtml += '</div>\n' +
-					'							<div class="name">';
-				tmtbHtml += goods.goodsNm;
-				tmtbHtml += '</div>\n' +
-					'							<div class="price">\n' +
-					'								<span class="selling_price">';
-				tmtbHtml += Number(goods.currPrice).toLocaleString();
-				tmtbHtml += '</span>\n' +
-					'							</div>\n' +
-					'						</a>\n' +
-					'					</figcaption>\n' +
-					'				</figure>\n' +
-					'			</div>';
+		/*function fnCreateNotApplyTmtbAreaList(notApplyQtyTmtbList, notApplyAmtTmtbList) {
+			// 정렬 후 같은 다다익선 상품은 한 배열로 묶음
+			let tmtbQtyList = new Array();
+
+			for (let i = 0; i < notApplyQtyTmtbList.length; i++) {
+				let goods = notApplyQtyTmtbList[i];
+				let tmtbInfo = new Object();
+				let chk = false;
+				for (let j = 0; j < tmtbQtyList.length; j++) {
+					let tmtb = tmtbQtyList[j];
+					if (goods.tmtbSq == tmtb.tmtbSq) {
+						tmtbInfo = tmtbQtyList[j];
+						chk = true;
+					}
+				}
+
+				// 현재 상품 정보
+				let goodsInfo = new Object();
+				goodsInfo.brandNm = goods.brandNm;
+				goodsInfo.goodsNm = goods.goodsNm;
+				goodsInfo.imgPath = goods.imgPath;
+				goodsInfo.currPrice = goods.currPrice;
+
+				// 현재 상품 정보 다다익선 정보에 세팅
+				if (chk) {
+					tmtbInfo.goodsList.push(goodsInfo);
+				} else {
+					let obj = new Object();
+					obj.tmtbSq = goods.tmtbSq;
+					obj.tmtbNm = goods.tmtbNm;
+					obj.goodsList = new Array();
+					obj.goodsList.push(goodsInfo);
+					tmtbQtyList.push(obj);
+				}
 			}
 
-			tmtbHtml += '<div class="txt">\n' +
-				'				<a href="">\n' +
-				'					<i class="ico ico_saletag"></i>\n' +
-				'					<input type="hidden" name="tmtbSq" value="' + tmtb.tmtbSq + '" />' +
-				'					<span>\n';
-			tmtbHtml += tmtb.tmtbNm;
-			tmtbHtml += '</span>\n' +
-				'				</a>\n' +
-				'			</div>\n' +
-				'		</div>';
-		}
+			// 수량 다다익선 HTML 작성
+			let tmtbHtml = "";
+			for(let i = 0 ; i < tmtbQtyList.length ; i++) {
+				let tmtb = tmtbQtyList[i];
+				tmtbHtml += '<div class="more_sale qtyNotApplyTmtbList">';
+				for(let j = 0 ; j < tmtb.goodsList.length ; j++) {
+					let goods = tmtb.goodsList[j];
+					tmtbHtml += '<div class="item_gd">\n' +
+						'				<figure>\n' +
+						'					<a href="">\n' +
+						'						<span class="thumb"><img src="';
+					tmtbHtml += goods.imgPath;
+					tmtbHtml += '" alt=""></span>\n' +
+						'					</a>\n' +
+						'					<figcaption>\n' +
+						'						<a href="">\n' +
+						'							<div class="brand">';
+					tmtbHtml += goods.brandNm;
+					tmtbHtml += '</div>\n' +
+						'							<div class="name">';
+					tmtbHtml += goods.goodsNm;
+					tmtbHtml += '</div>\n' +
+						'							<div class="price">\n' +
+						'								<span class="selling_price">';
+					tmtbHtml += Number(goods.currPrice).toLocaleString();
+					tmtbHtml += '</span>\n' +
+						'							</div>\n' +
+						'						</a>\n' +
+						'					</figcaption>\n' +
+						'				</figure>\n' +
+						'			</div>';
+				}
 
-		// 금액 다다익선 정보 HTML 작성
-		for(let i = 0 ; i < notApplyAmtTmtbList.length ; i++) {
-			if (notApplyAmtTmtbList[i].tmtbSq != 0) {
-				let tmtb = notApplyAmtTmtbList[i];
-				tmtbHtml += '<div class="more_sale amtNotApplyTmtbList">\n' +
-					'			<div class="txt">\n' +
+				tmtbHtml += '<div class="txt">\n' +
 					'				<a href="">\n' +
 					'					<i class="ico ico_saletag"></i>\n' +
 					'					<input type="hidden" name="tmtbSq" value="' + tmtb.tmtbSq + '" />' +
-					'					<span>';
+					'					<span>\n';
 				tmtbHtml += tmtb.tmtbNm;
 				tmtbHtml += '</span>\n' +
 					'				</a>\n' +
 					'			</div>\n' +
 					'		</div>';
 			}
-		}
 
-		if(tmtbHtml != "") {
-			tmtbHtml = "<h4>다다익선 할인 대상이 있습니다.</h4>" + tmtbHtml;
-		}
+			// 금액 다다익선 정보 HTML 작성
+			for(let i = 0 ; i < notApplyAmtTmtbList.length ; i++) {
+				if (notApplyAmtTmtbList[i].tmtbSq != 0) {
+					let tmtb = notApplyAmtTmtbList[i];
+					tmtbHtml += '<div class="more_sale amtNotApplyTmtbList">\n' +
+						'			<div class="txt">\n' +
+						'				<a href="">\n' +
+						'					<i class="ico ico_saletag"></i>\n' +
+						'					<input type="hidden" name="tmtbSq" value="' + tmtb.tmtbSq + '" />' +
+						'					<span>';
+					tmtbHtml += tmtb.tmtbNm;
+					tmtbHtml += '</span>\n' +
+						'				</a>\n' +
+						'			</div>\n' +
+						'		</div>';
+				}
+			}
 
-		$(".area_saleitem").html(tmtbHtml);
-	}
-
-	function cancelCartCpn() {
-		$("#cartListForm #sumRealPayAmt").text(Number(sumRealPayAmt).toLocaleString());
-		$("#cartListForm #totDcAmt").text(Number(totDcAmt).toLocaleString());
-		$("#cartListForm .area_salecoupon .coupon_box").hide();
-	}
-
-	function serialCpnApply() {
-		let cartArr = [];
-		let currPrices = [];
-		$("#cartListForm input[name=cartSqArr]:checked").each(function(index, item) {
-			cartArr.push($(this).val());
-			currPrices.push($(this).parents(".cartInfo").find("input[name=tmtbDcAmt]").val());
-		});
+			if(tmtbHtml != "") {
+				tmtbHtml = "<h4>다다익선 할인 대상이 있습니다.</h4>" + tmtbHtml;
+			}
+
+			$(".area_saleitem").html(tmtbHtml);
+		}*/
 
-		let data = {
-			rdCpnNm : $("#cartListForm #serialCpnNm").val(),
-			cartSqArr : cartArr,
-			currPrices : currPrices
+		function cancelCartCpn() {
+			$("#cartListForm #sumRealPayAmt").text(Number(sumRealPayAmt).toLocaleString());
+			$("#cartListForm #totDcAmt").text(Number(totDcAmt).toLocaleString());
+			$("#cartListForm .area_salecoupon .coupon_box").hide();
 		}
 
-		let jsonData = JSON.stringify(data);
-
-		$.ajax( {
-			type: "POST",
-			url : '/cart/list/serialCpnApply',
-			contentType: 'application/json',
-			dataType : 'json',
-			data : jsonData,
-			success : function(result) {
-				if(result.serialCpnInfo.result == "SUCCESS") {
-					$("#cartListForm .area_salecoupon .coupon_box").show();
-
-					// 합계 금액
-					$("#cartListForm #sumRealPayAmt").text(Number(sumRealPayAmt - result.serialCpnInfo.dcAmt).toLocaleString());
-					$("#cartListForm #totDcAmt").text(Number(totDcAmt - result.serialCpnInfo.dcAmt).toLocaleString());
-
-					// 쿠폰 정보
-					$("#cartListForm .area_salecoupon .cp_name").text(result.serialCpnInfo.cpnNm);
-					$("#cartListForm .area_salecoupon .cp_condition").html(result.serialCpnInfo.cpnDesc + "<span><em class='tag'>1장 보유</em></span>");
-					$("#cartListForm .area_salecoupon .availStdt").text(result.serialCpnInfo.availStdt);
-					$("#cartListForm .area_salecoupon .availEddt").text(result.serialCpnInfo.availEddt);
-					if (result.serialCpnInfo.dcWay == "G240_10") {
-						$("#cartListForm .area_salecoupon .cp_dc_val").html("<em>" + Number(result.serialCpnInfo.dcVal).toLocaleString() + "</em> 원");
-					} else if (result.serialCpnInfo.dcWay == "G240_11") {
-						$("#cartListForm .area_salecoupon .cp_dc_val").html("<em>" + result.serialCpnInfo.dcVal + "%</em>");
+		function serialCpnApply() {
+			let cartArr = [];
+			let currPrices = [];
+			$("#cartListForm input[name=cartSqArr]:checked").each(function(index, item) {
+				cartArr.push($(this).val());
+				currPrices.push($(this).parents(".cartInfo").find("input[name=tmtbDcAmt]").val());
+			});
+
+			let data = {
+				rdCpnNm : $("#cartListForm #serialCpnNm").val(),
+				cartSqArr : cartArr,
+				currPrices : currPrices
+			}
+
+			let jsonData = JSON.stringify(data);
+
+			$.ajax( {
+				type: "POST",
+				url : '/cart/list/serialCpnApply',
+				contentType: 'application/json',
+				dataType : 'json',
+				data : jsonData,
+				success : function(result) {
+					if(result.serialCpnInfo.result == "SUCCESS") {
+						$("#cartListForm .area_salecoupon .coupon_box").show();
+
+						// 합계 금액
+						$("#cartListForm #sumRealPayAmt").text(Number(sumRealPayAmt - result.serialCpnInfo.dcAmt).toLocaleString());
+						$("#cartListForm #totDcAmt").text(Number(totDcAmt - result.serialCpnInfo.dcAmt).toLocaleString());
+
+						// 쿠폰 정보
+						$("#cartListForm .area_salecoupon .cp_name").text(result.serialCpnInfo.cpnNm);
+						$("#cartListForm .area_salecoupon .cp_condition").html(result.serialCpnInfo.cpnDesc + "<span><em class='tag'>1장 보유</em></span>");
+						$("#cartListForm .area_salecoupon .availStdt").text(result.serialCpnInfo.availStdt);
+						$("#cartListForm .area_salecoupon .availEddt").text(result.serialCpnInfo.availEddt);
+						if (result.serialCpnInfo.dcWay == "G240_10") {
+							$("#cartListForm .area_salecoupon .cp_dc_val").html("<em>" + Number(result.serialCpnInfo.dcVal).toLocaleString() + "</em> 원");
+						} else if (result.serialCpnInfo.dcWay == "G240_11") {
+							$("#cartListForm .area_salecoupon .cp_dc_val").html("<em>" + result.serialCpnInfo.dcVal + "%</em>");
+						}
+					} else {
+						mcxDialog.alert(result.serialCpnInfo.result);
 					}
-				} else {
-					mcxDialog.alert(result.serialCpnInfo.result);
 				}
-			}
+			});
+		}
+
+		//다다익선 적용내역 보기
+		$(document).on('click','.shopping_bag .part_deliver .btn_moresale',function(e){
+			$(this).toggleClass('active');
+			$(this).parents('.od_moresale').find('.li_moresale').toggle();
+			return false;
 		});
-	}
-
-	//다다익선 적용내역 보기
-	$(document).on('click','.shopping_bag .part_deliver .btn_moresale',function(e){
-		$(this).toggleClass('active');
-		$(this).parents('.od_moresale').find('.li_moresale').toggle();
-		return false;
-	});
-
-	//관심상품 등록
-	$(document).on('click','.shopping_bag .part_deliver .btn_favorite',function(e){
-		$(this).toggleClass('active');
-		return false;
-	});
-
-	function deleteCartAjax(cartArr) {
-		if(cartArr.length < 1) {
-			mcxDialog.alert("삭제하실 상품을 선택해 주세요.");
+
+		//관심상품 등록
+		$(document).on('click','.shopping_bag .part_deliver .btn_favorite',function(e){
+			$(this).toggleClass('active');
 			return false;
-		}
+		});
+
+		function deleteCartAjax(cartArr) {
+			if(cartArr.length < 1) {
+				mcxDialog.alert("삭제하실 상품을 선택해 주세요.");
+				return false;
+			}
+
+			let data = {
+				cartSqArr : cartArr
+			}
 
-		let data = {
-			cartSqArr : cartArr
+			let jsonData = JSON.stringify(data);
+
+			$.ajax( {
+				type: "POST",
+				url : '/cart/deleteCart',
+				contentType: 'application/json',
+				dataType : 'json',
+				data : jsonData,
+				success : function(result) {
+					mcxDialog.alert("삭제 되었습니다.");
+					let data = {shotDelvUseYn : $("input[name=shotDelvUseYn]:checked").val()};
+					getCartList(data);
+				}
+			});
 		}
 
-		let jsonData = JSON.stringify(data);
-
-		$.ajax( {
-			type: "POST",
-			url : '/cart/deleteCart',
-			contentType: 'application/json',
-			dataType : 'json',
-			data : jsonData,
-			success : function(result) {
-				mcxDialog.alert("삭제 되었습니다.");
-				getCartList();
+		function deleteCart(gbn) {
+			let cartArr = [];
+			let confirmMessage = "";
+			if(gbn == "WMS_SELECT") {
+				$("#cartListForm .wmsList input[name=cartSqArr]:checked").each(function () {
+					cartArr.push($(this).val());
+				});
+
+				confirmMessage = "총 " + cartArr.length + "개의 상품을 삭제합니다.";
+			} else if(gbn == "DELV_SELECT") {
+				$("#cartListForm .delvList input[name=cartSqArr]:checked").each(function () {
+					cartArr.push($(this).val());
+				});
+
+				confirmMessage = "총 " + cartArr.length + "개의 상품을 삭제합니다.";
+			} else if(gbn == "WMS_ALL") {
+				$("#cartListForm .wmsList input[name=cartSqArr]").each(function() {
+					cartArr.push($(this).val());
+				});
+
+				confirmMessage = "총알배송상품을 전부 삭제하시겠습니까?";
+			} else if(gbn == "DELV_ALL") {
+				$("#cartListForm .delvList input[name=cartSqArr]").each(function() {
+					cartArr.push($(this).val());
+				});
+
+				confirmMessage = "업체직배송 상품을 전부 삭제하시겠습니까?";
+			} else {
+				cartArr.push(gbn);
+				deleteCartAjax(cartArr);
+				return false;
 			}
-		});
-	}
 
-	function deleteCart(gbn) {
-		let cartArr = [];
-		let confirmMessage = "";
-		if(gbn == "WMS_SELECT") {
-			$("#cartListForm .wmsList input[name=cartSqArr]:checked").each(function () {
-				cartArr.push($(this).val());
+			mcxDialog.confirm(confirmMessage, {
+				cancelBtnText: "취소/닫기",		//취소 또는 닫기 버튼명
+				sureBtnText  : "확인",				//처리문 버튼명
+				sureBtnClick : function () {
+					deleteCartAjax(cartArr);
+				}
 			});
+		}
+
+		//쿠폰사용안내 팝업열기
+		$(document).on('click','#btn_cpinfo_pop',function(e){
+			$("#cpinfoPop").modal("show");
+			return false;
+		});
 
-			confirmMessage = "총 " + cartArr.length + "개의 상품을 삭제합니다.";
-		} else if(gbn == "DELV_SELECT") {
-			$("#cartListForm .delvList input[name=cartSqArr]:checked").each(function () {
+		$("input[name=cartSqArr]").on("change", function(e) {
+			let cartArr = [];
+
+			// 선택된 장바구니 번호
+			$("#cartListForm input[name=cartSqArr]:checked").each(function () {
 				cartArr.push($(this).val());
 			});
 
-			confirmMessage = "총 " + cartArr.length + "개의 상품을 삭제합니다.";
-		} else if(gbn == "WMS_ALL") {
-			$("#cartListForm .wmsList input[name=cartSqArr]").each(function() {
-				cartArr.push($(this).val());
+			// 선택된 장바구니 정보 가공
+			let data = {	cartSqArr : cartArr }
+			let jsonData = JSON.stringify(data);
+
+			$.ajax( {
+				type: "POST",
+				url : '/cart/change/goods/list',
+				contentType: 'application/json',
+				dataType : 'json',
+				data : jsonData,
+				success : function(result) {
+					fnChangeCartListInfo(result);
+				}
 			});
+		});
 
-			confirmMessage = "총알배송상품을 전부 삭제하시겠습니까?";
-		} else if(gbn == "DELV_ALL") {
-			$("#cartListForm .delvList input[name=cartSqArr]").each(function() {
-				cartArr.push($(this).val());
+		function fnChangeCartListInfo(order) {
+			let shotList = order.shotCartList;
+			let wmsList = order.wmsCartList;
+			let delvList = order.delvCartList;
+			let cartList = new Array();
+
+			// 다다익선 정보 숨김
+			$("#cartListForm .applyTmtb").hide();
+			$("#cartListForm .notApplyTmtb").hide();
+
+			// 장바구니 각 상품 가격 정보 할인 전으로 변경
+			$("#cartListForm .cartInfo input[name=cartSq]").each(function() {
+				if($(this).parent().find(".calc_box .price_org").text() != "") {
+					$(this).parent().find(".calc_box .price_sale").text($(this).parent().find(".calc_box .price_org").text());
+					$(this).parent().find(".calc_box .price_org").remove();
+				}
 			});
 
-			confirmMessage = "업체직배송 상품을 전부 삭제하시겠습니까?";
-		} else {
-			cartArr.push(gbn);
-			deleteCartAjax(cartArr);
-			return false;
-		}
+			$("#cartListForm").find(".delvFeeArea").html("<div class='info_dlvr'><span class='dlvr_fee'>배송비 무료</span></div>");
+			for(let i = 0 ; i < shotList.length ; i++) {
+				cartList.push(shotList[i]);
+				$("#cartListForm .shotCartInfo input[name=cartSq]").each(function() {
+					if(shotList[i].cartSq == $(this).val()) {
+						let shot = shotList[i];
+						// $(this).parent().find(".thumb_box img").attr("src", result.imgPath1 + "/" + wms.sysImgNm);
+						$(this).parent().find(".od_moresale .applyTmtbNm > ul").html("");
+						$(this).parent().find(".od_moresale .notApplyTmtbNm > ul").html("");
+
+						// 다다익선 적용 정보 생성성
+						if(shot.qtyTmtbSq > 0 && shot.applyQtySectionYn == "Y") {
+							//$(this).parent().find(".applyTmtb .applyTmtbNm > ul").append("<li>" + shot.qtyTmtbNm + "</li>");
+							$(this).parent().find(".applyTmtb").show();
+						}
+						if(shot.amtTmtbSq > 0 && shot.applyAmtSectionYn == "Y") {
+							//$(this).parent().find(".applyTmtb .applyTmtbNm > ul").append("<li>" + shot.amtTmtbNm + "</li>");
+							$(this).parent().find(".applyTmtb").show();
+						}
+						if(shot.qtyTmtbSq > 0 && shot.applyQtySectionYn == "N") {
+							//$(this).parent().find(".notApplyTmtb .notApplyTmtbNm > ul").append("<li>" + shot.qtyTmtbNm + "<a href=''>대상 상품 보기</a></li>");
+							$(this).parent().find(".notApplyTmtb").show();
+						}
+						if(shot.amtTmtbSq > 0 && shot.applyAmtSectionYn == "N") {
+							//$(this).parent().find(".notApplyTmtb .notApplyTmtbNm > ul").append("<li>" + shot.amtTmtbNm + "<a href=''>대상 상품 보기</a></li>");
+							$(this).parent().find(".notApplyTmtb").show();
+						}
+
+						// 다다익선 할인가 적용
+						if(shot.tmtbDcAmt < shot.currPrice) {
+							$(this).parent().find(".calc_box .price_sale").text(Number(shot.tmtbDcAmt).toLocaleString() + " 원");
+							$(this).parent().find(".calc_box").prepend("<p><span class='price_org'><em>" + Number(shot.currPrice).toLocaleString() + "</em>원</span></p>");
+							//$(this).parent().find(".calc_box .price").append("<del>" + Number(wms.currPrice).toLocaleString() + " 원</del>");
+						}
+					}
+				});
+			}
 
-		mcxDialog.confirm(confirmMessage, {
-			cancelBtnText: "취소/닫기",		//취소 또는 닫기 버튼명
-			sureBtnText  : "확인",				//처리문 버튼명
-			sureBtnClick : function () {
-				deleteCartAjax(cartArr);
+			for(let i = 0 ; i < wmsList.length ; i++) {
+				cartList.push(wmsList[i]);
+				$("#cartListForm .wmsCartInfo input[name=cartSq]").each(function() {
+					if(wmsList[i].cartSq == $(this).val()) {
+						let wms = wmsList[i];
+						// $(this).parent().find(".thumb_box img").attr("src", result.imgPath1 + "/" + wms.sysImgNm);
+						$(this).parent().find(".od_moresale .applyTmtbNm > ul").html("");
+						$(this).parent().find(".od_moresale .notApplyTmtbNm > ul").html("");
+
+						// 다다익선 적용 정보 생성성
+						if(wms.qtyTmtbSq > 0 && wms.applyQtySectionYn == "Y") {
+							//$(this).parent().find(".applyTmtb .applyTmtbNm > ul").append("<li>" + wms.qtyTmtbNm + "</li>");
+							$(this).parent().find(".applyTmtb").show();
+						}
+						if(wms.amtTmtbSq > 0 && wms.applyAmtSectionYn == "Y") {
+							//$(this).parent().find(".applyTmtb .applyTmtbNm > ul").append("<li>" + wms.amtTmtbNm + "</li>");
+							$(this).parent().find(".applyTmtb").show();
+						}
+						if(wms.qtyTmtbSq > 0 && wms.applyQtySectionYn == "N") {
+							//$(this).parent().find(".notApplyTmtb .notApplyTmtbNm > ul").append("<li>" + wms.qtyTmtbNm + "<a href=''>대상 상품 보기</a></li>");
+							$(this).parent().find(".notApplyTmtb").show();
+						}
+						if(wms.amtTmtbSq > 0 && wms.applyAmtSectionYn == "N") {
+							//$(this).parent().find(".notApplyTmtb .notApplyTmtbNm > ul").append("<li>" + wms.amtTmtbNm + "<a href=''>대상 상품 보기</a></li>");
+							$(this).parent().find(".notApplyTmtb").show();
+						}
+
+						// 다다익선 할인가 적용
+						if(wms.tmtbDcAmt < wms.currPrice) {
+							$(this).parent().find(".calc_box .price_sale").text(Number(wms.tmtbDcAmt).toLocaleString() + " 원");
+							$(this).parent().find(".calc_box").prepend("<p><span class='price_org'><em>" + Number(wms.currPrice).toLocaleString() + "</em>원</span></p>");
+							//$(this).parent().find(".calc_box .price").append("<del>" + Number(wms.currPrice).toLocaleString() + " 원</del>");
+						}
+					}
+				});
 			}
-		});
-	}
 
-	//쿠폰사용안내 팝업열기
-	$(document).on('click','#btn_cpinfo_pop',function(e){
-		$("#cpinfoPop").modal("show");
-		return false;
-	});
+			// 자사 상품 배송비
+			if(order.wmsDelvFee == 0) {
+				$(".selfGoodsDelv").html("<span class='dlvr_fee'>배송비 무료</span>");
+			} else {
+				let html = "<span class='dlvr_fee'>배송비 <em>" + Number(order.wmsDelvFee).toLocaleString() + "</em> 원</span><a href='#' class='btn_popup_save'>배송비 SAVE 상품 보기</a>";
+				$(".selfGoodsDelv").html(html);
+				// $(".wmsList").find(".delv_" + wms.delvFeeCd).append("<span class='dlvr_shop'>" + wms.supplyCompNm + " 업체직배송</span>");
+			}
 
-	$("input[name=cartSqArr]").on("change", function(e) {
-		let cartArr = [];
+			for(let i = 0 ; i < delvList.length ; i++) {
+				cartList.push(delvList[i]);
+				$("#cartListForm .delvList .delvCartInfo input[name=cartSq]").each(function() {
+					if(delvList[i].cartSq == $(this).val()) {
+						let delv = delvList[i];
+						// $(this).parent().find(".thumb_box img").attr("src", result.imgPath1 + "/" + wms.sysImgNm);
+						$(this).parent().find(".od_moresale .applyTmtbNm > ul").html("");
+						$(this).parent().find(".od_moresale .notApplyTmtbNm > ul").html("");
+
+						// 다다익선 적용 정보 생성성
+						if(delv.qtyTmtbSq > 0 && delv.applyQtySectionYn == "Y") {
+							//$(this).parent().find(".applyTmtb .applyTmtbNm > ul").append("<li>" + delv.qtyTmtbNm + "</li>");
+							$(this).parent().find(".applyTmtb").show();
+						}
+						if(delv.amtTmtbSq > 0 && delv.applyAmtSectionYn == "Y") {
+							//$(this).parent().find(".applyTmtb .applyTmtbNm > ul").append("<li>" + delv.amtTmtbNm + "</li>");
+							$(this).parent().find(".applyTmtb").show();
+						}
+						if(delv.qtyTmtbSq > 0 && delv.applyQtySectionYn == "N") {
+							//$(this).parent().find(".notApplyTmtb .notApplyTmtbNm > ul").append("<li>" + delv.qtyTmtbNm + "<a href=''>대상 상품 보기</a></li>");
+							$(this).parent().find(".notApplyTmtb").show();
+						}
+						if(delv.amtTmtbSq > 0 && delv.applyAmtSectionYn == "N") {
+							//$(this).parent().find(".notApplyTmtb .notApplyTmtbNm > ul").append("<li>" + delv.amtTmtbNm + "<a href=''>대상 상품 보기</a></li>");
+							$(this).parent().find(".notApplyTmtb").show();
+						}
+
+						// 다다익선 할인가 적용
+						if(delv.tmtbDcAmt < delv.currPrice) {
+							$(this).parent().find(".calc_box .price_sale").text(Number(delv.tmtbDcAmt).toLocaleString() + " 원");
+							$(this).parent().find(".calc_box").prepend("<p><span class='price_org'><em>" + Number(delv.currPrice).toLocaleString() + "</em>원</span></p>");
+							//$(this).parent().find(".calc_box .price").append("<del>" + Number(delv.currPrice).toLocaleString() + " 원</del>");
+						}
+
+						/*if(delv.delvFee == 0) {
+							$(".delvList").find(".delv_" + delv.delvFeeCd).html("<div class='info_dlvr'><span class='dlvr_fee'>배송비 무료</span></div>");
+						} else {
+							let html = "<div class='info_dlvr'><span class='dlvr_fee'>" + Number(delv.delvFee).toLocaleString() + " 원</span><span class='dlvr_shop'>" + delv.supplyCompNm + " 업체직배송</span><a href='#' target='_black'>배송비 SAVE 상품 보기</a></div>";
+							$(".delvList").find(".delv_" + delv.delvFeeCd).html(html);
+						}*/
+					}
+				});
+			}
 
-		// 선택된 장바구니 번호
-		$("#cartListForm input[name=cartSqArr]:checked").each(function () {
-			cartArr.push($(this).val());
-		});
+			// 결제 총액 영역 수정
+			$("#cartListForm .sumCurrPrice").text(Number(order.sumOrdAmt).toLocaleString());
+			$("#cartListForm .totDelvFee").text(Number(order.totDelvFee).toLocaleString());
+			sumRealPayAmt = order.sumRealPayAmt + order.totDelvFee;
+			totDcAmt = order.totDcAmt;
 
-		// 선택된 장바구니 정보 가공
-		let data = {	cartSqArr : cartArr }
-		let jsonData = JSON.stringify(data);
-
-		$.ajax( {
-			type: "POST",
-			url : '/cart/change/goods/list',
-			contentType: 'application/json',
-			dataType : 'json',
-			data : jsonData,
-			success : function(result) {
-				fnChangeCartListInfo(result);
-			}
-		});
-	});
-
-	function fnChangeCartListInfo(order) {
-		let wmsList = order.wmsCartList;
-		let delvList = order.delvCartList;
-		let cartList = new Array();
-
-		// 다다익선 정보 숨김
-		$("#cartListForm .applyTmtb").hide();
-		$("#cartListForm .notApplyTmtb").hide();
-
-		// 장바구니 각 상품 가격 정보 할인 전으로 변경
-		$("#cartListForm .cartInfo input[name=cartSq]").each(function() {
-			if($(this).parent().find(".info_calc .price > del").text() != "") {
-				$(this).parent().find(".info_calc .selling_price").text($(this).parent().find(".info_calc .price > del").text());
-				$(this).parent().find(".info_calc .price > del").remove();
+			// 할인코드 쿠폰 금액 재확인
+			if($("#cartListForm #serialCpnNm").val()) {
+				serialCpnApply();
+			} else {
+				$("#cartListForm .totDcAmt").text(Number(order.totDcAmt).toLocaleString());
+				$("#cartListForm .sumRealPayAmt").text(Number(order.sumRealPayAmt + order.totDelvFee).toLocaleString());
+				cancelCartCpn();
 			}
-		});
-		$("#cartListForm").find(".delvFeeArea").html("<div class='info_dlvr'><span class='dlvr_fee'>배송비 무료</span></div>");
-
-		for(let i = 0 ; i < wmsList.length ; i++) {
-			cartList.push(wmsList[i]);
-			$("#cartListForm .wmsCartInfo input[name=cartSq]").each(function() {
-				if(wmsList[i].cartSq == $(this).val()) {
-					let wms = wmsList[i];
-					// $(this).parent().find(".thumb_box img").attr("src", result.imgPath1 + "/" + wms.sysImgNm);
-					$(this).parent().find(".od_moresale .applyTmtbNm > ul").html("");
-					$(this).parent().find(".od_moresale .notApplyTmtbNm > ul").html("");
-
-					// 다다익선 적용 정보 생성성
-					if(wms.qtyTmtbSq > 0 && wms.applyQtySectionYn == "Y") {
-						$(this).parent().find(".applyTmtb .applyTmtbNm > ul").append("<li>" + wms.qtyTmtbNm + "</li>");
-						$(this).parent().find(".applyTmtb").show();
-					}
-					if(wms.amtTmtbSq > 0 && wms.applyAmtSectionYn == "Y") {
-						$(this).parent().find(".applyTmtb .applyTmtbNm > ul").append("<li>" + wms.amtTmtbNm + "</li>");
-						$(this).parent().find(".applyTmtb").show();
-					}
-					if(wms.qtyTmtbSq > 0 && wms.applyQtySectionYn == "N") {
-						$(this).parent().find(".notApplyTmtb .notApplyTmtbNm > ul").append("<li>" + wms.qtyTmtbNm + "<a href=''>대상 상품 보기</a></li>");
-						$(this).parent().find(".notApplyTmtb").show();
-					}
-					if(wms.amtTmtbSq > 0 && wms.applyAmtSectionYn == "N") {
-						$(this).parent().find(".notApplyTmtb .notApplyTmtbNm > ul").append("<li>" + wms.amtTmtbNm + "<a href=''>대상 상품 보기</a></li>");
-						$(this).parent().find(".notApplyTmtb").show();
-					}
 
-					// 다다익선 할인가 적용
-					if(wms.tmtbDcAmt < wms.currPrice) {
-						$(this).parent().find(".info_calc .selling_price").text(Number(wms.tmtbDcAmt).toLocaleString() + " 원");
-						$(this).parent().find(".info_calc .price").append("<del>" + Number(wms.currPrice).toLocaleString() + " 원</del>");
-					}
+			/*let notApplyQtyTmtbList = new Array();
+			let notApplyAmtTmtbList = new Array();
+			for(let i = 0 ; i < cartList.length ; i++) {
+				let cart = cartList[i];
+				if(cart.applyQtySectionYn == "N") {
+					let obj = new Object();
+					obj.tmtbSq = cart.qtyTmtbSq;
+					obj.tmtbNm = cart.qtyTmtbNm;
+					obj.currPrice = cart.currPrice;
+					obj.goodsNm = cart.goodsNm;
+					obj.brandNm = cart.brandEnm + " " + cart.brandKnm;
+					obj.imgPath = order.imgPath1 + "/" + cart.sysImgNm;
+
+					notApplyQtyTmtbList.push(obj);
+				}
 
-					if(wms.delvFee == 0) {
-						$(".wmsList").find(".delv_" + wms.delvFeeCd).html("<div class='info_dlvr'><span class='dlvr_fee'>배송비 무료</span></div>");
-					} else {
-						let html = "<div class='info_dlvr'><span class='dlvr_fee'>" + Number(wms.delvFee).toLocaleString() + " 원</span><a href='#' target='_black'>배송비 SAVE 상품 보기</a></div>";
-						$(".wmsList").find(".delv_" + wms.delvFeeCd).html(html);
-						// $(".wmsList").find(".delv_" + wms.delvFeeCd).append("<span class='dlvr_shop'>" + wms.supplyCompNm + " 업체직배송</span>");
+				if(cart.applyAmtSectionYn == "N") {
+					let obj = new Object();
+					obj.tmtbSq = cart.amtTmtbSq;
+					obj.tmtbNm = cart.amtTmtbNm;
 
-					}
+					notApplyAmtTmtbList.push(obj);
 				}
-			});
-		}
+			}
 
-		for(let i = 0 ; i < delvList.length ; i++) {
-			cartList.push(delvList[i]);
-			$("#cartListForm .delvCartInfo input[name=cartSq]").each(function() {
-				if(delvList[i].cartSq == $(this).val()) {
-					let delv = delvList[i];
-					// $(this).parent().find(".thumb_box img").attr("src", result.imgPath1 + "/" + wms.sysImgNm);
-					$(this).parent().find(".od_moresale .applyTmtbNm > ul").html("");
-					$(this).parent().find(".od_moresale .notApplyTmtbNm > ul").html("");
-
-					// 다다익선 적용 정보 생성성
-					if(delv.qtyTmtbSq > 0 && delv.applyQtySectionYn == "Y") {
-						$(this).parent().find(".applyTmtb .applyTmtbNm > ul").append("<li>" + delv.qtyTmtbNm + "</li>");
-						$(this).parent().find(".applyTmtb").show();
-					}
-					if(delv.amtTmtbSq > 0 && delv.applyAmtSectionYn == "Y") {
-						$(this).parent().find(".applyTmtb .applyTmtbNm > ul").append("<li>" + delv.amtTmtbNm + "</li>");
-						$(this).parent().find(".applyTmtb").show();
-					}
-					if(delv.qtyTmtbSq > 0 && delv.applyQtySectionYn == "N") {
-						$(this).parent().find(".notApplyTmtb .notApplyTmtbNm > ul").append("<li>" + delv.qtyTmtbNm + "<a href=''>대상 상품 보기</a></li>");
-						$(this).parent().find(".notApplyTmtb").show();
-					}
-					if(delv.amtTmtbSq > 0 && delv.applyAmtSectionYn == "N") {
-						$(this).parent().find(".notApplyTmtb .notApplyTmtbNm > ul").append("<li>" + delv.amtTmtbNm + "<a href=''>대상 상품 보기</a></li>");
-						$(this).parent().find(".notApplyTmtb").show();
+			// 수량 다다익선 정렬
+			var t = new Object();
+			for (let i = 0; i < notApplyQtyTmtbList.length; i++) {
+				for (let j = 0; j < notApplyQtyTmtbList.length - i - 1; j++) {
+					if (notApplyQtyTmtbList[j].tmtbSq > notApplyQtyTmtbList[j + 1].tmtbSq) {
+						t = notApplyQtyTmtbList[j];
+						notApplyQtyTmtbList[j] = notApplyQtyTmtbList[j + 1];
+						notApplyQtyTmtbList[j + 1] = t;
 					}
+				}
+			}
 
-					// 다다익선 할인가 적용
-					if(delv.tmtbDcAmt < delv.currPrice) {
-						$(this).parent().find(".info_calc .selling_price").text(Number(delv.tmtbDcAmt).toLocaleString() + " 원");
-						$(this).parent().find(".info_calc .price").append("<del>" + Number(delv.currPrice).toLocaleString() + " 원</del>");
-					}
+			// 다다익선 적용 대상 상품 노출
+			fnCreateNotApplyTmtbAreaList(notApplyQtyTmtbList, notApplyAmtTmtbList);*/
+		}
 
-					if(delv.delvFee == 0) {
-						$(".delvList").find(".delv_" + delv.delvFeeCd).html("<div class='info_dlvr'><span class='dlvr_fee'>배송비 무료</span></div>");
-					} else {
-						let html = "<div class='info_dlvr'><span class='dlvr_fee'>" + Number(delv.delvFee).toLocaleString() + " 원</span><span class='dlvr_shop'>" + delv.supplyCompNm + " 업체직배송</span><a href='#' target='_black'>배송비 SAVE 상품 보기</a></div>";
-						$(".delvList").find(".delv_" + delv.delvFeeCd).html(html);
-					}
+		//옵션변경 팝업열기
+		function fnChangeCartOptCd(cartSq) {
+			$.ajax( {
+				type: "POST",
+				url : '/cart/goods/info',
+				dataType : 'html',
+				data : {cartSq : cartSq},
+				success : function(result) {
+					//fnChangeCartListInfo(result);
+					$("#cartOptionModal").remove();
+					$("#optModifyPop").html(result);
+					$("#optModifyPop").modal("show");
 				}
 			});
 		}
 
-		// 결제 총액 영역 수정
-		$("#cartListForm .sumCurrPrice").text(Number(order.sumOrdAmt).toLocaleString());
-		$("#cartListForm .totDelvFee").text(Number(order.totDelvFee).toLocaleString());
-		sumRealPayAmt = order.sumRealPayAmt + order.totDelvFee;
-		totDcAmt = order.totDcAmt;
-
-		// 할인코드 쿠폰 금액 재확인
-		if($("#cartListForm #serialCpnNm").val()) {
-			serialCpnApply();
-		} else {
-			$("#cartListForm .totDcAmt").text(Number(order.totDcAmt).toLocaleString());
-			$("#cartListForm .sumRealPayAmt").text(Number(order.sumRealPayAmt + order.totDelvFee).toLocaleString());
-			cancelCartCpn();
-		}
-
-		let notApplyQtyTmtbList = new Array();
-		let notApplyAmtTmtbList = new Array();
-		for(let i = 0 ; i < cartList.length ; i++) {
-			let cart = cartList[i];
-			if(cart.applyQtySectionYn == "N") {
-				let obj = new Object();
-				obj.tmtbSq = cart.qtyTmtbSq;
-				obj.tmtbNm = cart.qtyTmtbNm;
-				obj.currPrice = cart.currPrice;
-				obj.goodsNm = cart.goodsNm;
-				obj.brandNm = cart.brandEnm + " " + cart.brandKnm;
-				obj.imgPath = order.imgPath1 + "/" + cart.sysImgNm;
-
-				notApplyQtyTmtbList.push(obj);
-			}
-
-			if(cart.applyAmtSectionYn == "N") {
-				let obj = new Object();
-				obj.tmtbSq = cart.amtTmtbSq;
-				obj.tmtbNm = cart.amtTmtbNm;
+		// 상품상세 페이지 이동 처리
+		/*var fnGoToGoodsDetail = function(param) {
+			let goodsCd = $(param).attr('goodsCd');
+			cfnGoToPage(_PAGE_GOODS_DETAIL + goodsCd);
+		}*/
 
-				notApplyAmtTmtbList.push(obj);
+		// 주문하기
+		function fnSubmitNoMember(cartSq) {
+			if(cartSq == "all") {
+				$("#cartListForm").submit();
+			} else {
+				let html	 = "<input type='hidden' name='cartSqArr' value='" + cartSq + "' />";
+				html		+= "<input type='hidden' name='shotDelvUseYn' value='" + $("input[name=shotDelvUseYn]:checked").val() + "' />";
+				$("#cartInfoForm").html(html);
+				$("#cartInfoForm").submit();
 			}
 		}
 
-		// 수량 다다익선 정렬
-		var t = new Object();
-		for (let i = 0; i < notApplyQtyTmtbList.length; i++) {
-			for (let j = 0; j < notApplyQtyTmtbList.length - i - 1; j++) {
-				if (notApplyQtyTmtbList[j].tmtbSq > notApplyQtyTmtbList[j + 1].tmtbSq) {
-					t = notApplyQtyTmtbList[j];
-					notApplyQtyTmtbList[j] = notApplyQtyTmtbList[j + 1];
-					notApplyQtyTmtbList[j + 1] = t;
-				}
-			}
+		function fnGoToGoodsDetail(goodsCd) {
+			cfnGoToPage(_PAGE_GOODS_DETAIL + goodsCd);
 		}
 
-		// 다다익선 적용 대상 상품 노출
-		fnCreateNotApplyTmtbAreaList(notApplyQtyTmtbList, notApplyAmtTmtbList);
-	}
-
-	//옵션변경 팝업열기
-	function fnChangeCartOptCd(cartSq) {
-		$.ajax( {
-			type: "POST",
-			url : '/cart/goods/info',
-			dataType : 'html',
-			data : {cartSq : cartSq},
-			success : function(result) {
-				//fnChangeCartListInfo(result);
-				$("#cartOptionModal").remove();
-				$("#optModifyPop").html(result);
-				$("#optModifyPop").modal("show");
+		$("#od_item_all").on("change", function() {
+			if($("#od_item_all").is(":checked")) {
+				$("input[name=cartSqArr]").prop("checked", true);
+			} else {
+				$("input[name=cartSqArr]").prop("checked", false);
 			}
+
 		});
-	}
-
-	// 상품상세 페이지 이동 처리
-	var fnGoToGoodsDetail = function(param) {
-		let goodsCd = $(param).attr('goodsCd');
-		cfnGoToPage(_PAGE_GOODS_DETAIL + goodsCd);
-	}
-
-	// 주문하기
-	function fnSubmitNoMember(cartSq) {
-		if(cartSq == "all") {
-			$("#cartListForm").submit();
-		} else {
-			let html	 = "<input type='hidden' name='cartSqArr' value='" + cartSq + "' />";
-			html		+= "<input type='hidden' name='shotDelvUseYn' value='" + $("input[name=shotDelvUseYn]:checked").val() + "' />";
-			$("#cartInfoForm").html(html);
-			$("#cartInfoForm").submit();
-		}
-	}
-</script>
+	</script>
+</div>
 </html>

src/main/webapp/WEB-INF/views/web/cart/CartListFormWeb.html

@@ -284,20 +284,28 @@
         getCartList();
     });
 
-    function getCartList() {
+    function getCartList(parameter) {
         // 장바구니 정보 조회
         $.ajax( {
             type: "POST",
             url : '/cart/goods/list',
+			data : parameter,
             dataType : 'html',
             success : function(result) {
                 if (result != null) {
+                	$("#cartListForm").remove();
                     $("#cartAjaxList").html(result);
                 }
             }
         });
     }
 
+	//상품옵션변경 팝업 > 컬러선택 표기
+	$(document).on('change','input[name=shotDelvUseYn]',function(e){
+		let data = {shotDelvUseYn : $("input[name=shotDelvUseYn]:checked").val()};
+		getCartList(data);
+	});
+
     //상품옵션변경 팝업 > 수량조절
     $(document).on('click','.opt_modify_pop .number_count .minus',function(e){
         var $input = $(this).parent().find('input');