Browse Source

Merge branch 'develop' into jsshin

jsshin 5 years ago
parent
commit
5515e2b3c0

+ 11 - 2
src/main/java/com/style24/front/biz/dao/TsfCartDao.java

@@ -108,10 +108,19 @@ public interface TsfCartDao {
 
     /**
      * 다다익선 SECTION 적용 조건 조회
-     * @param Cart
-     * @return void
+     * @param List<Integer>
+     * @return Collection<Order>
      * @author xodud1202
      * @since 2021. 02. 04
      */
     Collection<Order> selectTmtbSectionValList(List<Integer> param);
+
+    /**
+     * 장바구니 상품 조회
+     * @param Order
+     * @return Order
+     * @author xodud1202
+     * @since 2021. 02. 08
+     */
+    Collection<Order> getCartGoodsList(Order param);
 }

+ 2 - 2
src/main/java/com/style24/front/biz/dao/TsfGoodsDao.java

@@ -98,14 +98,14 @@ public interface TsfGoodsDao {
 	Collection<GoodsCompose> getGoodsDealComposeList(Goods goods);
 
 	/**
-	 * 상품 옵션 사이즈 목록
+	 * 상품 옵션1 목록
 	 *
 	 * @param goods
 	 * @return
 	 * @author eskim
 	 * @date 2021. 2. 9
 	 */
-	Collection<GoodsStock> getGoodsOtherColorList(Goods goods);
+	Collection<GoodsStock> getGoodsOption1List(Goods goods);
 
 
 	/**

+ 208 - 55
src/main/java/com/style24/front/biz/service/TsfCartService.java

@@ -16,10 +16,14 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.servlet.ModelAndView;
+import org.thymeleaf.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 장바구니 Service
@@ -220,10 +224,11 @@ public class TsfCartService {
 		}
 	}
 
-	public GagaMap selecCartGoodsList() {
+	// 장바구니 상품 리스트 조회 서비스
+	public Order getCartGoodsList(Order order) {
+		//ModelAndView result = new ModelAndView();
 		GagaMap result = new GagaMap();							// return
 		List<Integer> cartSqs = new ArrayList<Integer>();		// 품절 제외 장바구니 리스트
-		Order order = new Order();								// 조회 조건
 
 		// Device check
 		order.setFrontGb(TsfSession.getFrontGb());
@@ -236,7 +241,7 @@ public class TsfCartService {
 		order.setUpdNo(0);
 
 		// 장바구니 상품 조회
-		Collection<Order> cartGoodsList = coreOrderService.getCartGoodsList(order);
+		Collection<Order> cartGoodsList = cartDao.getCartGoodsList(order);
 
 		// 품절체크
 		for(Order goods : cartGoodsList) {
@@ -249,6 +254,8 @@ public class TsfCartService {
 			checkParam.setGoodsType(goods.getGoodsType());
 			String stockResult = goodsService.getCheckStock(checkParam);
 
+			//String stockResult = "SUCCESS";
+
 			if("SUCCESS".equals(stockResult)) {
 				goods.setSoldoutYn("N");
 				cartSqs.add(goods.getCartSq());
@@ -257,59 +264,69 @@ public class TsfCartService {
 			}
 		}
 
-		order.setCartSqs(cartSqs.stream().mapToInt(Integer::intValue).toArray());
+		order.setCartSqArr(cartSqs.stream().mapToInt(Integer::intValue).toArray());
 
 		// 다다익선 할인 상품 조회
-		Collection<Order> moreBetterAmtList = selecMoreBetterAmtList(order);
+		Collection<Order> moreBetterAmtList = getMoreBetterAmtList(order);
+
+		order = coreOrderService.getCartDelvGoodsCntList(moreBetterAmtList);
 
-		result.put("cartGoodsList", cartGoodsList);
+		/*delvOrder.setWmsCnt(wmsCnt);					// 자사몰 일반배송건수
+		delvOrder.setResCnt(resCnt);					// 자사몰 예약배송건수
+		delvOrder.setDelvCnt(delvCnt);					// 입점업체 배송건수
+		delvOrder.setDelvTotCnt(delvTotCnt);			// 배송유형건수
+		delvOrder.setDelvFeeTotCnt(delvFeeTotCnt);		// 전체배송건수
+		delvOrder.setWmsCartList(wmsCartList);			// 자사 일반상품 목록
+		delvOrder.setResCartList(resCartList);			// 자사 예약상품 목록
+		delvOrder.setDelvCartList(delvCartList);		// 입점업체 상품 목록*/
 
-		return result;
+		/*result.put("wmsCartList", order.getWmsCartList());
+		result.put("resCartList", order.getResCartList());
+		result.put("delvCartList", order.getDelvCartList());*/
+
+		return order;
 	}
 
 	/**
 	 * 다다익선 할인 금액 조회
 	 * @param Order
-	 * param.cartSqs[] : 필수
+	 * param.cartSqArr[] : 필수
 	 * @return String
 	 * @author xodud1202
 	 * @since 2021. 01. 28
 	 */
-	public Collection<Order> selecMoreBetterAmtList(Order param) {
-		Collection<Order> result = new ArrayList<Order>();
-
+	public Collection<Order> getMoreBetterAmtList(Order param) {
 		// 장바구니 상품 조회
 		param.setFrontGb(TsfSession.getFrontGb());
 		Collection<Order> cartGoodsList = coreOrderService.getCartGoodsList(param);
 
-		// 장바구니 내 적용 가능 다다익선 조회 (등록된 기본,적용 상품 정보 전체 조회)
-		Collection<Order> tmtbApplyList = cartDao.selectMoreBetterApplyCartList(param);
+		// 장바구니 내 수량 다다익선 적용 가능 리스트 조회 (등록된 기본,적용 상품 정보 전체 조회)
+		param.setApplyGb(TscConstants.ApplyGb.QTY.value());
+		Collection<Order> tmtbQtyApplyList = cartDao.selectMoreBetterApplyCartList(param);
 
-		// 장바구니에 담긴 상품 금액 (즉시할인가 + 상품 옵션가)를 tmtbApplyList 에 저장 (추후 계산식을 위함)
+		// 장바구니에 담긴 상품 금액 즉시할인가를 tmtbApplyList 에 저장 (추후 계산식을 위함)
 		for(Order cart : cartGoodsList) {
-			for(Order apply : tmtbApplyList) {
-				if(cart.getCartSq() == apply.getCartSq() && TscConstants.GoodsType.SET.value().equals(cart.getGoodsType())) {
-					apply.setCurrPrice(cart.getCurrPrice());
-				} else if(cart.getCartSq() == apply.getCartSq() && !TscConstants.GoodsType.SET.value().equals(cart.getGoodsType())) {
-					apply.setCurrPrice(cart.getCurrPrice() + cart.getOptAddPrice());
+			for(Order apply : tmtbQtyApplyList) {
+				if(cart.getCartSq() == apply.getCartSq()) {
+					apply.setCurrPrice(cart.getCurrPrice() + cart.getOptAddPrice());        /* 즉시할인 적용가 */
 				}
 			}
 		}
 
-		// 장바구니 등록 다다익선 일련번호 지정
-		List<Integer> applySq = new ArrayList<Integer>();
-		for(Order tmtbApply : tmtbApplyList) {
+		// 장바구니 등록 수량 다다익선 일련번호 지정
+		List<Integer> qtyApplySq = new ArrayList<Integer>();
+		for(Order tmtbApply : tmtbQtyApplyList) {
 			if(TscConstants.GoodsGb.BASE.value().equals(tmtbApply.getGoodsGb())) {
-				applySq.add(tmtbApply.getTmtbSq());
+				qtyApplySq.add(tmtbApply.getTmtbSq());
 			}
 		}
-		param.setTmtbSqs(applySq.stream().mapToInt(Integer::intValue).toArray());
+		param.setTmtbSqs(qtyApplySq.stream().mapToInt(Integer::intValue).toArray());
 
 		// 장바구니 등록 다다익선 총합 금액
-		Collection<Order> tmtbSumDataList = cartDao.selectApplyMoreBetterCartInfoList(param);
+		Collection<Order> tmtbQtySumDataList = cartDao.selectApplyMoreBetterCartInfoList(param);
 		// 기본상품 목록에 총합 데이터 등록
-		for(Order applyInfo : tmtbApplyList) {
-			for(Order tmtbSumInfo : tmtbSumDataList) {
+		for(Order applyInfo : tmtbQtyApplyList) {
+			for(Order tmtbSumInfo : tmtbQtySumDataList) {
 				if(applyInfo.getTmtbSq() == tmtbSumInfo.getTmtbSq()) {
 					applyInfo.setTmtbSumAmt(tmtbSumInfo.getTmtbSumAmt());
 					applyInfo.setTmtbSumQty(tmtbSumInfo.getTmtbSumQty());
@@ -318,27 +335,21 @@ public class TsfCartService {
 		}
 
 		// 섹션 정보 조회 후 할인 여부 판단
-		Collection<Order> tmtbSectionList = cartDao.selectTmtbSectionValList(applySq);
-		for(Order applyInfo : tmtbApplyList) {						// 기준 상품 및 다다익선 정보 조회
-			for(Order section : tmtbSectionList) {					// 다다익선 할인 조건 조회
+		Collection<Order> tmtbQtySectionList = cartDao.selectTmtbSectionValList(qtyApplySq);
+		for(Order applyInfo : tmtbQtyApplyList) {						// 기준 상품 및 다다익선 정보 조회
+			for(Order section : tmtbQtySectionList) {						// 다다익선 할인 조건 조회
 				if(applyInfo.getTmtbSq() == section.getTmtbSq()) {
-					applyInfo.setTmtbNm(section.getTmtbNm());
-
 					if(TscConstants.ApplyGb.QTY.value().equals(applyInfo.getApplyGb())) {		// 수량 적용
-						if(section.getSectionVal() < applyInfo.getTmtbSumQty()) {				// 장바구니 수량 할인 기준 달성시
-							if(applyInfo.getSectionVal() < section.getSectionVal()) {			// 기존 달성된 기준치보다 할인폭이 클 경우 기준할인 수정
+						if(section.getSectionVal() <= applyInfo.getTmtbSumQty()) {				// 장바구니 수량 할인 기준 달성시
+							if(applyInfo.getSectionVal() <= section.getSectionVal()) {			// 기존 달성된 기준치보다 할인폭이 클 경우 기준할인 수정
 								applyInfo.setSectionVal(section.getSectionVal());
-								applyInfo.setApplyQtySectionVal(section.getTmtbSumQty());
-								applyInfo.setApplyAmtSectionVal(section.getTmtbSumAmt());
 								applyInfo.setApplyQtySectionYn("Y");
+								applyInfo.setDcWay(section.getDcWay());
+								applyInfo.setDcVal(section.getDcVal());
 							}
-						}
-					} else if (TscConstants.ApplyGb.AMT.value().equals(applyInfo.getApplyGb())) {
-						if(section.getSectionVal() < applyInfo.getTmtbSumQty()) {				// 장바구니 수량 할인 기준 달성시
-							if(applyInfo.getSectionVal() < section.getSectionVal()) {	// 기존 달성된 기준치보다 할인폭이 클 경우 기준할인 수정
-								applyInfo.setSectionVal(section.getSectionVal());
-								applyInfo.setApplyAmtSectionVal(section.getSectionVal());
-								applyInfo.setApplyAmtSectionYn("Y");
+						} else {
+							if(applyInfo.getSectionVal() < 1 && applyInfo.getGoodsGb().equals(TscConstants.GoodsGb.BASE.value())) {
+								applyInfo.setApplyQtySectionYn("N");
 							}
 						}
 					}
@@ -346,27 +357,169 @@ public class TsfCartService {
 			}
 		}
 
-		// 다다익선 적용 상품 할인 금액 계산
-		// resultAmt.currPrice = 즉시할인 + 옵션가 (수량계산안한값)
-		// resultAmt.getApplyAmtSectionVal = 다다익선 등록 상품 총합계금액 (수량, 금액 모두 들어있음)
-		// resultAmt.getApplyQtySectionVal = 다다익선 등록 상품 총합계수량 (수량만)
-		// resultAmt.getApplyAmtSectionYn() = 다다익선 금액할인 만족 여부
-		// resultAmt.getApplyQtySectionYn() = 다다익선 수량할인 만족 여부
-		for(Order resultAmt : tmtbApplyList) {
+		// 수량 다다익선 적용 상품 할인 금액 계산
+		int leftAmt = 0;
+		int i = 0;
+		for(Order resultAmt : tmtbQtyApplyList) {
 			if("Y".equals(resultAmt.getApplyQtySectionYn())) {
-				if(TscConstants.DcWay.AMT.value().equals(resultAmt.getDcWay())) {		// 할인 방식 금액일경우
+				if (TscConstants.DcWay.AMT.value().equals(resultAmt.getDcWay())) {        // 할인 방식 금액일경우
+					i++;
+					int tempAmt = resultAmt.getCurrPrice() * resultAmt.getGoodsQty();
+					if (i == 1) {
+						leftAmt = resultAmt.getDcVal();
+					}
+
+					if (i == resultAmt.getTmtbCnt()) {
+						resultAmt.setTmtbDcAmt(tempAmt - leftAmt);
+						leftAmt = 0;
+						i = 0;
+					} else {
+						double tempDcAmt = resultAmt.getDcVal() * ((tempAmt) / (double)resultAmt.getTmtbSumAmt());
+						leftAmt -= (int)tempDcAmt;
+						resultAmt.setTmtbDcAmt(tempAmt - (int)tempDcAmt);
+					}
+				} else {                                                                // 할인 방식 할인율일 경우
+					int tempAmt = resultAmt.getCurrPrice() * resultAmt.getGoodsQty();
+					tempAmt = (int) (tempAmt - (tempAmt * (resultAmt.getDcVal() / 100.0)));
+					resultAmt.setTmtbDcAmt(tempAmt);
+				}
+			}
+		}
+
+		// 장바구니 정보에 수량 다다익선 정보 입력
+		for(Order cart : cartGoodsList) {
+			for(Order apply : tmtbQtyApplyList) {
+				if(cart.getCartSq() == apply.getCartSq()) {
+					cart.setTmtbDcAmt(apply.getTmtbDcAmt());
+					cart.setQtySumCurrPrice(apply.getCurrPrice() * apply.getGoodsQty());
+					cart.setApplyQtySectionYn(apply.getApplyQtySectionYn());
+					cart.setQtyTmtbNm(apply.getTmtbNm());
+					cart.setQtyTmtbSq(apply.getTmtbSq());
+				}
+			}
+		}
 
-				} else {		// 할인 방식 할인율일 경우
+		// 장바구니 내 금액 다다익선 적용 가능 리스트 조회 (등록된 기본,적용 상품 정보 전체 조회)
+		param.setApplyGb(TscConstants.ApplyGb.AMT.value());
+		Collection<Order> tmtbAmtApplyList = cartDao.selectMoreBetterApplyCartList(param);
 
+		// 장바구니에 담긴 상품 금액 즉시할인가를 tmtbAmtApplyList 에 저장 (추후 계산식을 위함)
+		for(Order cart : cartGoodsList) {
+			for(Order apply : tmtbAmtApplyList) {
+				if(cart.getCartSq() == apply.getCartSq()) {
+					if (StringUtils.isEmpty(cart.getQtyTmtbNm())) {
+						apply.setCurrPrice((cart.getCurrPrice() + cart.getOptAddPrice()) * cart.getGoodsQty());
+					} else {
+						apply.setCurrPrice(cart.getTmtbDcAmt());                                                    /* 수량 다다익선 할인된 금액 적용 */
+					}
 				}
 			}
+		}
+
+		// 장바구니 등록 수량 다다익선 일련번호 지정
+		List<Integer> amtApplySq = new ArrayList<Integer>();
+		for(Order tmtbApply : tmtbAmtApplyList) {
+			if(TscConstants.GoodsGb.BASE.value().equals(tmtbApply.getGoodsGb())) {
+				amtApplySq.add(tmtbApply.getTmtbSq());
+			}
+		}
+		param.setTmtbSqs(amtApplySq.stream().mapToInt(Integer::intValue).toArray());
 
+		// 장바구니 등록 금액 다다익선 총합 금액
+		Collection<Order> tmtbAmtSumDataList = cartDao.selectApplyMoreBetterCartInfoList(param);
+
+		Map<Integer, Integer> tmtbAmtSumData = new HashMap<Integer, Integer>();		// 각 상품별 할인 금액을 다다익선별 SUM하기 위한 MAP
+		for(Order applyInfo : tmtbAmtApplyList) {
+			// SUM AMT는 할인된 금액으로 묶어야함.
+			if(tmtbAmtSumData.get(applyInfo.getTmtbSq()) != null && tmtbAmtSumData.get(applyInfo.getTmtbSq()) > 0) {
+				tmtbAmtSumData.put(applyInfo.getTmtbSq(), tmtbAmtSumData.get(applyInfo.getTmtbSq()) + applyInfo.getCurrPrice());
+			} else {
+				tmtbAmtSumData.put(applyInfo.getTmtbSq(), applyInfo.getCurrPrice());
+			}
 		}
 
-		// 할인 cartGoodsList에 할인 금액 세팅
-		// 장바구니 등록 상품 중 tmtbSq는 이제 존재하나 setApplyAmtSectionYn가 없는 경우 N으로 등록해주어야함 >> 장바구니 화면에서 추천상품 보여주기 위함
+		// 기본상품 목록에 총합 데이터 등록
+		for(Order applyInfo : tmtbAmtApplyList) {
+			for(Order tmtbSumInfo : tmtbAmtSumDataList) {
+				if(applyInfo.getTmtbSq() == tmtbSumInfo.getTmtbSq()) {
+					applyInfo.setTmtbSumQty(tmtbSumInfo.getTmtbSumQty());
 
+					if(tmtbAmtSumData.get(applyInfo.getTmtbSq()) != null && tmtbAmtSumData.get(applyInfo.getTmtbSq()) > 0) {
+						applyInfo.setTmtbSumAmt(tmtbAmtSumData.get(applyInfo.getTmtbSq()));
+					}
+				}
+			}
+		}
+
+
+		// 섹션 정보 조회 후 할인 여부 판단
+		Collection<Order> tmtbAmtSectionList = cartDao.selectTmtbSectionValList(amtApplySq);
+		for(Order applyInfo : tmtbAmtApplyList) {					// 기준 상품 및 다다익선 정보 조회
+			for(Order section : tmtbAmtSectionList) {					// 다다익선 할인 조건 조회
+				if(applyInfo.getTmtbSq() == section.getTmtbSq()) {
+					if (TscConstants.ApplyGb.AMT.value().equals(applyInfo.getApplyGb())) {
+						if(section.getSectionVal() <= applyInfo.getTmtbSumAmt()) {				// 장바구니 수량 할인 기준 달성시
+							if(applyInfo.getSectionVal() <= section.getSectionVal()) {			// 기존 달성된 기준치보다 할인폭이 클 경우 기준할인 수정
+								applyInfo.setSectionVal(section.getSectionVal());
+								applyInfo.setApplyAmtSectionYn("Y");
+								applyInfo.setDcWay(section.getDcWay());
+								applyInfo.setDcVal(section.getDcVal());
+							}
+						} else {
+							if(applyInfo.getSectionVal() < 1 && applyInfo.getGoodsGb().equals(TscConstants.GoodsGb.BASE.value())) {
+								applyInfo.setApplyAmtSectionYn("N");
+							}
+						}
+					}
+				}
+			}
+		}
+
+		// 금액 다다익선 할인 계산
+		leftAmt = 0;
+		i = 0;
+		for(Order resultAmt : tmtbAmtApplyList) {
+			if("Y".equals(resultAmt.getApplyAmtSectionYn())) {
+				if (TscConstants.DcWay.AMT.value().equals(resultAmt.getDcWay())) {        // 할인 방식 금액일경우
+					i++;
+					int tempAmt = resultAmt.getCurrPrice();
+					if (i == 1) {
+						leftAmt = resultAmt.getDcVal();
+					}
+
+					if (i == resultAmt.getTmtbCnt()) {
+						resultAmt.setTmtbDcAmt(tempAmt - leftAmt);
+						leftAmt = 0;
+						i = 0;
+					} else {
+						double tempDcAmt = resultAmt.getDcVal() * ((tempAmt) / (double)resultAmt.getTmtbSumAmt());
+						leftAmt -= (int)tempDcAmt;
+						resultAmt.setTmtbDcAmt(tempAmt - (int)tempDcAmt);
+					}
+				} else {                                                                // 할인 방식 할인율일 경우
+					int tempAmt = resultAmt.getCurrPrice();
+					tempAmt = (int) (tempAmt - (tempAmt * (resultAmt.getDcVal() / 100.0)));
+					resultAmt.setTmtbDcAmt(tempAmt);
+				}
+			}
+		}
+
+		// 장바구니 정보에 수량 다다익선 정보 입력
+		for(Order cart : cartGoodsList) {
+			for(Order apply : tmtbAmtApplyList) {
+				if(cart.getCartSq() == apply.getCartSq()) {
+
+					if(apply.getTmtbDcAmt() > 0) {
+						cart.setTmtbDcAmt(apply.getTmtbDcAmt());
+					}
+					cart.setApplyAmtSectionYn(apply.getApplyAmtSectionYn());
+					cart.setAmtTmtbNm(apply.getTmtbNm());
+					cart.setAmtTmtbSq(apply.getTmtbSq());
+				}
+			}
+		}
 
-		return result;
+		//return result;
+		return cartGoodsList;
 	}
 }

+ 3 - 3
src/main/java/com/style24/front/biz/service/TsfGoodsService.java

@@ -204,15 +204,15 @@ public class TsfGoodsService {
 	}
 
 	/**
-	 * 상품 옵션 사이즈 목록
+	 * 상품 옵션1 목록
 	 *
 	 * @param goods
 	 * @return
 	 * @author eskim
 	 * @since 2021. 2. 9
 	 */
-	public Collection<GoodsStock> getGoodsOtherColorList(Goods goods) {
-		return goodsDao.getGoodsOtherColorList(goods);
+	public Collection<GoodsStock> getGoodsOption1List(Goods goods) {
+		return goodsDao.getGoodsOption1List(goods);
 	}
 
 	/**

+ 29 - 0
src/main/java/com/style24/front/biz/service/TsfOrderService.java

@@ -1,9 +1,16 @@
 package com.style24.front.biz.service;
 
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.style24.front.biz.dao.TsfOrderDao;
+import com.style24.persistence.domain.Order;
+
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -19,4 +26,26 @@ public class TsfOrderService {
 	@Autowired
 	private TsfOrderDao orderDao;
 
+	/**
+	 * 마이페이지 검색 기간 영역 설정
+	 *
+	 * @return int[]
+	 * @author card007
+	 * @since 2021. 02. 08
+	 */
+	public String[] getSearchPeriod() {
+		String[] period = new String[6];
+
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(new Date());
+		DateFormat df = new SimpleDateFormat("MM");
+
+		for (int i = 5; i > -1; i--) {
+			period[i] = df.format(cal.getTime()) + "월";
+			cal.add(Calendar.MONTH, -1);
+		}
+		
+		return period; 
+	}
+
 }

+ 24 - 17
src/main/java/com/style24/front/biz/web/TsfCartController.java

@@ -1,25 +1,26 @@
 package com.style24.front.biz.web;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Collection;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
 import com.gagaframework.web.parameter.GagaMap;
-import com.gagaframework.web.rest.server.GagaResponse;
-import com.style24.core.biz.service.TscOrderService;
 import com.style24.core.support.message.TscMessageByLocale;
-import com.style24.core.support.session.TscSession;
 import com.style24.front.biz.service.TsfCartService;
 import com.style24.front.support.controller.TsfBaseController;
 import com.style24.persistence.domain.Cart;
 import com.style24.persistence.domain.Order;
 
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
 
 /**
  * 장바구니 Controller
@@ -38,6 +39,9 @@ public class TsfCartController extends TsfBaseController {
 	@Autowired
 	private TsfCartService cartService;
 
+	@Autowired
+	private Environment env;
+
 	/**
 	 * 장바구니 화면
 	 * @return
@@ -82,13 +86,16 @@ public class TsfCartController extends TsfBaseController {
 		return message.getMessage("SUCC_0001");
 	}
 
-	@ResponseBody
+	// @ResponseBody
 	@PostMapping("/goods/list")
-	public GagaMap selecCartGoodsList() {
-		GagaMap result = new GagaMap();
+	public String selecCartGoodsList(Order param, Model model) {
+		Order order = cartService.getCartGoodsList(param);
 
-		result.putAll(cartService.selecCartGoodsList());
+		model.addAttribute("wmsCartList", order.getWmsCartList());
+		model.addAttribute("resCartList", order.getResCartList());
+		model.addAttribute("delvCartList", order.getDelvCartList());
+		model.addAttribute("IMG_PATH", env.getProperty("upload.goods.view"));
 
-		return result;
+		return super.getDeviceViewName("cart/cartListAjaxForm");
 	}
 }

+ 2 - 2
src/main/java/com/style24/front/biz/web/TsfGoodsController.java

@@ -98,8 +98,8 @@ public class TsfGoodsController extends TsfBaseController {
 			mav.addObject("goodsExtendList", goodsService.getGoodsDealComposeList(paramsGoods));
 		} else {
 			if ("N".equals(goods.getGoodsType())) {	// 일반상품
-				// 상품 다른컬러정보
-				mav.addObject("goodsOtherColorList", goodsService.getGoodsOtherColorList(paramsGoods));
+				// 상품 옵션1 정보
+				mav.addObject("goodsOtherColorList", goodsService.getGoodsOption1List(paramsGoods));
 				// 상품 사이즈정보
 				mav.addObject("goodsSizeList", goodsService.getGoodsSizeList(paramsGoods));
 

+ 45 - 3
src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -10,6 +10,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 import com.style24.core.biz.service.TscCustomerService;
 import com.style24.core.biz.service.TscOrderService;
+import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.front.biz.service.TsfCouponService;
 import com.style24.front.biz.service.TsfCustomerService;
@@ -90,21 +91,62 @@ public class TsfMypageController extends TsfBaseController {
 		// 주문정보 조회
 		Order order = new Order();
 		order.setCustNo(custNo);
-		Collection<Order> orderList = coreOrderService.getOrderListForMypage(order);
-
-		mav.addObject("orderInfo", orderList);
+		mav.addObject("orderInfo", coreOrderService.getOrderListForMypage(order));
 
 		// 쿠폰정보 조회
+		mav.addObject("couponCnt", coreOrderService.getCouponInfo(order));
+		
+		order.setExpiredSoon("Y");
+		mav.addObject("expiredSoonCouponCnt", coreOrderService.getCouponInfo(order));
 
 		// 포인트 정보 조회
 		mav.addObject("rmPntAmt", coreOrderService.getCustPointInfo(order));
 
 		// 상품권 정보 조회
 		mav.addObject("rmGfcdAmt", coreOrderService.getGiftcardInfo(order));
+		
+		// 바꿈
+
+		// 주문접수
+		order.setOrdDtlStat(TscConstants.OrderDetailStat.ORDER_RECEIPT.value());
+		mav.addObject("orderReceiptCount", coreOrderService.getOrderStatCount(order));
+
+		// 결제완료
+		order.setOrdDtlStat(TscConstants.OrderDetailStat.PAYMENT_COMPLETE.value());
+		mav.addObject("paymentCompleteCount", coreOrderService.getOrderStatCount(order));
+
+		// 상품준비중
+		order.setOrdDtlStat(TscConstants.OrderDetailStat.GOODS_PREPARE.value());
+		mav.addObject("goodsPrepareCount", coreOrderService.getOrderStatCount(order));
+
+		// 배송중
+		order.setOrdDtlStat(TscConstants.OrderDetailStat.SHIPPING.value());
+		mav.addObject("shippingCount", coreOrderService.getOrderStatCount(order));
+
+		// 배송완료
+		order.setOrdDtlStat(TscConstants.OrderDetailStat.DELIVERY_COMPLETE.value());
+		mav.addObject("shipCompleteCount", coreOrderService.getOrderStatCount(order));
+
+		// 취소내역
+		order.setChgStat(TscConstants.OrderChangeStat.CANCEL.value());
+		mav.addObject("cancelCount", coreOrderService.getOrderChangeStatCount(order));
+
+		// 반품내역
+		order.setChgStat(TscConstants.OrderChangeStat.RETURN.value());
+		mav.addObject("returnCount", coreOrderService.getOrderChangeStatCount(order));
+
+		// 교환내역
+		order.setChgStat(TscConstants.OrderChangeStat.EXCHANGE.value());
+		mav.addObject("exchangeCount", coreOrderService.getOrderChangeStatCount(order));
+		
+		// 검색기간 설정
+		mav.addObject("searchPeriod", orderService.getSearchPeriod());
 
 		mav.setViewName(super.getDeviceViewName("mypage/MypageOrderListForm"));
 
 		return mav;
 	}
+	
+	
 
 }

+ 129 - 35
src/main/java/com/style24/front/biz/web/TsfOrderController.java

@@ -5,11 +5,13 @@ import java.util.Collection;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.gagaframework.web.parameter.GagaMap;
+import com.style24.core.biz.service.TscFreegiftService;
 import com.style24.core.biz.service.TscOrderService;
 import com.style24.core.support.message.TscMessageByLocale;
+import com.style24.front.biz.service.TsfCartService;
 import com.style24.front.support.controller.TsfBaseController;
 import com.style24.front.support.security.session.TsfSession;
 import com.style24.persistence.domain.Cart;
@@ -34,6 +36,59 @@ public class TsfOrderController extends TsfBaseController {
 	@Autowired
 	private TscOrderService coreOrderService;
 	
+	@Autowired
+	private TscFreegiftService coreFreegiftService;
+	
+	@Autowired
+	private TsfCartService cartService;
+	
+	/**
+	 * 회원, 비회원 주문페이지
+	 *
+	 * @param
+	 * @return
+	 * @author jsh77b
+	 * @since 2021. 02. 02
+	 */
+	@RequestMapping(value = "/noMember")
+	public ModelAndView orderNoMember(Order order) {
+		ModelAndView mav = new ModelAndView();
+		
+		String rtnView = "";
+		
+		// 비회원 주문시 로직 정리
+		// @ web 인 경우에는 고객정보 입력 화면 후 주문서 이동 후 본인인중
+		// @ web 의 경우에는 입력한 고객정보와 인증받은 고객정보가 다른경우 고객정보 업데이트
+		// @ mobile 인 경우에는 본인인증 후 주문서 이동
+		// 배송완료 후 14일 자동구매확정
+		
+		// TODO 임시
+		// 1.0 회원, 비회원 여부 판단
+		if (TsfSession.getInfo() == null) {
+			rtnView = "order/OrderNoMember";
+		} else {
+			if (TsfSession.getInfo().getCustNo() == null) {
+				rtnView = "order/OrderNoMember";
+			} else {
+				rtnView = "forward:/order/form";
+			}
+		}
+		
+		// TODO 임시 장바구니
+		// 2. 장바구니시퀀스 배열 등록 (장바구니 상품 정보 조회)
+		int[] cartSqArr = new int[2];
+		cartSqArr[0] = 8;
+		cartSqArr[1] = 11;
+		
+		order.setCartSqArr(cartSqArr);
+		order.setShotDelvYn("Y");
+		
+		mav.addObject("order" , order);	// 주문정보
+		mav.setViewName(super.getDeviceViewName(rtnView));
+		
+		return mav;
+	}
+	
 	/**
 	 * 주문페이지
 	 *
@@ -43,41 +98,63 @@ public class TsfOrderController extends TsfBaseController {
 	 * @since 2021. 02. 02
 	 */
 	@RequestMapping(value = "/form")
-	public ModelAndView orderForm(Cart cart) {
+	public ModelAndView orderForm(Order order) {
 		ModelAndView mav = new ModelAndView();
- 		
+		
+		// TODO
 		// 1.비회주문, 회원 주문 판단 로직,  고객정보 세션 판단
 		// 세션고객정보가 존재하면 회원주문 없으면 비회원 주문
-		Order order = new Order();
-		if (TsfSession.getInfo().getCustNo() == null) {
-			order.setCustNo(0); // 고객번호등록
+		
+		// 임시 jsessionId
+		String jsessionId 	= "aaec62cc-5f91-47bb-ba65-ebc9a61385cf";
+		Boolean noMember 	= true;
+		
+		// TODO 로그인체크 로직 추가
+		// 1.0 회원, 비회원 여부 판단
+		if (TsfSession.getInfo() == null) {
+			order.setJsessionId(jsessionId);
 		} else {
-			order.setCustNo(TsfSession.getInfo().getCustNo()); // 고객번호등록
+			if (TsfSession.getInfo().getCustNo() == null) {
+				order.setJsessionId(jsessionId);
+			} else {
+				noMember = false;
+				order.setCustNo(TsfSession.getInfo().getCustNo()); // 고객번호등록
+			}
 		}
 		
-		// 1.1 주문고객 정보조회
-		Order custemerInfo = coreOrderService.getCustemerInfo(order);
-		
-		// 1.2 배송지 정보조회 (기본배송지)
-		Order deliveryAddrInfo = coreOrderService.getDeliveryAddrInfo(order);
+		Order custemerInfo = new Order();
+		Order deliveryAddrInfo = new Order();
 
-		
-		
-		// 2. 장바구니시퀀스 배열 등록 (장바구니 상품 정보 조회)
-		int[] cartSqArr = new int[3];
-		order.setCartSqArr(cartSqArr);
-		
+		// TODO 로그인체크 로직 추가
+		if (noMember) {
+			// 1.1 주문고객 정보조회
+			custemerInfo.setCustNm(order.getCustNm());
+			custemerInfo.setCellPhnno(order.getCellPhnno());
+			custemerInfo.setEmail(order.getEmail());
+			
+			// 1.2 배송지 정보조회 (기본배송지)
+			deliveryAddrInfo.setDelvAddrNm(order.getCustNm());
+			deliveryAddrInfo.setRecipZipcode(order.getRecipZipcode());
+			deliveryAddrInfo.setRecipBaseAddr(order.getRecipBaseAddr());
+			deliveryAddrInfo.setRecipDtlAddr(order.getRecipDtlAddr());
+		} else {
+			// 1.1 주문고객 정보조회
+			custemerInfo = coreOrderService.getCustemerInfo(order);
+			
+			// 1.2 배송지 정보조회 (기본배송지)
+			deliveryAddrInfo = coreOrderService.getDeliveryAddrInfo(order);
+		}
+
+		// TODO 임시 장바구니
+		// 2. 장바구니시퀀스 배열 등록 (장바구니 상품 정보 조회)		
 		// 2.1 배송단위별 상품 목록 조회 (장바구니)
-		Collection<Order> cartGoodsList = coreOrderService.getCartGoodsList(order);
+		//Collection<Order> cartGoodsList = coreOrderService.getCartGoodsList(order);
+		Collection<Order> tmtbGoodsApplyList = cartService.getMoreBetterAmtList(order);
 		
 		// 2.2 배송단위별 장바구니 상품 건수 조회 (장바구니상품)
-		Order delvOrder = (Order) coreOrderService.getCartDelvGoodsCntList(cartGoodsList);
+		Order delvOrder = (Order) coreOrderService.getCartDelvGoodsCntList(tmtbGoodsApplyList);
 
-		
 		// 3. 할인구간정보조회
-		// 3.1 장바구니상품 즉시할인, 다다익선 할인 금액 적용 정보 조회 (주문상세목록)
-		Collection<Order> tmtbGoodsList = coreOrderService.getCartGoodsList(order);		
-		
 		// 3.2 장바구니상품 상품쿠폰, 장바구니쿠폰 정보 조회
 		Collection<Order> goodsCartCpnApplyGoodsList = coreOrderService.getGoodsCartCpnApplyGoodsList(order);
 		
@@ -87,39 +164,56 @@ public class TsfOrderController extends TsfBaseController {
 		// 3.4 고객 보유 상품권 정보 조회
 		int giftcardInfo = coreOrderService.getGiftcardInfo(order);
 		
-		
-		
 		// 4. 사은품 정보
 		// 4.1 장바구니상품 사음품 적용 정보 조회
-		
-		
-		
-		
-
-		
+		Collection<Order> freegfitbGoodsApplyList = coreFreegiftService.getOrderFreegift(order);
 
-		
 		// 101. 상품정보
-		mav.addObject("cartGoodsList"					, cartGoodsList);					// 장바구니상품목록
+		mav.addObject("cartGoodsList"					, tmtbGoodsApplyList);				// 장바구니상품목록 (즉시할인쿠폰적용)
+		mav.addObject("delvTotCnt" 						, delvOrder.getDelvTotCnt());		// 총상품건수
+		mav.addObject("delvFeeTotCnt"					, delvOrder.getDelvFeeTotCnt());	// 총배송타입건수
 		mav.addObject("wmsCnt" 							, delvOrder.getWmsCnt());			// 자사상품건수
 		mav.addObject("resCnt" 							, delvOrder.getResCnt());			// 자사예약상품건수
 		mav.addObject("delvCnt" 						, delvOrder.getDelvCnt());			// 입점업체상품건수
 		mav.addObject("wmsCartList" 					, delvOrder.getWmsCartList());		// 자사장바구니상품목록
-		mav.addObject("resCartList" 					, delvOrder.getResCartList());		// 자사장바구니예약상품목
+		mav.addObject("resCartList" 					, delvOrder.getResCartList());		// 자사장바구니예약상품목
 		mav.addObject("delvCartList" 					, delvOrder.getDelvCartList());		// 입점업체장바구니상품목록
 		
 		// 102. 고객정보
 		mav.addObject("custemerInfo"					, custemerInfo);					// 고객정보
 		mav.addObject("deliveryAddrInfo"				, deliveryAddrInfo);				// 배송지정보
+		mav.addObject("shotDelvYn" 						, order.getShotDelvYn());			// 장바구니 총알배송여부
 		
 		// 103. 할인정보
+		mav.addObject("tmtbGoodsApplyList"				, tmtbGoodsApplyList);				// 다다익선 적용 목록
 		mav.addObject("goodsCartCpnApplyGoodsList"		, goodsCartCpnApplyGoodsList);		// 상품쿠폰, 장바구니쿠폰 상품단위 조회
 		mav.addObject("custPointInfo"					, custPointInfo);					// 고객포인트정보
 		mav.addObject("giftcardInfo"					, giftcardInfo);					// 고객상품권정보
 		
+		// 104. 사은품정보
+		mav.addObject("freegfitbGoodsApplyList"			, freegfitbGoodsApplyList);			// 사은품정보 목록
+		
 		mav.setViewName(super.getDeviceViewName("order/OrderForm"));
 		
 		return mav;
 	}
+	
+	/**
+	 * 총알배송 가능 지역 체크
+	 *
+	 * @param
+	 * @return
+	 * @author jsh77b
+	 * @since 2021. 02. 08
+	 */
+	@ResponseBody
+	@RequestMapping(value = "/getDailyDeliveryCheck")
+	public int getDailyDeliveryCheck(Order order) {
+		
+		// 1. 총알배송가능 지역, 총알배송 가능 시간 체크
+		int rtn = coreOrderService.getDailyDeliveryCheck(order);
+		
+		return rtn;
+	}
 
 }

+ 1 - 0
src/main/java/com/style24/persistence/domain/Goods.java

@@ -70,6 +70,7 @@ public class Goods extends TscBaseDomain {
 	private String adultYn;		//성인용품여부
 
 	private String colorCd;		//색상코드
+	private String colorNM;		//색상코드명
 	private String brandnm;		//브랜드명
 	private String brandGrpNm;	//브랜드그룹명
 	private String frontGb;		//프론트구분

+ 13 - 5
src/main/java/com/style24/persistence/domain/GoodsStock.java

@@ -14,14 +14,22 @@ import lombok.Data;
 @Data
 public class GoodsStock extends TscBaseDomain {
 	// 재고 정보
-	private int currStockQty;		// 가용재고
-	private int goodsQty;			// 안전재고
 	private String goodsCd;			// 상품번호
-	private String itemCd;			// 구성상품코드
-	private String goodsType;		// 상품구분
 	private String optCd;			// 옵션코드
 	private String optCd1;			// 옵션코드1(자사 : 컬러, 입점 : 옵션명1)
 	private String optCd2;			// 옵션코드1(자사 : 사이즈, 입점 : 옵션명2)
+	private Integer skuModelNo;		// SKUModelNo(WMS)
+	private Integer productNo;		// ProductNo(WMS)
+	private Integer productCode;	// ProductCode(WMS)
+	private int currStockQty;		// 가용재고
+	private int addPrice;			// 추가금액
 	private String soldoutYn;		// 품절여부
-	private String skuModelNo;		// SKUModelNo(WMS)
+	private int dispOrd;			// 표시순서
+
+	private String itemCd;			// 구성상품코드
+	private String goodsType;		// 상품구분
+	private int goodsQty;			// 안전재고
+	private String sysImgNm;		// 상품이미지
+	private int stockQty;			// 상품 재고
+
 }

+ 63 - 36
src/main/java/com/style24/persistence/mybatis/shop/TsfCart.xml

@@ -255,12 +255,27 @@
 			 , T.APPLY_GB
 		     , TAG.GOODS_CD
 		     , TAG.GOODS_GB
+		     , TAG2.TMTB_CNT
 			 , T.TMTB_NM
 			 , C.GOODS_QTY
 		FROM   TB_CART C
 		INNER  JOIN TB_TMTB_APPLY_GOODS TAG
 		ON	   C.GOODS_CD = TAG.GOODS_CD
 		AND	   TAG.DEL_YN = 'N'
+		INNER  JOIN (SELECT TAG.TMTB_SQ
+						  , COUNT(1) AS TMTB_CNT
+					 FROM   TB_TMTB_APPLY_GOODS TAG
+					 INNER  JOIN TB_CART C
+					 ON     TAG.GOODS_CD = C.GOODS_CD
+					 WHERE  TAG.DEL_YN = 'N'
+					<if test="cartSqArr != null and cartSqArr.length > 0">
+					AND     C.CART_SQ IN
+						<foreach collection="cartSqArr" item="item" index="index"  open="(" close=")" separator=",">
+								#{item}
+						</foreach>
+					</if>
+					 GROUP  BY TAG.TMTB_SQ) AS TAG2
+		ON     TAG.TMTB_SQ = TAG2.TMTB_SQ
 		INNER  JOIN TB_TMTB T
 		ON	   T.TMTB_SQ = TAG.TMTB_SQ
 		AND	   T.TMTB_STAT = 'G232_11' /*진행*/
@@ -270,34 +285,41 @@
 		ON     T.TMTB_SQ = NOT_APPLY.TMTB_SQ
 		AND    C.GOODS_CD = NOT_APPLY.GOODS_CD
 		AND    NOT_APPLY.GOODS_GB = 'G800_30'   /* 제외상품 */
+		AND    NOT_APPLY.DEL_YN = 'N'
 		WHERE  1=1
 		AND    NOT_APPLY.TMTB_SQ IS NULL
+		AND    T.DEL_YN = 'N'
 		AND    T.TMTB_ST_DT <![CDATA[<=]]> NOW()
 		AND    T.TMTB_ED_DT >= NOW()
+		AND    T.APPLY_GB = #{applyGb}
 		AND    C.CART_GB = 'G026_BC'
 		AND    G.GOODS_STAT = 'G008_90'
 		AND    G.SELF_MALL_YN = 'Y'
-		<if test="cartSqs != null and cartSqs.length > 0">
-		AND   C.CART_SQ IN
-			<foreach collection="cartSqs" item="item" index="index"  open="(" close=")" separator=",">
+		<if test="cartSqArr != null and cartSqArr.length > 0">
+		AND    C.CART_SQ IN
+			<foreach collection="cartSqArr" item="item" index="index"  open="(" close=")" separator=",">
 				#{item}
 			</foreach>
 		</if>
+		ORDER BY TAG.TMTB_SQ, TAG.GOODS_GB
 	</select>
 
 	<!-- 다다익선 적용 상품 SUM DATA 조회 -->
 	<select id="selectApplyMoreBetterCartInfoList" parameterType="Order" resultType="Order">
 		/* TsfCart.selectApplyMoreBetterCartInfoList : 다다익선 적용 상품 SUM DATA 조회 */
 		SELECT TAG.TMTB_SQ
-			 , SUM((FN_GET_APPLY_CPN1_PRICE(CA.GOODS_CD, #{frontGb}) + IFNULL(OP.ADD_PRICE, 0)) * C.GOODS_QTY) AS TMTB_SUM_AMT
+			 , SUM((FN_GET_APPLY_CPN1_PRICE(C.GOODS_CD, #{frontGb}) + IFNULL(OP.ADD_PRICE, 0)) * C.GOODS_QTY) AS TMTB_SUM_AMT
 			 , SUM(C.GOODS_QTY) AS TMTB_SUM_QTY
 		FROM   TB_TMTB_APPLY_GOODS TAG
 		INNER  JOIN TB_CART C
 		ON     TAG.GOODS_CD = C.GOODS_CD
 		INNER  JOIN TB_GOODS G
 		ON     C.GOODS_CD = G.GOODS_CD
+		INNER  JOIN TB_TMTB T
+		ON     TAG.TMTB_SQ = T.TMTB_SQ
 		LEFT   OUTER JOIN TB_TMTB_APPLY_GOODS NOT_APPLY
 		ON     TAG.GOODS_CD = NOT_APPLY.GOODS_CD
+		AND    TAG.TMTB_SQ = NOT_APPLY.TMTB_SQ
 		AND    NOT_APPLY.GOODS_GB = 'G800_30'   /* 제외상품 */
 		LEFT   OUTER JOIN (SELECT OP.ADD_PRICE
 								, C.CART_SQ
@@ -312,8 +334,8 @@
 		ON     C.CART_SQ = OP.CART_SQ
 		WHERE  1=1
 		AND    NOT_APPLY.TMTB_SQ IS NULL
+		AND    T.DEL_YN = 'N'
 		AND    TAG.DEL_YN = 'N'
-		AND    C.JSESSION_ID = #{jsessionId}
 		AND    C.CART_GB = 'G026_BC'
 		AND    G.GOODS_STAT = 'G008_90'
 		AND    G.SELF_MALL_YN = 'Y'
@@ -323,55 +345,29 @@
 				#{item}
 			</foreach>
 		</if>
-		<if test="cartSqs != null and cartSqs.length > 0">
+		<if test="cartSqArr != null and cartSqArr.length > 0">
 		AND    C.CART_SQ IN
-			<foreach collection="cartSqs" item="item" index="index"  open="(" close=")" separator=",">
+			<foreach collection="cartSqArr" item="item" index="index"  open="(" close=")" separator=",">
 				#{item}
 			</foreach>
 		</if>
 		GROUP BY TAG.TMTB_SQ
 	</select>
 
-	<!-- 다다익선 적용 상품 조회 -->
-	<select id="selectApplyMoreBetterCartList" parameterType="int" resultType="Order">
-		/* TsfCart.selectApplyMoreBetterCartList : 다다익선 적용 상품 SUM DATA 조회 */
-		SELECT TAG.GOODS_CD
-			 , TAG.TMTB_SQ
-		FROM   TB_TMTB_APPLY_GOODS TAG
-		INNER  JOIN TB_CART C
-		ON     TAG.GOODS_CD = C.GOODS_CD
-		INNER  JOIN TB_GOODS G
-		ON     C.GOODS_CD = G.GOODS_CD
-		LEFT   OUTER JOIN TB_TMTB_APPLY_GOODS NOT_APPLY
-		ON     TAG.GOODS_CD = NOT_APPLY.GOODS_CD
-		AND    NOT_APPLY.GOODS_GB = 'G800_30'   /* 제외상품 */
-		WHERE  1=1
-		AND    NOT_APPLY.TMTB_SQ IS NULL
-		AND    TAG.DEL_YN = 'N'
-		AND    C.JSESSION_ID = #{jsessionId}
-		AND    C.CART_GB = 'G026_BC'
-		AND    G.GOODS_STAT = 'G008_90'
-		AND    G.SELF_MALL_YN = 'Y'
-		<if test="list != null and list.size() > 0">
-			AND    TAG.TMTB_SQ IN
-			<foreach collection="list" item="item" index="index"  open="(" close=")" separator=",">
-				#{item}
-			</foreach>
-		</if>
-	</select>
-
 	<!-- 다다익선 SECTION 적용 조건 조회 -->
 	<select id="selectTmtbSectionValList" parameterType="int" resultType="Order">
 		/* TsfCart.selectTmtbSectionValList : 다다익선 SECTION 적용 조건 조회 */
 		SELECT TC.SECTION_GB
 			 , TC.SECTION_VAL
 			 , TC.TMTB_SQ
-			 , TV.
+			 , TV.DC_WAY
+			 , TV.DC_VAL
 		FROM   TB_TMTB_SECTION TC
 		INNER  JOIN TB_TMTB_VAL TV
 		ON     TC.TMTB_SECTION_SQ = TV.TMTB_SECTION_SQ
 		WHERE  1=1
 		AND    TC.DEL_YN = 'N'
+		AND    TV.DEL_YN = 'N'
 		<if test="list != null and list.size() > 0">
 		AND    TC.TMTB_SQ IN
 			<foreach collection="list" item="item" index="index"  open="(" close=")" separator=",">
@@ -380,4 +376,35 @@
 		</if>
 		ORDER  BY TMTB_SQ, SECTION_VAL
 	</select>
+
+	<!-- 장바구니 상품 조회 -->
+	<select id="getCartGoodsList" parameterType="Order" resultType="Order">
+		/* TsfCart.getCartGoodsList : 장바구니 상품 조회 */
+		SELECT C.CART_SQ
+			 , C.GOODS_CD
+			 , C.GOODS_QTY
+			 , CD.ITEM_CD
+			 , CD.OPT_CD
+			 , G.GOODS_TYPE
+		FROM   TB_CART C
+		INNER  JOIN TB_CART_DETAIL CD
+		ON     C.CART_SQ = CD.CART_SQ
+		INNER  JOIN TB_GOODS G
+		ON     C.GOODS_CD = G.GOODS_CD
+		WHERE  G.SELF_MALL_YN = 'Y'
+		AND    G.GOODS_STAT = 'G008_90'
+		<if test="custNo == 0">
+		AND    C.CUST_NO = 0
+		AND    C.JSESSION_ID = #{jsessionId}
+		</if>
+		<if test="custNo != 0">
+		AND    C.CUST_NO = #{custNo}
+		</if>
+		<if test="cartSqArr != null and cartSqArr.length > 0">
+		AND    C.CART_SQ IN
+			<foreach collection="cartSqArr" item="item" index="index"  open="(" close=")" separator=",">
+				#{item}
+			</foreach>
+		</if>
+	</select>
 </mapper>

+ 86 - 46
src/main/java/com/style24/persistence/mybatis/shop/TsfGoods.xml

@@ -120,6 +120,7 @@
 		     , G.RETURNABLE_YN
 		     , (SELECT CATE1_NO FROM TB_SITE_BRAND WHERE  BRAND_CD = G.BRAND_CD AND SITE_CD = #{siteCd} AND USE_YN = 'Y') AS BRAND_CATE1_NO
 		     , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = IFNULL(#{colorCd}, IFNULL(G.MAIN_COLOR_CD,'00')) AND DEFAULT_IMG_YN = 'Y') AS SYS_IMG_NM
+		     , (SELECT ) AS COLOR_NM
 		     , BP.CURR_PRICE AS BENEFIT_PRICE
 		     , (CASE WHEN W.GOODS_CD IS NULL THEN 'N' ELSE 'Y' END) AS WISH_YN
 		     , (CASE WHEN G.GOODS_TYPE = 'G056_N' THEN (SELECT IFNULL(MAX(CASE WHEN SOLDOUT_YN = 'Y' THEN 0
@@ -199,56 +200,95 @@
 	<!-- 상품 옵션1 목록 -->
 	<select id="getGoodsOption1List" parameterType="Goods" resultType="GoodsStock">
 		/* TsfGoods.getGoodsOption1List */
-		SELECT Z.*
+		SELECT GOODS_CD
+		     , OPT_CD1
+		     , STOCK_QTY
+		FROM (
+		     SELECT G.GOODS_CD
+		          , G.SELF_GOODS_YN
+		          , O.OPT_CD1 
+		          , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = IF(G.SELF_GOODS_YN ='Y', O.OPT_CD1, '00') AND DEFAULT_IMG_YN = 'Y') AS SYS_IMG_NM
+		          , IFNULL(S.STOCK_QTY,0) AS STOCK_QTY
+		          , G.MIN_ORD_QTY
+		     FROM TB_GOODS G
+		     INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
+		                           AND B.USE_YN = 'Y'
+		     INNER JOIN (SELECT GOODS_CD, OPT_CD1, MIN(DISP_ORD) AS DISP_ORD FROM TB_OPTION WHERE DISP_YN = 'Y' GROUP BY  GOODS_CD, OPT_CD1 ) O ON G.GOODS_CD = O.GOODS_CD
+		     LEFT OUTER JOIN (SELECT GOODS_CD
+		                           , OPT_CD1
+		                           , SUM(CASE WHEN SOLDOUT_YN = 'Y' THEN 0
+		                                      ELSE CURR_STOCK_QTY
+		                                      END) AS STOCK_QTY
+		                      FROM VW_STOCK
+		                      WHERE DISP_YN = 'Y'
+		                      GROUP BY GOODS_CD, OPT_CD1) S ON G.GOODS_CD = S.GOODS_CD 
+		                                                    AND O.OPT_CD1 = S.OPT_CD1
+		     WHERE G.GOODS_CD = #{goodsCd})
+		     AND G.GOODS_TYPE = 'G056_N' -- 일반상품
+		     <if test='adminYn == null or adminYn != "Y"'>
+		     AND G.GOODS_STAT = 'G008_90'
+		     </if>
+		     ORDER BY O.DISP_ORD
+		)
+	</select>
+	
+	<!-- 상품 사이즈 목록 -->
+	<select id="getGoodsSizeList" parameterType="Goods" resultType="GoodsStock">
+		/* TsfGoods.getGoodsSizeList */
+		SELECT GOODS_CD
+		     , OPT_CD
+		     , OPT_CD1
+		     , OPT_CD2
+		     , STOCK_QTY
+		     , SOLDOUT_YN
+		     , DISP_ORD
 		FROM (
-		    SELECT G.GOODS_CD
-		         , G.SELF_GOODS_YN
-		         , G.GOODS_STAT
-		         , G.MAIN_COLOR_CD
-		         , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = IFNULL(#{colorCd}, IFNULL(G.MAIN_COLOR_CD,'00')) AND DEFAULT_IMG_YN = 'Y') AS SYS_IMG_NM
-		         , IFNULL( (CASE WHEN G.GOODS_CD = #{goodsCd} THEN  1 
-		                         ELSE ( CASE WHEN G.GOODS_TYPE = 'G056_N'THEN S.STOCK_QTY ELSE S1.STOCK_QTY END) 
-		                         END)
-		                 ,0) AS STOCK_QTY
-		         , (SELECT CATE1_NO
-		            FROM TB_SITE_BRAND
-		            WHERE  BRAND_CD = G.BRAND_CD
-		            AND SITE_CD = #{siteCd}
-		            AND USE_YN = 'Y') AS BRAND_CATE1_NO
-		    FROM TB_GOODS G
-		    INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
-		                          AND B.USE_YN = 'Y'
-		    INNER JOIN TB_OPTION O ON G.GOODS_CD = O.GOODS_CD
-		    LEFT OUTER JOIN (SELECT GOODS_CD
-		                          , MAX(CASE WHEN SOLDOUT_YN = 'Y' THEN 0
-		                                     ELSE CURR_STOCK_QTY
-		                                     END) AS STOCK_QTY
-		                     FROM VW_STOCK
-		                     WHERE SOLDOUT_YN = 'N'
-		                     GROUP BY GOODS_CD) S ON G.GOODS_CD = S.GOODS_CD
-		    LEFT OUTER JOIN (SELECT GOODS_CD
-		                          , MAX(CASE WHEN SOLDOUT_YN = 'Y' THEN 0
-		                                     ELSE CURR_STOCK_QTY
-		                                     END) AS STOCK_QTY
-		                     FROM VW_STOCK_COMPOSE
-		                     WHERE SOLDOUT_YN = 'N'
-		                     GROUP BY GOODS_CD) S1 G.GOODS_CD = S1.GOODS_CD
-		    WHERE G.GOODS_NUM = (SELECT GOODS_NUM FROM TB_GOODS WHERE GOODS_CD = #{goodsCd})
-		    AND G.GOODS_TYPE = 'G056_N' -- 일반상품
-		    <if test='goodsCdIncludeYn != null and goodsCdIncludeYn == "N"'>
-		    AND G.GOODS_CD <![CDATA[<>]]> #{goodsCd}
-		    </if>
-		    <if test='adminYn == null or adminYn != "Y"'>
-		    AND G.GOODS_STAT = 'G008_90'
-		    </if>
-		) Z
+		    SELECT GOODS_CD
+		         , OPT_CD
+		         , OPT_CD1
+		         , OPT_CD2
+		         , (CASE WHEN STOCK_QTY - MIN_ORD_QTY >= 0 THEN STOCK_QTY
+		                 ELSE 0
+		            END ) AS STOCK_QTY
+		         , SOLDOUT_YN
+		         , DISP_ORD
+		    FROM (
+		          SELECT GOODS_CD
+		               , OPT_CD
+		               , OPT_CD1
+		               , OPT_CD2
+		               , STOCK_QTY
+		               , SOLDOUT_YN
+		               , DISP_ORD
+		               , (SELECT MIN_ORD_QTY FROM TB_GOODS WHERE GOODS_CD = A.GOODS_CD ) AS MIN_ORD_QTY
+		          FROM (
+		                SELECT GOODS_CD
+		                     , OPT_CD
+		                     , OPT_CD1
+		                     , OPT_CD2
+		                     , CURR_STOCK_QTY AS STOCK_QTY
+		                     , SOLDOUT_YN
+		                     , DISP_ORD
+		                FROM VW_STOCK
+		                WHERE GOODS_CD = #{goodsCd}
+		                AND DISP_YN ='Y'
+		               ) A
+		        ) B
+		     ) Z
 		WHERE 1 = 1
-		<if test='soldoutGoodsDisplayYn != null and soldoutGoodsDisplayYn =="N"'>
-		AND Z.STOCK_QTY > 0
+		<if test='soldoutYn != null and soldoutYn == "Y"'>
+		AND (SOLDOUT_YN = 'Y'
+		     OR
+		     STOCK_QTY <![CDATA[<=]]> 0
+		    )
+		</if>
+		<if test='soldoutYn != null and soldoutYn == "N"'>
+		AND SOLDOUT_YN = 'N'
+		AND STOCK_QTY > 0
 		</if>
-		ORDER BY Z.COLOR_CD
+		ORDER BY DISP_ORD
 	</select>
-		
+	
 	<!-- 상품 동영상정보 -->
 	<select id="getVideoList" parameterType="String" resultType="VideoDisploc">
 		/* TsfGoods.getVideoList */

+ 73 - 0
src/main/webapp/WEB-INF/views/web/cart/cartListAjaxFormWeb.html

@@ -0,0 +1,73 @@
+<html lang="ko"
+      xmlns:th="http://www.thymeleaf.org">
+<table>
+    <colgroup>
+        <col width="710">
+        <col width="190">
+        <col width="*">
+    </colgroup>
+    <tbody>
+<th:block th:each="cart, status : ${wmsCartList}">
+    <tr>
+        <td class="t_l">
+            <div class="info_item">
+                <div class="form_box">
+                    <p class="form_field">
+                        <input id="cartSqArr" type="checkbox" th:value="${cart.cartSq}" checked><label for="cartSqArr"><span class="sr-only">상품선택</span></label>
+                    </p>
+                </div>
+                <div class="thumb_box">
+                    <a href="">
+                        <img th:src="${IMG_PATH} + '/' + ${cart.sysImgNm}" width="100%" alt=""><!-- IMG_PATH : //image.style24.com/speedy_image-wivismall/goods -->
+                    </a>
+                </div>
+                <div class="info_box">
+                    <p class="od_name">
+                        <a href="">
+                            <span class="brand" th:text="${cart.brandEnm}"></span>
+                            <span class="name" th:text="${cart.goodsNm}"></span>
+                        </a>
+                    </p>
+                    <p class="od_opt" th:each="opt, index : ${cart.itemNmArr}">
+                        <span class="option">옵션:<em th:text="${cart.itemNmArr[index.index]} + '_' + ${cart.optCdArr[index.index]}"></em></span>
+                        <span class="count">수량:<em th:text="${cart.itemQtyArr[index.index]} * ${cart.goodsQty}"></em>개</span>
+                    </p>
+                    <p class="od_modify">
+                        <button type="button"><span>옵션/수량변경</span></button>
+                    </p>
+                </div>
+            </div>
+        </td>
+        <td>
+            <div class="info_calc">
+                <p class="price">
+                    <span class="selling_price" th:text="${cart.tmtbDcAmt}"></span>
+                    <del th:text="${cart.qtySumCurrPrice}"></del>
+                </p>
+                <p class="point"><span th:text="${cart.savePntAmt}"></span>p 적립예정</p>
+                <p>
+                    <button type="button" class="btn btn_primary btn_sm"><span>즉시구매</span></button>
+                </p>
+                <p class="util">
+                    <span>
+                        <button type="button" class="btn_favorite active"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
+                    </span>
+                    <span>
+                        <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
+                    </span>
+                </p>
+            </div>
+        </td>
+        <td class="merge_row">
+            <div class="info_dlvr">
+                <span class="dlvr_fee">3,000원</span>
+                <a href="#" target="_blank">배송비 SAVE 상품 보기</a>
+            </div>
+        </td>
+    </tr>
+</th:block>
+
+
+    </tbody>
+</table>
+</html>

+ 68 - 429
src/main/webapp/WEB-INF/views/web/cart/cartListFormWeb.html

@@ -72,189 +72,10 @@
                                     <span class="ml10">오늘 자정까지 도착</span>
                                 </h3>
                                 <div class="btn_area">
-                                    <button type="button" class="btn btn_default"><span><i class="ico ico_trash"></i>전체 삭제</span></button>
+                                    <button type="button" class="btn btn_default"><span><i class="ico ico_trash"></i>전체삭제</span></button>
                                 </div>
-                                <div class="tbl type2">
-                                    <table>
-                                        <colgroup>
-                                            <col width="710">
-                                            <col width="190">
-                                            <col width="*">
-                                        </colgroup>
-                                        <tbody>
-                                        <tr>
-                                            <td class="t_l">
-                                                <div class="info_item">
-                                                    <div class="form_box">
-                                                        <p class="form_field">
-                                                            <input id="od_item1" type="checkbox" checked=""><label for="od_item1"><span class="sr-only">상품선택</span></label>
-                                                        </p>
-                                                    </div>
-                                                    <div class="thumb_box">
-                                                        <a href="">
-                                                            <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
-                                                        </a>
-                                                    </div>
-                                                    <div class="info_box">
-                                                        <p class="od_name">
-                                                            <a href="">
-                                                                <span class="brand">나이키 키즈</span>
-                                                                <span class="name">몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트 몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트</span>
-                                                            </a>
-                                                        </p>
-                                                        <p class="od_opt">
-                                                            <span class="option">옵션:<em>01_루돌프융기모상하복_D오렌지/110</em></span>
-                                                            <span class="count">수량:<em>99</em>개</span>
-                                                        </p>
-                                                        <p class="od_modify">
-                                                            <button type="button"><span>옵션/수량변경</span></button>
-                                                        </p>
-                                                    </div>
-                                                </div>
-                                            </td>
-                                            <td>
-                                                <div class="info_calc">
-                                                    <p class="price">
-                                                        <span class="selling_price">61,200원</span>
-                                                        <del>100,000원</del>
-                                                    </p>
-                                                    <p class="point"><span>49</span>p 적립예정</p>
-                                                    <p>
-                                                        <button type="button" class="btn btn_primary btn_sm"><span>즉시구매</span></button>
-                                                    </p>
-                                                    <p class="util">
-                                                        <span>
-                                                            <button type="button" class="btn_favorite"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
-                                                        </span>
-                                                        <span>
-                                                            <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
-                                                        </span>
-                                                    </p>
-                                                </div>
-                                            </td>
-                                            <td class="merge_row"> <!-- 같은 데이터 노출시 동일 영역끼리 병합 : 클래스명 merge_row 추가 -->
-                                                <div class="info_dlvr">
-                                                    <span class="dlvr_fee">3,000원</span>
-                                                    <a href="#" target="_blank">배송비 SAVE 상품 보기</a>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="t_l">
-                                                <div class="info_item">
-                                                    <div class="form_box">
-                                                        <p class="form_field">
-                                                            <input id="od_item2" type="checkbox" checked=""><label for="od_item2"><span class="sr-only">상품선택</span></label>
-                                                        </p>
-                                                    </div>
-                                                    <div class="thumb_box">
-                                                        <a href="">
-                                                            <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
-                                                        </a>
-                                                    </div>
-                                                    <div class="info_box">
-                                                        <p class="od_name">
-                                                            <a href="">
-                                                                <span class="brand">페르지노 몬티</span>
-                                                                <span class="name">몰리겨울상하복 균일가 택1 </span>
-                                                            </a>
-                                                        </p>
-                                                        <p class="od_opt">
-                                                            <span class="option">옵션:<em>01_루돌프융기모상하복_D오렌지/110</em></span>
-                                                            <span class="count">수량:<em>100</em>개</span>
-                                                        </p>
-                                                        <p class="od_modify">
-                                                            <button type="button"><span>옵션/수량변경</span></button>
-                                                        </p>
-                                                    </div>
-                                                </div>
-                                            </td>
-                                            <td>
-                                                <div class="info_calc">
-                                                    <p class="price">
-                                                        <span class="selling_price">61,200원</span>
-                                                        <del>100,000원</del>
-                                                    </p>
-                                                    <p class="point"><span>49</span>p 적립예정</p>
-                                                    <p>
-                                                        <button type="button" class="btn btn_primary btn_sm"><span>즉시구매</span></button>
-                                                    </p>
-                                                    <p class="util">
-                                                        <span>
-                                                            <button type="button" class="btn_favorite"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
-                                                        </span>
-                                                        <span>
-                                                            <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
-                                                        </span>
-                                                    </p>
-                                                </div>
-                                            </td>
-                                            <td class="merge_row"> <!-- 같은 데이터 노출시 동일 영역끼리 병합 : 클래스명 merge_row 추가 -->
-                                                <div class="info_dlvr">
-                                                    <span class="dlvr_fee">3,000원</span>
-                                                    <a href="#" target="_blank">배송비 SAVE 상품 보기</a>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="t_l">
-                                                <div class="info_item">
-                                                    <div class="form_box">
-                                                        <p class="form_field">
-                                                            <input id="od_item3" type="checkbox" checked=""><label for="od_item3"><span class="sr-only">상품선택</span></label>
-                                                        </p>
-                                                    </div>
-                                                    <div class="thumb_box">
-                                                        <a href="">
-                                                            <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
-                                                        </a>
-                                                    </div>
-                                                    <div class="info_box">
-                                                        <p class="od_name">
-                                                            <a href="">
-                                                                <span class="brand">Mollimelli 몰리멜리</span>
-                                                                <span class="name">몰리겨울상하복 균일가 택1 </span>
-                                                            </a>
-                                                        </p>
-                                                        <p class="od_opt">
-                                                            <span class="option">옵션:<em>01_루돌프융기모상하복_D오렌지/110</em></span>
-                                                            <span class="count">수량:<em>100</em>개</span>
-                                                        </p>
-                                                        <p class="od_modify">
-                                                            <button type="button"><span>옵션/수량변경</span></button>
-                                                        </p>
-                                                    </div>
-                                                </div>
-                                            </td>
-                                            <td>
-                                                <div class="info_calc">
-                                                    <p class="price">
-                                                        <span class="selling_price">61,200원</span>
-                                                        <del>100,000원</del>
-                                                    </p>
-                                                    <p class="point"><span>49</span>p 적립예정</p>
-                                                    <p>
-                                                        <button type="button" class="btn btn_primary btn_sm"><span>즉시구매</span></button>
-                                                    </p>
-                                                    <p class="util">
-                                                            <span>
-                                                                <button type="button" class="btn_favorite"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
-                                                            </span>
-                                                        <span>
-                                                                <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
-                                                            </span>
-                                                    </p>
-                                                </div>
-                                            </td>
-                                            <td class="merge_row"> <!-- 같은 데이터 노출시 동일 영역끼리 병합 : 클래스명 merge_row 추가 -->
-                                                <div class="info_dlvr">
-                                                    <span class="dlvr_fee">3,000원</span>
-                                                    <a href="#" target="_blank">배송비 SAVE 상품 보기</a>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
+                                <div id="bulletDelvList" class="tbl type2">
+
                                 </div>
                             </div>
                             <!-- //총알배송 -->
@@ -264,9 +85,9 @@
                                     STYLE24 일반배송
                                 </h3>
                                 <div class="btn_area">
-                                    <button type="button" class="btn btn_default"><span><i class="ico ico_trash"></i>전체 삭제</span></button>
+                                    <button type="button" class="btn btn_default"><span><i class="ico ico_trash"></i>전체삭제</span></button>
                                 </div>
-                                <div class="tbl type2">
+                                <div id="dlvrList2" class="tbl type2">
                                     <table>
                                         <colgroup>
                                             <col width="710">
@@ -284,7 +105,7 @@
                                                     </div>
                                                     <div class="thumb_box">
                                                         <a href="">
-                                                            <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
+                                                            <img src="../ux/images/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
                                                         </a>
                                                     </div>
                                                     <div class="info_box">
@@ -301,24 +122,13 @@
                                                         <p class="od_modify">
                                                             <button type="button"><span>옵션/수량변경</span></button>
                                                         </p>
-                                                        <div class="od_moresale">
-                                                            <a href="" class="btn_moresale">
-                                                                <i class="ico ico_saletag"></i><span class="c_primary">다다익선 적용내역</span>
-                                                            </a>
-                                                            <div class="li_moresale">
-                                                                <ul>
-                                                                    <li>트러커 자켓 3개 이상 구매시 10% 할인</li>
-                                                                    <li>TBJ상품 2만원 이상 구매시 10% 할인</li>
-                                                                </ul>
-                                                            </div>
-                                                        </div>
                                                     </div>
                                                 </div>
                                             </td>
                                             <td>
                                                 <div class="info_calc">
                                                     <p class="price">
-                                                        <span class="selling_price c_primary">61,200원</span> <!-- 다다익선 할인적용된 가격 표기 시 클래스 c_primary 추가 -->
+                                                        <span class="selling_price">61,200원</span>
                                                         <del>100,000원</del>
                                                     </p>
                                                     <p class="point"><span>49</span>p 적립예정</p>
@@ -327,7 +137,7 @@
                                                     </p>
                                                     <p class="util">
                                                         <span>
-                                                            <button type="button" class="btn_favorite"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
+                                                            <button type="button" class="btn_favorite active"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
                                                         </span>
                                                         <span>
                                                             <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
@@ -335,9 +145,10 @@
                                                     </p>
                                                 </div>
                                             </td>
-                                            <td class="merge_row"> <!-- 같은 데이터 노출시 동일 영역끼리 병합 : 클래스명 merge_row 추가 -->
+                                            <td class="merge_row">
                                                 <div class="info_dlvr">
-                                                    <span class="dlvr_fee">배송비 무료</span>
+                                                    <span class="dlvr_fee">3,000원</span>
+                                                    <a href="#" target="_blank">배송비 SAVE 상품 보기</a>
                                                 </div>
                                             </td>
                                         </tr>
@@ -351,7 +162,7 @@
                                                     </div>
                                                     <div class="thumb_box">
                                                         <a href="">
-                                                            <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
+                                                            <img src="../ux/images/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
                                                         </a>
                                                     </div>
                                                     <div class="info_box">
@@ -368,17 +179,6 @@
                                                         <p class="od_modify">
                                                             <button type="button"><span>옵션/수량변경</span></button>
                                                         </p>
-                                                        <div class="od_moresale">
-                                                            <a href="" class="btn_moresale">
-                                                                <i class="ico ico_saletag"></i><span class="c_primary">다다익선 대상 상품</span>
-                                                            </a>
-                                                            <div class="li_moresale">
-                                                                <ul>
-                                                                    <li>3개이상 구매시 10% 할인 <a href="">대상 상품 보기</a></li>
-                                                                    <li>TBJ 상품 2만원 이상 구매시 10% 할인 <a href="">대상 상품 보기</a></li>
-                                                                </ul>
-                                                            </div>
-                                                        </div>
                                                     </div>
                                                 </div>
                                             </td>
@@ -393,18 +193,19 @@
                                                         <button type="button" class="btn btn_primary btn_sm"><span>즉시구매</span></button>
                                                     </p>
                                                     <p class="util">
-                                                            <span>
-                                                                <button type="button" class="btn_favorite"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
-                                                            </span>
                                                         <span>
-                                                                <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
-                                                            </span>
+                                                            <button type="button" class="btn_favorite active"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
+                                                        </span>
+                                                        <span>
+                                                            <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
+                                                        </span>
                                                     </p>
                                                 </div>
                                             </td>
-                                            <td class="merge_row"> <!-- 같은 데이터 노출시 동일 영역끼리 병합 : 클래스명 merge_row 추가 -->
+                                            <td class="merge_row">
                                                 <div class="info_dlvr">
-                                                    <span class="dlvr_fee">배송비 무료</span>
+                                                    <span class="dlvr_fee">3,000원</span>
+                                                    <a href="#" target="_blank">배송비 SAVE 상품 보기</a>
                                                 </div>
                                             </td>
                                         </tr>
@@ -418,7 +219,7 @@
                                                     </div>
                                                     <div class="thumb_box">
                                                         <a href="">
-                                                            <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
+                                                            <img src="../ux/images/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
                                                         </a>
                                                     </div>
                                                     <div class="info_box">
@@ -449,18 +250,18 @@
                                                         <button type="button" class="btn btn_primary btn_sm"><span>즉시구매</span></button>
                                                     </p>
                                                     <p class="util">
-                                                            <span>
-                                                                <button type="button" class="btn_favorite"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
-                                                            </span>
                                                         <span>
-                                                                <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
-                                                            </span>
+                                                            <button type="button" class="btn_favorite active"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
+                                                        </span>
+                                                        <span>
+                                                            <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
+                                                        </span>
                                                     </p>
                                                 </div>
                                             </td>
-                                            <td class="merge_row"> <!-- 같은 데이터 노출시 동일 영역끼리 병합 : 클래스명 merge_row 추가 -->
+                                            <td class="merge_row">
                                                 <div class="info_dlvr">
-                                                    <span class="dlvr_fee">3,000원</span>
+                                                    <span class="dlvr_fee">2,000원</span>
                                                     <a href="#" target="_blank">배송비 SAVE 상품 보기</a>
                                                 </div>
                                             </td>
@@ -476,7 +277,7 @@
                                     업체직배송
                                 </h3>
                                 <div class="btn_area">
-                                    <button type="button" class="btn btn_default"><span><i class="ico ico_trash"></i>전체 삭제</span></button>
+                                    <button type="button" class="btn btn_default"><span><i class="ico ico_trash"></i>전체삭제</span></button>
                                 </div>
                                 <div class="tbl type2">
                                     <table>
@@ -496,13 +297,13 @@
                                                     </div>
                                                     <div class="thumb_box">
                                                         <a href="">
-                                                            <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
+                                                            <img src="../ux/images/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
                                                         </a>
                                                     </div>
                                                     <div class="info_box">
                                                         <p class="od_name">
                                                             <a href="">
-                                                                <span class="brand">TBJ</span>
+                                                                <span class="brand">업체명1</span>
                                                                 <span class="name">몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트 몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트</span>
                                                             </a>
                                                         </p>
@@ -513,24 +314,13 @@
                                                         <p class="od_modify">
                                                             <button type="button"><span>옵션/수량변경</span></button>
                                                         </p>
-                                                        <div class="od_moresale">
-                                                            <a href="" class="btn_moresale">
-                                                                <i class="ico ico_saletag"></i><span class="c_primary">다다익선 적용내역</span>
-                                                            </a>
-                                                            <div class="li_moresale">
-                                                                <ul>
-                                                                    <li>트러커 자켓 3개 이상 구매시 10% 할인</li>
-                                                                    <li>TBJ상품 2만원 이상 구매시 10% 할인</li>
-                                                                </ul>
-                                                            </div>
-                                                        </div>
                                                     </div>
                                                 </div>
                                             </td>
                                             <td>
                                                 <div class="info_calc">
                                                     <p class="price">
-                                                        <span class="selling_price c_primary">61,200원</span> <!-- 다다익선 할인적용된 가격 표기 시 클래스 c_primary 추가 -->
+                                                        <span class="selling_price">61,200원</span>
                                                         <del>100,000원</del>
                                                     </p>
                                                     <p class="point"><span>49</span>p 적립예정</p>
@@ -539,7 +329,7 @@
                                                     </p>
                                                     <p class="util">
                                                         <span>
-                                                            <button type="button" class="btn_favorite"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
+                                                            <button type="button" class="btn_favorite active"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
                                                         </span>
                                                         <span>
                                                             <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
@@ -547,10 +337,9 @@
                                                     </p>
                                                 </div>
                                             </td>
-                                            <td class="merge_row"> <!-- 같은 데이터 노출시 동일 영역끼리 병합 : 클래스명 merge_row 추가 -->
+                                            <td>
                                                 <div class="info_dlvr">
                                                     <span class="dlvr_fee">3,000원</span>
-                                                    <span class="dlvr_shop">TBJ 업체직배송</span>
                                                     <a href="#" target="_blank">배송비 SAVE 상품 보기</a>
                                                 </div>
                                             </td>
@@ -565,13 +354,13 @@
                                                     </div>
                                                     <div class="thumb_box">
                                                         <a href="">
-                                                            <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
+                                                            <img src="../ux/images/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
                                                         </a>
                                                     </div>
                                                     <div class="info_box">
                                                         <p class="od_name">
                                                             <a href="">
-                                                                <span class="brand">TBJ</span>
+                                                                <span class="brand">업체명2</span>
                                                                 <span class="name">몰리겨울상하복 균일가 택1 </span>
                                                             </a>
                                                         </p>
@@ -596,77 +385,18 @@
                                                         <button type="button" class="btn btn_primary btn_sm"><span>즉시구매</span></button>
                                                     </p>
                                                     <p class="util">
-                                                            <span>
-                                                                <button type="button" class="btn_favorite"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
-                                                            </span>
                                                         <span>
-                                                                <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
-                                                            </span>
-                                                    </p>
-                                                </div>
-                                            </td>
-                                            <td class="merge_row"> <!-- 같은 데이터 노출시 동일 영역끼리 병합 : 클래스명 merge_row 추가 -->
-                                                <div class="info_dlvr">
-                                                    <span class="dlvr_fee">3,000원</span>
-                                                    <span class="dlvr_shop">TBJ 업체직배송</span>
-                                                    <a href="#" target="_blank">배송비 SAVE 상품 보기</a>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="t_l">
-                                                <div class="info_item">
-                                                    <div class="form_box">
-                                                        <p class="form_field">
-                                                            <input id="od_item33" type="checkbox" checked=""><label for="od_item33"><span class="sr-only">상품선택</span></label>
-                                                        </p>
-                                                    </div>
-                                                    <div class="thumb_box">
-                                                        <a href="">
-                                                            <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
-                                                        </a>
-                                                    </div>
-                                                    <div class="info_box">
-                                                        <p class="od_name">
-                                                            <a href="">
-                                                                <span class="brand">ZIOZIA</span>
-                                                                <span class="name">몰리겨울상하복 균일가 택1 </span>
-                                                            </a>
-                                                        </p>
-                                                        <p class="od_opt">
-                                                            <span class="option">옵션:<em>01_루돌프융기모상하복_D오렌지/110</em></span>
-                                                            <span class="count">수량:<em>100</em>개</span>
-                                                        </p>
-                                                        <p class="od_modify">
-                                                            <button type="button"><span>옵션/수량변경</span></button>
-                                                        </p>
-                                                    </div>
-                                                </div>
-                                            </td>
-                                            <td>
-                                                <div class="info_calc">
-                                                    <p class="price">
-                                                        <span class="selling_price">61,200원</span>
-                                                        <del>100,000원</del>
-                                                    </p>
-                                                    <p class="point"><span>49</span>p 적립예정</p>
-                                                    <p>
-                                                        <button type="button" class="btn btn_primary btn_sm"><span>즉시구매</span></button>
-                                                    </p>
-                                                    <p class="util">
-                                                            <span>
-                                                                <button type="button" class="btn_favorite"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
-                                                            </span>
+                                                            <button type="button" class="btn_favorite active"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
+                                                        </span>
                                                         <span>
-                                                                <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
-                                                            </span>
+                                                            <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
+                                                        </span>
                                                     </p>
                                                 </div>
                                             </td>
-                                            <td class="merge_row"> <!-- 같은 데이터 노출시 동일 영역끼리 병합 : 클래스명 merge_row 추가 -->
+                                            <td>
                                                 <div class="info_dlvr">
                                                     <span class="dlvr_fee">3,000원</span>
-                                                    <span class="dlvr_shop">ZIOZIA 업체직배송</span>
                                                     <a href="#" target="_blank">배송비 SAVE 상품 보기</a>
                                                 </div>
                                             </td>
@@ -676,18 +406,18 @@
                                                 <div class="info_item">
                                                     <div class="form_box">
                                                         <p class="form_field">
-                                                            <input id="od_item34" type="checkbox" checked=""><label for="od_item34"><span class="sr-only">상품선택</span></label>
+                                                            <input id="od_item33" type="checkbox" checked=""><label for="od_item33"><span class="sr-only">상품선택</span></label>
                                                         </p>
                                                     </div>
                                                     <div class="thumb_box">
                                                         <a href="">
-                                                            <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
+                                                            <img src="../ux/images/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
                                                         </a>
                                                     </div>
                                                     <div class="info_box">
                                                         <p class="od_name">
                                                             <a href="">
-                                                                <span class="brand">로엠</span>
+                                                                <span class="brand">업체명2</span>
                                                                 <span class="name">몰리겨울상하복 균일가 택1 </span>
                                                             </a>
                                                         </p>
@@ -711,100 +441,9 @@
                                                     <p>
                                                         <button type="button" class="btn btn_primary btn_sm"><span>즉시구매</span></button>
                                                     </p>
-                                                    <p class="util">
-                                                            <span>
-                                                                <button type="button" class="btn_favorite"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
-                                                            </span>
-                                                        <span>
-                                                                <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
-                                                            </span>
-                                                    </p>
-                                                </div>
-                                            </td>
-                                            <td class="merge_row"> <!-- 같은 데이터 노출시 동일 영역끼리 병합 : 클래스명 merge_row 추가 -->
-                                                <div class="info_dlvr">
-                                                    <span class="dlvr_fee">3,000원</span>
-                                                    <span class="dlvr_shop">로엠 업체직배송</span>
-                                                    <a href="#" target="_blank">배송비 SAVE 상품 보기</a>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                            <!-- //업체직배송 -->
-                            <!-- 예약배송 -->
-                            <div class="part_dlvr mt100">
-                                <h3 class="subH2 mb20">
-                                    예약배송
-                                </h3>
-                                <div class="btn_area">
-                                    <button type="button" class="btn btn_default"><span><i class="ico ico_trash"></i>전체 삭제</span></button>
-                                </div>
-                                <div class="tbl type2">
-                                    <table>
-                                        <colgroup>
-                                            <col width="710">
-                                            <col width="190">
-                                            <col width="*">
-                                        </colgroup>
-                                        <tbody>
-                                        <tr>
-                                            <td class="t_l">
-                                                <div class="info_item">
-                                                    <div class="form_box">
-                                                        <p class="form_field">
-                                                            <input id="od_item_21" type="checkbox" checked=""><label for="od_item_21"><span class="sr-only">상품선택</span></label>
-                                                        </p>
-                                                    </div>
-                                                    <div class="thumb_box">
-                                                        <a href="">
-                                                            <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
-                                                        </a>
-                                                    </div>
-                                                    <div class="info_box">
-                                                        <p class="od_name">
-                                                            <a href="">
-                                                                <span class="brand">TBJ</span>
-                                                                <span class="reserv_date">2020.12.25 배송예정</span>
-                                                                <span class="name">몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트 몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트</span>
-                                                            </a>
-                                                        </p>
-                                                        <p class="od_opt">
-                                                            <span class="option">옵션:<em>01_루돌프융기모상하복_D오렌지/110</em></span>
-                                                            <span class="count">수량:<em>99</em>개</span>
-                                                        </p>
-                                                        <p class="od_modify">
-                                                            <button type="button"><span>옵션/수량변경</span></button>
-                                                        </p>
-                                                        <div class="od_moresale">
-                                                            <a href="" class="btn_moresale">
-                                                                <i class="ico ico_saletag"></i><span class="c_primary">다다익선 적용내역</span>
-                                                            </a>
-                                                            <div class="li_moresale">
-                                                                <ul>
-                                                                    <li>트러커 자켓 3개 이상 구매시 10% 할인</li>
-                                                                    <li>TBJ상품 2만원 이상 구매시 10% 할인</li>
-                                                                </ul>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </td>
-                                            <td>
-                                                <div class="info_calc">
-                                                    <p class="price">
-                                                        <span class="selling_price c_primary">61,200원</span> <!-- 다다익선 할인적용된 가격 표기 시 클래스 c_primary 추가 -->
-                                                        <del>100,000원</del>
-                                                    </p>
-                                                    <p class="point"><span>49</span>p 적립예정</p>
-                                                    <p>
-                                                        <button type="button" class="btn btn_primary btn_sm"><span>즉시구매</span></button>
-                                                    </p>
                                                     <p class="util">
                                                         <span>
-                                                            <button type="button" class="btn_favorite"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
+                                                            <button type="button" class="btn_favorite active"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
                                                         </span>
                                                         <span>
                                                             <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
@@ -812,10 +451,9 @@
                                                     </p>
                                                 </div>
                                             </td>
-                                            <td class="merge_row"> <!-- 같은 데이터 노출시 동일 영역끼리 병합 : 클래스명 merge_row 추가 -->
+                                            <td>
                                                 <div class="info_dlvr">
                                                     <span class="dlvr_fee">3,000원</span>
-                                                    <span class="dlvr_shop">TBJ 업체직배송</span>
                                                     <a href="#" target="_blank">배송비 SAVE 상품 보기</a>
                                                 </div>
                                             </td>
@@ -825,19 +463,18 @@
                                                 <div class="info_item">
                                                     <div class="form_box">
                                                         <p class="form_field">
-                                                            <input id="od_item22" type="checkbox" checked=""><label for="od_item22"><span class="sr-only">상품선택</span></label>
+                                                            <input id="od_item34" type="checkbox" checked=""><label for="od_item34"><span class="sr-only">상품선택</span></label>
                                                         </p>
                                                     </div>
                                                     <div class="thumb_box">
                                                         <a href="">
-                                                            <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
+                                                            <img src="../ux/images/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
                                                         </a>
                                                     </div>
                                                     <div class="info_box">
                                                         <p class="od_name">
                                                             <a href="">
-                                                                <span class="brand">TBJ</span>
-                                                                <span class="reserv_date">2020.12.25 배송예정</span>
+                                                                <span class="brand">업체명3</span>
                                                                 <span class="name">몰리겨울상하복 균일가 택1 </span>
                                                             </a>
                                                         </p>
@@ -863,7 +500,7 @@
                                                     </p>
                                                     <p class="util">
                                                             <span>
-                                                                <button type="button" class="btn_favorite"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
+                                                                <button type="button" class="btn_favorite active"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
                                                             </span>
                                                         <span>
                                                                 <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
@@ -871,10 +508,9 @@
                                                     </p>
                                                 </div>
                                             </td>
-                                            <td class="merge_row"> <!-- 같은 데이터 노출시 동일 영역끼리 병합 : 클래스명 merge_row 추가 -->
+                                            <td>
                                                 <div class="info_dlvr">
                                                     <span class="dlvr_fee">3,000원</span>
-                                                    <span class="dlvr_shop">TBJ 업체직배송</span>
                                                     <a href="#" target="_blank">배송비 SAVE 상품 보기</a>
                                                 </div>
                                             </td>
@@ -882,8 +518,9 @@
                                         </tbody>
                                     </table>
                                 </div>
+
                             </div>
-                            <!-- //예약배송 -->
+                            <!-- //업체직배송 -->
                         </div>
                     </section>
                     <section class="od_side fr">
@@ -906,7 +543,7 @@
                                     </div>
                                     <div>
                                         <dt>할인금액</dt>
-                                        <dd><span class="c_primary">-1,746,500원</span></dd>
+                                        <dd>-1,746,500원</dd>
                                     </div>
                                 </dl>
                             </div>
@@ -947,7 +584,7 @@
                                 <div class="item_gd">
                                     <figure>
                                         <a href="">
-                                            <span class="thumb"><img src="/images/pc/thumb/tmp_odSide2.jpg" alt=""></span>
+                                            <span class="thumb"><img src="../ux/images/thumb/tmp_odSide2.jpg" alt=""></span>
                                         </a>
                                         <figcaption>
                                             <a href="">
@@ -965,7 +602,7 @@
                                 <div class="item_gd">
                                     <figure>
                                         <a href="">
-                                            <span class="thumb"><img src="/images/pc/thumb/tmp_odSide2.jpg" alt=""></span>
+                                            <span class="thumb"><img src="../ux/images/thumb/tmp_odSide2.jpg" alt=""></span>
                                         </a>
                                         <figcaption>
                                             <a href="">
@@ -1002,7 +639,7 @@
                             <div class="item_gd">
                                 <figure>
                                     <a href="">
-                                        <span class="thumb"><img src="/images/pc/thumb/od_shopping_slide01.png" alt=""></span>
+                                        <span class="thumb"><img src="../ux/images/thumb/od_shopping_slide01.png" alt=""></span>
                                     </a>
                                     <figcaption>
                                         <a href="">
@@ -1026,7 +663,7 @@
                             <div class="item_gd">
                                 <figure>
                                     <a href="">
-                                        <span class="thumb"><img src="/images/pc/thumb/od_shopping_slide01.png" alt=""></span>
+                                        <span class="thumb"><img src="../ux/images/thumb/od_shopping_slide01.png" alt=""></span>
                                     </a>
                                     <figcaption>
                                         <a href="">
@@ -1050,7 +687,7 @@
                             <div class="item_gd">
                                 <figure>
                                     <a href="">
-                                        <span class="thumb"><img src="/images/pc/thumb/od_shopping_slide01.png" alt=""></span>
+                                        <span class="thumb"><img src="../ux/images/thumb/od_shopping_slide01.png" alt=""></span>
                                     </a>
                                     <figcaption>
                                         <a href="">
@@ -1074,7 +711,7 @@
                             <div class="item_gd">
                                 <figure>
                                     <a href="">
-                                        <span class="thumb"><img src="/images/pc/thumb/od_shopping_slide01.png" alt=""></span>
+                                        <span class="thumb"><img src="../ux/images/thumb/od_shopping_slide01.png" alt=""></span>
                                     </a>
                                     <figcaption>
                                         <a href="">
@@ -1098,7 +735,7 @@
                             <div class="item_gd">
                                 <figure>
                                     <a href="">
-                                        <span class="thumb"><img src="/images/pc/thumb/od_shopping_slide01.png" alt=""></span>
+                                        <span class="thumb"><img src="../ux/images/thumb/od_shopping_slide01.png" alt=""></span>
                                     </a>
                                     <figcaption>
                                         <a href="">
@@ -1122,7 +759,7 @@
                             <div class="item_gd">
                                 <figure>
                                     <a href="">
-                                        <span class="thumb"><img src="/images/pc/thumb/od_shopping_slide01.png" alt=""></span>
+                                        <span class="thumb"><img src="../ux/images/thumb/od_shopping_slide01.png" alt=""></span>
                                     </a>
                                     <figcaption>
                                         <a href="">
@@ -1146,7 +783,7 @@
                             <div class="item_gd">
                                 <figure>
                                     <a href="">
-                                        <span class="thumb"><img src="/images/pc/thumb/od_shopping_slide01.png" alt=""></span>
+                                        <span class="thumb"><img src="../ux/images/thumb/od_shopping_slide01.png" alt=""></span>
                                     </a>
                                     <figcaption>
                                         <a href="">
@@ -1170,7 +807,7 @@
                             <div class="item_gd">
                                 <figure>
                                     <a href="">
-                                        <span class="thumb"><img src="/images/pc/thumb/od_shopping_slide01.png" alt=""></span>
+                                        <span class="thumb"><img src="../ux/images/thumb/od_shopping_slide01.png" alt=""></span>
                                     </a>
                                     <figcaption>
                                         <a href="">
@@ -1212,9 +849,11 @@
             $.ajax( {
                 type: "POST",
                 url : '/cart/goods/list',
-                dataType : 'json',
+                dataType : 'html',
                 success : function(result) {
-
+                    if (result != null) {
+                        $("#bulletDelvList").html(result);
+                    }
                 }
             });
         }

+ 2 - 2
src/main/webapp/WEB-INF/views/web/common/fragments/GnbWeb.html

@@ -43,7 +43,7 @@
 
 		<div class="area">
 			<div class="logo">
-				<a href="#none">
+				<a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MAIN);">
 					<h1>
 						<i class="ico ico_logo"></i>
 						<em class="blind">STYLE24</em>
@@ -53,7 +53,7 @@
 			<div class="util_group">
 				<span><a href="mb_login.html" title="로그인 바로가기">로그인</a></span>
 				<span><a href="mb_join_1.html" title="회원가입 바로가기">회원가입</a></span>
-				<span><a href="my_order_1.html" title="마이페이지 바로가기">마이페이지</a></span>
+				<span><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MYPAGE);" title="마이페이지 바로가기">마이페이지</a></span>
 			</div>
 		</div>
 		

+ 197 - 403
src/main/webapp/WEB-INF/views/web/mypage/MypageOrderListFormWeb.html

@@ -21,28 +21,28 @@
 <th:block layout:fragment="content">
 	<div class="my_cont">
 		<div class="sec_head">
-			<h3 class="mem_name"><strong>홍길동</strong>님 반갑습니다.</h3>
+			<h3 class="mem_name"><strong th:text="${customerInfo.custNm}"></strong>님 반갑습니다.</h3>
 			<div class="mem_info clear">
 				<div class="mem_rank">
-					<div class="rank_icon vip">V</div>
-					<div class="rank_txt01">VIP</div>
+					<div th:class="|rank_icon ${#strings.toLowerCase(customerInfo.custGradeNm)}|" th:text="${#strings.substring(customerInfo.custGradeNm, 0, 1)}"></div>
+					<div class="rank_txt01" th:text="${customerInfo.custGradeNm}"></div>
 					<div class="rank_txt02">
-						<a href="">등급혜택  보기</a>
-						<a href="">등급쿠폰 다운</a>
+						<button type="button">등급혜택  보기</button>
+						<button type="button" id="cp_down">등급쿠폰 다운</button>
 					</div>
 				</div>
 				<div class="mem_box">
 					<div class="mem_coupon">
 						<p class="tit">보유쿠폰&nbsp;/&nbsp;<span class="c_primary">만료예정</span></p>
-						<span class="coupon_txt01"><span class="big_txt">30</span>장</span>&nbsp;/&nbsp;<span class="coupon_txt02 c_primary">13장</span>
+						<span class="coupon_txt01"><span class="big_txt" th:text="${couponCnt}"></span>장</span>&nbsp;/&nbsp;<span class="coupon_txt02 c_primary" th:text="|${expiredSoonCouponCnt}장|">13장</span>
 					</div>
 					<div class="mem_point">
 						<p class="tit">STYLE  24 포인트</p>
-						<a href="#pop"><span class="big_txt">25,000</span>P</a>
+						<a href="#pop"><span class="big_txt" th:text="${#numbers.formatInteger(rmPntAmt, 1, 'COMMA')}"></span>P</a>
 					</div>
 					<div class="mem_gift">
 						<p class="tit">상품권</p>
-						<a href="#pop"><span class="big_txt">25,000</span>원</a>
+						<a href="#pop"><span class="big_txt" th:text="${#numbers.formatInteger(rmGfcdAmt, 1, 'COMMA')}"></span>원</a>
 					</div>
 				</div>
 			</div>
@@ -53,30 +53,30 @@
 				<ul class="clear">
 					<li class="orl01">
 						<p class="or_p">주문접수</p>
-						<p class="count"><span>5</span></p>
+						<p class="count"><span th:text="${orderReceiptCount}">0</span></p>
 					</li>
 					<li class="orl02">
 						<p class="or_p">결제완료</p>
-						<p class="count"><span>9</span></p>
+						<p class="count"><span th:text="${paymentCompleteCount}">0</span></p>
 					</li>
 					<li class="orl03">
 						<p class="or_p">상품 준비 중</p>
-						<p class="count"><span>3</span></p>
+						<p class="count"><span th:text="${goodsPrepareCount}">0</span></p>
 					</li>
 					<li class="orl04">
 						<p class="or_p">배송 중</p>
-						<p class="count"><span>10</span></p>
+						<p class="count"><span th:text="${shippingCount}">0</span></p>
 					</li>
 					<li class="orl05">
 						<p class="or_p">배송 완료</p>
-						<p class="count"><span>12</span></p>
+						<p class="count"><span th:text="${shipCompleteCount}">0</span></p>
 					</li>
 				</ul>
 				<div class="order_right">
 					<ul>
-						<li>취소 내역<span>2</span></li>
-						<li>교환 내역<span>3</span></li>
-						<li>반품 내역<span>0</span></li>
+						<li>취소 내역<span th:text="${cancelCount}">0</span></li>
+						<li>교환 내역<span th:text="${returnCount}">0</span></li>
+						<li>반품 내역<span th:text="${exchangeCount}">0</span></li>
 					</ul>
 				</div>
 			</div>
@@ -85,12 +85,13 @@
 			<!-- 주문조회 검색 -->
 			<div class="order_sch_filter clear">
 				<div class="sch_radio_tab">
-					<button type="button" class="btn btn_default">6월</button>
-					<button type="button" class="btn btn_default">7월</button>
-					<button type="button" class="btn btn_default">8월</button>
-					<button type="button" class="btn btn_default">9월</button>
-					<button type="button" class="btn btn_default">10월</button>
-					<button type="button" class="btn btn_default">11월</button>
+					<button type="button" class="btn btn_default" th:if="${searchPeriod}" th:each="oneData, status : ${searchPeriod}" th:text="${oneData}"></button>
+<!--					<button type="button" class="btn btn_default">6월</button>-->
+<!--					<button type="button" class="btn btn_default">7월</button>-->
+<!--					<button type="button" class="btn btn_default">8월</button>-->
+<!--					<button type="button" class="btn btn_default">9월</button>-->
+<!--					<button type="button" class="btn btn_default">10월</button>-->
+<!--					<button type="button" class="btn btn_default">11월</button>-->
 				</div>
 				<div class="sch_right">
 					<div class="sch_datepicker sb">
@@ -104,216 +105,174 @@
 			</div>
 			<!-- //주문조회 검색 -->
 			<div class="order_list">
-				<!-- 1개주문 -->
-				<div class="part_dlvr">
-					<div class="tbl_tit">
-						<span class="start_t">주문일</span>
-						<!-- 선물일 -->
-						<!-- <span class="gift_t">선물일</span> -->
-						<span class="order_date">2020.10.25</span>
-						<span class="order_method">업체직배송</span>
-						<a href="" class="detail_btn">주문상세보기</a>
-					</div>
-					<div class="tbl type2">
-						<table>
-							<colgroup>
-								<col width="660">
-								<col width="180">
-								<col width="180">
-								<col width="*">
-							</colgroup>
-							<tbody>
-							<tr>
-								<td class="t_l">
-									<div class="info_item">
-										<div class="thumb_box">
-											<a href="">
-												<img src="../ux/images/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
-											</a>
-										</div>
-										<div class="info_box">
-											<p class="od_name">
-												<a href="">
-													<span class="brand">Mollimelli 몰리멜리</span>
-													<span class="name">몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트</span>
-												</a>
-											</p>
-											<p class="od_opt">
-												<span class="option">옵션:<em>01_루돌프융기모상하복_D오렌지/110</em></span>
-												<span class="count">수량:<em>99</em>개</span>
-											</p>
-										</div>
-									</div>
-								</td>
-								<td>
-									<div class="info_calc">
-										<p class="price">
-											<span class="selling_price">61,200원</span>
-										</p>
-										<p class="point"><span>49</span>p</p>
-									</div>
-								</td>
-								<td class="">
-									<div class="delivery">
-										<p class="dlvr_staus">배송 중</p>
-										<p class="dlvr_desc">10/26일 도착 예정</p>
-									</div>
-								</td>
-								<td class="">
-									<div class="tbl_btn_wrap case02">
-										<ul>
-											<li><button type="button" class="btn btn_default btn_sm"><span>교환</span></button></li>
-											<li><button type="button" class="btn btn_default btn_sm"><span>반품/취소</span></button></li>
-											<li><button type="button" class="btn btn_dark btn_sm"><span>리뷰작성</span></button></li>
-										</ul>
-									</div>
-								</td>
-							</tr>
-							</tbody>
-						</table>
-					</div>
-					<div class="order_confirm">
-						<span class="cf_txt">15일 후 자동으로 구매확정</span>
-						<button type="button" class="btn btn_primary">구매확정</button>
-						<!-- <a href="" class="case02">구매확정 하기 >> (<span>X</span>일 후 자동으로 구매확정)</a> 구매확정 대기-->
-						<!-- <a href="" class="case03">주소입력 대기 : 남은일자 <span>3</span>일 (<span>YYYY.MM.DD HH:MM:SS</span>까지)</a>  주소입력 대기-->
-					</div>
-				</div>
-				<!-- //1개주문 -->
-				<!-- n개 주문 -->
-				<div class="part_dlvr">
-					<div class="tbl_tit">
-						<span class="start_t">주문일</span>
-						<!-- 선물일 -->
-						<!-- <span class="gift_t">선물일</span> -->
-						<span class="order_date">2020.10.25</span>
-						<span class="order_method">업체직배송</span>
-						<a href="" class="detail_btn">주문상세보기</a>
-					</div>
-					<div class="tbl type2">
-						<table>
-							<colgroup>
-								<col width="660">
-								<col width="180">
-								<col width="180">
-								<col width="*">
-							</colgroup>
-							<tbody>
-							<tr>
-								<td class="t_l">
-									<div class="info_item">
-										<div class="thumb_box">
-											<a href="">
-												<img src="../ux/images/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
-											</a>
-										</div>
-										<div class="info_box">
-											<p class="od_name">
-												<a href="">
-													<span class="brand">Mollimelli 몰리멜리</span>
-													<span class="name">몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트 몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트</span>
-												</a>
-											</p>
-											<p class="od_opt">
-												<span class="option">옵션:<em>01_루돌프융기모상하복_D오렌지/110</em></span>
-												<span class="count">수량:<em>99</em>개</span>
-											</p>
-											<p class="od_freebies">
-												<span class="freebies_tit">사은품</span>
-												<span class="freebies_con">DECKE 고급 에코백(블랙)</span>
-												<span class="c_primary">(- 140p)</span>
-											</p>
-										</div>
-									</div>
-								</td>
-								<td>
-									<div class="info_calc">
-										<p class="price">
-											<span class="selling_price">61,200원</span>
-										</p>
-										<p class="point"><span>49</span>p</p>
-									</div>
-								</td>
-								<td class="merge_row">
-									<div class="delivery">
-										<p class="dlvr_staus">배송 완료</p>
-										<p class="dlvr_desc">10/26일 도착</p>
-									</div>
-								</td>
-								<td class="merge_row">
-									<div class="tbl_btn_wrap case02">
-										<ul>
-											<li><button type="button" class="btn btn_default btn_sm"><span>교환</span></button></li>
-											<li><button type="button" class="btn btn_default btn_sm"><span>반품/취소</span></button></li>
-											<li><button type="button" class="btn btn_dark btn_sm"><span>리뷰작성</span></button></li>
-										</ul>
-									</div>
-								</td>
-							</tr>
-							<tr>
-								<td class="t_l">
-									<div class="info_item">
-										<div class="thumb_box">
-											<a href="">
-												<img src="../ux/images/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
-											</a>
-										</div>
-										<div class="info_box">
-											<p class="od_name">
-												<a href="">
-													<span class="brand">Mollimelli 몰리멜리</span>
-													<span class="name">몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트 몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트</span>
-												</a>
-											</p>
-											<p class="od_opt">
-												<span class="option">옵션:<em>01_루돌프융기모상하복_D오렌지/110</em></span>
-												<span class="count">수량:<em>99</em>개</span>
-											</p>
-											<p class="od_freebies">
-												<span class="freebies_tit">사은품</span>
-												<span class="freebies_con">DECKE 고급 에코백(블랙)</span>
-												<span class="c_primary">(- 140p)</span>
-											</p>
-										</div>
-									</div>
-								</td>
-								<td>
-									<div class="info_calc">
-										<p class="price">
-											<span class="selling_price">61,200원</span>
-										</p>
-										<p class="point"><span>49</span>p</p>
-									</div>
-								</td>
-								<td class="merge_row">
-									<div class="delivery">
-										<p class="dlvr_staus">배송 완료</p>
-										<p class="dlvr_desc">10/26일 도착</p>
-									</div>
-								</td>
-								<td class="merge_row">
-									<div class="tbl_btn_wrap case02">
-										<ul>
-											<li><button type="button" class="btn btn_default btn_sm"><span>교환</span></button></li>
-											<li><button type="button" class="btn btn_default btn_sm"><span>반품/취소</span></button></li>
-											<li><button type="button" class="btn btn_dark btn_sm"><span>리뷰작성</span></button></li>
-										</ul>
-									</div>
-								</td>
-							</tr>
-							</tbody>
-						</table>
-					</div>
-					<div class="order_confirm">
-						<span class="cf_txt">15일 후 자동으로 구매확정</span>
-						<button type="button" class="btn btn_primary">구매확정</button>
-						<!-- <a href="" class="case02">구매확정 하기 >> (<span>X</span>일 후 자동으로 구매확정)</a> 구매확정 대기-->
-						<!-- <a href="" class="case03">주소입력 대기 : 남은일자 <span>3</span>일 (<span>YYYY.MM.DD HH:MM:SS</span>까지)</a>  주소입력 대기-->
+				<th:block th:if="${orderInfo}" th:each="oneData, status : ${orderInfo}">
+					<div class="part_deliver">
+						<div class="tbl_tit">
+							<!-- 주문일/선물일 설정 -->
+							<span class="start_t" th:unless="${oneData.giftPackYn == 'Y'}">주문일</span>
+							<span class="gift_t" th:if="${oneData.giftPackYn == 'Y'}">선물일</span>
+							<!-- //주문일/선물일 설정 -->
+
+							<span class="order_date" th:text="${oneData.ordDt}"></span>
+
+							<!-- 배송구분 설정 -->
+							<span class="order_method" th:if="${oneData.shotDelvYn == 'Y'}" th:text="총알배송"></span>
+							<span class="order_method" th:if="${oneData.shotDelvYn == 'N' and oneData.selfGoodsYn == 'Y'}" th:text="일반배송"></span>
+							<span class="order_method" th:if="${oneData.selfGoodsYn == 'N'}" th:text="업체직배송"></span>
+							<!-- //배송구분 설정 -->
+							<a href="" class="detail_btn">주문상세보기</a>
+						</div>
+						<div class="tbl type2">
+							<table>
+								<colgroup>
+									<col width="840">
+									<col width="180">
+									<col width="*">
+								</colgroup>
+								<tbody>
+									<th:block th:if="${oneData.orderList}" th:each="order, status : ${oneData.orderList}">
+										<tr>
+											<td class="">
+												<div class="info_item">
+													<div class="thumb_box">
+														<a href="">
+															<img src="../ux/images/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
+														</a>
+													</div>
+													<div class="info_box">
+														<p class="od_name">
+															<a href="">
+																<span class="brand" th:text="${order.brandNm}"></span>
+																<span class="name" th:text="${order.goodsNm}"></span>
+															</a>
+														</p>
+														<p class="od_opt">
+															<span class="option">옵션:<em th:text="${order.optCd}"></em></span>
+															<span class="count">수량:<em th:text="${order.ordQty}"></em>개</span>
+														</p>
+													</div>
+													<div class="info_calc">
+														<p class="price">
+															<span class="selling_price" th:text="|${#numbers.formatInteger(order.ordAmt, 1, 'COMMA')}원|"></span>
+														</p>
+														<p class="point"><span th:text="${#numbers.formatInteger(order.savePntAmt, 1, 'COMMA')}"></span>p</p>
+													</div>
+												</div>
+											</td>
+											<td class="" th:if="${order.rowspan > 0}" th:rowspan="${order.rowspan}">
+												<div class="delivery">
+													<!-- 주문 -->
+													<th:block th:unless="${oneData.giftPackYn == 'Y'}">
+														<p class="dlvr_staus" th:text="${order.ordDtlStatNm}"></p>
+														<p class="dlvr_desc" th:if="${order.delvEddt}" th:text="|${order.delvEddt}일 도착|"></p>
+													</th:block>
+													<!-- //주문 -->
+
+													<!-- 선물 -->
+													<th:block th:if="${oneData.giftPackYn == 'Y'}">
+														<!-- 주소 입력 전 -->
+														<th:block th:if="${#strings.isEmpty(order.recipBaseAddr)}">
+															<p class="dlvr_staus c_primary" th:text="주소 입력 대기"></p>
+															<p class="dlvr_desc" th:text="|남은 기간 ${order.giftLimitDay}일|"></p>
+															<p class="dlvr_desc" th:text="|(${order.giftLimitDt}까지)|"></p>
+														</th:block>
+														<!-- 주소 입력 후 -->
+														<th:block th:unless="${#strings.isEmpty(order.recipBaseAddr)}">
+															<p class="dlvr_staus c_primary" th:text="선물 완료"></p>
+															<p class="dlvr_desc" th:text="|(${order.giftCompleteDt})|"></p>
+														</th:block>
+													</th:block>
+													<!-- //선물 -->
+												</div>
+											</td>
+											<td class="" th:if="${order.rowspan > 0}" th:rowspan="${order.rowspan}">
+												<div class="tbl_btn_wrap case02">
+													<ul>
+														<!-- 주문 -->
+														<th:block th:unless="${oneData.giftPackYn == 'Y'}">
+															<li><button type="button" class="btn btn_default btn_sm"><span>교환</span></button></li>
+															<li><button type="button" class="btn btn_default btn_sm"><span>반품/취소</span></button></li>
+															<li th:if="${order.reviewSq == 0}"><button type="button" class="btn btn_dark btn_sm"><span>리뷰작성</span></button></li>
+														</th:block>
+														<!-- //주문 -->
+														
+														<!-- 선물 -->
+														<th:block th:if="${oneData.giftPackYn == 'Y'}">
+															<li><button type="button" class="btn btn_dark btn_sm" th:if="${#strings.isEmpty(order.recipBaseAddr)}"><span>SMS 재전송</span></button></li>
+														</th:block>
+														<!-- //선물 -->
+													</ul>
+												</div>
+											</td>
+										</tr>
+										<th:block th:if="${order.ordDtlStatBanner == 'Y'}">
+											<!-- 주문 -->
+											<th:block th:unless="${oneData.giftPackYn == 'Y'}">
+												<tr>
+													<td colspan="4">
+														<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_00'}">
+															<span class="cf_txt">주문 완료 / 결제를 기다리고 있습니다.</span>
+															<button type="button" class="btn btn_primary">구매확정</button>
+														</div>
+														<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_00' or order.ordDtlStat == 'G013_10' or order.ordDtlStat == 'G013_11'}">
+															<span class="cf_txt">주문 완료 / 결제를 기다리고 있습니다.</span>
+														</div>
+														<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_20' or order.ordDtlStat == 'G013_30' or order.ordDtlStat == 'G013_35'}">
+															<span class="cf_txt">배송할 상품을 준비 중입니다.</span>
+														</div>
+														<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_40'}">
+															<span class="cf_txt">상품준비가 완료되어 곧 배송될 예정입니다.</span>
+														</div>
+														<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_50' or order.ordDtlStat == 'G013_55'}">
+															<span class="cf_txt" th:text="|${order.shipCompNm} / ${order.invoiceNo}|"></span>
+															<button type="button" class="btn btn_primary">배송조회</button>
+														</div>
+														<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_60'}">
+															<span class="cf_txt" th:text="|${order.purchaseConfirmDay}일 후 자동으로 구매확정|"></span>
+															<button type="button" class="btn btn_primary">구매확정 하기</button>
+														</div>
+														<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_70' and order.reviewSq == 0}">
+															<span class="cf_txt" th:text="리뷰를 작성하면 다른 구매자에게 도움이 될 수 있습니다."></span>
+															<button type="button" class="btn btn_primary">리뷰작성</button>
+														</div>
+														<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_70' and order.reviewSq > 0}">
+															<span class="cf_txt" th:text="주문내역 다시 구매하기 위해"></span>
+															<button type="button" class="btn btn_primary">장바구니 담기</button>
+														</div>
+													</td>
+												</tr>
+											</th:block>
+
+											<!-- 선물 -->
+											<th:block th:if="${oneData.giftPackYn == 'Y'}">
+												<tr>
+													<td colspan="4">
+														<div class="order_confirm" th:if="${#strings.isEmpty(order.recipBaseAddr) and order.giftLimitDay >= 0}">
+															<span class="cf_txt" th:text="|${order.recipNm}님이 주소를 입력하기 전입니다. (입력기한 ${order.giftLimitDt})|"></span>
+														</div>
+														<div class="order_confirm" th:unless="${#strings.isEmpty(order.recipBaseAddr)}">
+															<span class="cf_txt" th:text="|${order.recipNm}님께 선물이 발송되었습니다.|"></span>
+														</div>
+														<div class="order_confirm" th:if="${#strings.isEmpty(order.recipBaseAddr) and order.giftLimitDay < 0}">
+															<span class="cf_txt" th:text="주소입력 기한이 경과되어 선물이 취소 되었습니다."></span>
+														</div>
+													</td>
+												</tr>
+											</th:block>
+										</th:block>
+									</th:block>
+								</tbody>
+							</table>
+						</div>
 					</div>
-				</div>
-				<!-- //n개 주문 -->
-				<!-- 배송중 -->
-				<div class="part_dlvr">
+				</th:block>
+
+				<!-- 주문 없을 때 -->
+				<th:block th:unless="${orderInfo}" th:each="oneData, status : ${orderInfo}">
+
+				</th:block>
+				<!-- 주소 입력 대기 -->
+				<div class="part_deliver">
 					<div class="tbl_tit">
 						<span class="start_t">주문일</span>
 						<!-- 선물일 -->
@@ -325,99 +284,17 @@
 					<div class="tbl type2">
 						<table>
 							<colgroup>
-								<col width="660">
-								<col width="180">
+								<col width="840">
 								<col width="180">
 								<col width="*">
 							</colgroup>
 							<tbody>
 							<tr>
-								<td class="t_l">
-									<div class="info_item">
-										<div class="thumb_box">
-											<a href="">
-												<img src="../ux/images/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
-											</a>
-										</div>
-										<div class="info_box">
-											<p class="od_name">
-												<a href="">
-													<span class="brand">Mollimelli 몰리멜리</span>
-													<span class="name">몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트</span>
-												</a>
-											</p>
-											<p class="od_opt">
-												<span class="option">옵션:<em>01_루돌프융기모상하복_D오렌지/110</em></span>
-												<span class="count">수량:<em>99</em>개</span>
-											</p>
-											<p class="od_freebies">
-												<span class="freebies_tit">사은품</span>
-												<span class="freebies_con">DECKE 고급 에코백(블랙)</span>
-												<span class="c_primary">(- 140p)</span>
-											</p>
-										</div>
-									</div>
-								</td>
 								<td>
-									<div class="info_calc">
-										<p class="price">
-											<span class="selling_price">61,200원</span>
-										</p>
-										<p class="point"><span>49</span>p</p>
-									</div>
-								</td>
-								<td class="">
-									<div class="delivery">
-										<p class="dlvr_staus">배송 중</p>
-										<p class="dlvr_desc">10/26일 도착 예정</p>
-									</div>
-								</td>
-								<td class="">
-									<div class="tbl_btn_wrap case02">
-										<ul>
-											<li><button type="button" class="btn btn_default btn_sm"><span>교환</span></button></li>
-											<li><button type="button" class="btn btn_default btn_sm"><span>반품/취소</span></button></li>
-											<li><button type="button" class="btn btn_dark btn_sm"><span>리뷰작성</span></button></li>
-										</ul>
-									</div>
-								</td>
-							</tr>
-							</tbody>
-						</table>
-					</div>
-					<div class="order_confirm">
-						<span class="cf_txt">CJ대한통운 365462211296</span>
-						<button type="button" class="btn btn_primary">배송조회</button>
-						<!-- <a href="" class="case02">구매확정 하기 >> (<span>X</span>일 후 자동으로 구매확정)</a> 구매확정 대기-->
-						<!-- <a href="" class="case03">주소입력 대기 : 남은일자 <span>3</span>일 (<span>YYYY.MM.DD HH:MM:SS</span>까지)</a>  주소입력 대기-->
-					</div>
-				</div>
-				<!-- //배송중 -->
-				<!-- 배송완료 (구매확정) -->
-				<div class="part_dlvr">
-					<div class="tbl_tit">
-						<span class="start_t">주문일</span>
-						<!-- 선물일 -->
-						<!-- <span class="gift_t">선물일</span> -->
-						<span class="order_date">2020.10.25</span>
-						<span class="order_method">업체직배송</span>
-						<a href="" class="detail_btn">주문상세보기</a>
-					</div>
-					<div class="tbl type2">
-						<table>
-							<colgroup>
-								<col width="660">
-								<col width="180">
-								<col width="180">
-								<col width="*">
-							</colgroup>
-							<tbody>
-							<tr>
-								<td class="t_l">
 									<div class="info_item">
 										<div class="thumb_box">
 											<a href="">
-												<img src="../ux/images/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
+												<img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
 											</a>
 										</div>
 										<div class="info_box">
@@ -431,98 +308,15 @@
 												<span class="option">옵션:<em>01_루돌프융기모상하복_D오렌지/110</em></span>
 												<span class="count">수량:<em>99</em>개</span>
 											</p>
-											<p class="od_freebies">
-												<span class="freebies_tit">사은품</span>
-												<span class="freebies_con">DECKE 고급 에코백(블랙)</span>
-												<span class="c_primary">(- 140p)</span>
-											</p>
-										</div>
-									</div>
-								</td>
-								<td>
-									<div class="info_calc">
-										<p class="price">
-											<span class="selling_price">61,200원</span>
-										</p>
-										<p class="point"><span>49</span>p</p>
-									</div>
-								</td>
-								<td>
-									<div class="delivery">
-										<p class="dlvr_staus">배송 완료</p>
-										<p class="dlvr_desc">10/26일 도착</p>
-									</div>
-								</td>
-								<td>
-									<div class="tbl_btn_wrap case02">
-										<ul>
-											<li><button type="button" class="btn btn_default btn_sm"><span>교환</span></button></li>
-											<li><button type="button" class="btn btn_default btn_sm"><span>반품/취소</span></button></li>
-											<li><button type="button" class="btn btn_dark btn_sm"><span>리뷰작성</span></button></li>
-										</ul>
-									</div>
-								</td>
-							</tr>
-							</tbody>
-						</table>
-					</div>
-					<div class="order_confirm">
-						<span class="cf_txt">구매확정</span>
-						<span class="cf_date">(2020.10.05 23:24:22)</span>
-						<!-- <a href="" class="case02">구매확정 하기 >> (<span>X</span>일 후 자동으로 구매확정)</a> 구매확정 대기-->
-						<!-- <a href="" class="case03">주소입력 대기 : 남은일자 <span>3</span>일 (<span>YYYY.MM.DD HH:MM:SS</span>까지)</a>  주소입력 대기-->
-					</div>
-				</div>
-				<!-- //배송완료(구매확정) -->
-				<!-- 주소 입력 대기 -->
-				<div class="part_dlvr">
-					<div class="tbl_tit">
-						<span class="start_t">주문일</span>
-						<!-- 선물일 -->
-						<!-- <span class="gift_t">선물일</span> -->
-						<span class="order_date">2020.10.25</span>
-						<span class="order_method">업체직배송</span>
-						<a href="" class="detail_btn">주문상세보기</a>
-					</div>
-					<div class="tbl type2">
-						<table>
-							<colgroup>
-								<col width="660">
-								<col width="180">
-								<col width="180">
-								<col width="*">
-							</colgroup>
-							<tbody>
-							<tr>
-								<td class="t_l">
-									<div class="info_item">
-										<div class="thumb_box">
-											<a href="">
-												<img src="../ux/images/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
-											</a>
 										</div>
-										<div class="info_box">
-											<p class="od_name">
-												<a href="">
-													<span class="brand">Mollimelli 몰리멜리</span>
-													<span class="name">몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트 몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트</span>
-												</a>
-											</p>
-											<p class="od_opt">
-												<span class="option">옵션:<em>01_루돌프융기모상하복_D오렌지/110</em></span>
-												<span class="count">수량:<em>99</em>개</span>
+										<div class="info_calc">
+											<p class="price">
+												<span class="selling_price">61,200원</span>
 											</p>
+											<p class="point"><span>49</span>p</p>
 										</div>
 									</div>
 								</td>
-								<td>
-									<div class="info_calc">
-										<p class="price">
-											<span class="selling_price">61,200원</span>
-										</p>
-										<p class="point"><span>49</span>p</p>
-									</div>
-								</td>
 								<td>
 									<div class="delivery">
 										<p class="dlvr_staus c_primary">주소 입력 대기</p>
@@ -533,7 +327,7 @@
 								<td>
 									<div class="tbl_btn_wrap case02">
 										<ul>
-											<li><button type="button" class="btn btn_dark btn_sm"><span>SMS 재전송</span></button></li>
+											<li><button type="button" id="sms" class="btn btn_dark btn_sm"><span>SMS 재전송</span></button></li>
 										</ul>
 									</div>
 								</td>

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

@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="ko"
-      xmlns:th="http://www.thymeleaf.org"
-      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      layout:decorator="web/common/layout/DefaultLayoutWeb">
+	  xmlns:th="http://www.thymeleaf.org"
+	  xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+	  layout:decorator="web/common/layout/DefaultLayoutWeb">
 <!--
  *******************************************************************************
  * @source  : OrderFormWeb.html
@@ -17,8 +17,34 @@
  *******************************************************************************
  -->
 <body>
+<!-- 
+<link rel="stylesheet" type="textcss" href="/ux/pc/css/layout_back.css?v=20210209171415">
+ -->
 
 <th:block layout:fragment="content">
+
+<style type="text/css">
+    @import url("/ux/pc/css/layout_back.css");
+    
+    .od .foldGroup .fold_cont {
+	    box-sizing: border-box;
+	}
+	
+	.od .od_cont .fold_cont {
+	    padding: 0 30px 40px;
+	    line-height: 1;
+	}
+	
+	.foldGroup .fold_cont {
+	    padding: 0;
+	    position: relative;
+	    color: #666;
+	    font-weight: 200;
+	    font-size: 16px;
+	    line-height: 1.625;
+	}
+</style>
+
 	<!--  container -->
 	<div id="container" class="container od">
 		<div class="breadcrumb">
@@ -26,1173 +52,802 @@
 				<li class="bread_home"><a href="index.html">홈</a></li>
 				<li class="bread_2depth">쇼핑백</li>
 				<li class="bread_3depth">주문/결제</li>
-			</ul> 
+			</ul>
 		</div>
 		<div class="wrap">
-	           <div class="content odPayment"> <!-- 페이지특정 클래스 = mbPayment -->
-	               <div class="cont_head">
-	                   <h2 class="t_c mb60">주문&#47;결제</h2>
-	               </div>
+			<div class="content odPayment"> <!-- 페이지특정 클래스 = mbPayment -->
+				<div class="cont_head">
+					<h2 class="t_c mb60">주문&#47;결제</h2>
+				</div>
+
 				<div class="cont_body">
-	                   <!-- CONT-BODY -->
+					<!-- CONT-BODY -->
 					<section class="od_cont fl">
-	                       <div class="sec_head">
-	                           <div class="tbl type4">
-	                               <table>
-	                                   <colgroup>
-	                                       <col width="240">
-	                                       <col width="*">
-	                                   </colgroup>
-	                                   <tbody>
-	                                       <tr>
-	                                           <th>
-	                                               총 <span class="c_primary bold">8</span> 건으로 나뉘어 배송 예정
-	                                           </th>
-	                                           <td class="t_l">
-	                                               <span>
-	                                                   총알배송<em class="c_primary bold">2</em>건
-	                                               </span>
-	                                               <span>
-	                                                   STYLE24<em class="c_primary bold">2</em>건
-	                                               </span>
-	                                               <span>
-	                                                   업체직배송<em class="c_primary bold">1</em>건
-	                                               </span>
-	                                               <span>
-	                                                   예약배송<em class="c_primary bold">2</em>건
-	                                               </span>
-	                                           </td>
-	                                       </tr>
-	                                   </tbody>
-	                               </table>
-	                           </div>                            
-	                       </div>
-	                       <div class="sec_body">
-	                           <div class="t_r mb15">
-	                               <a href="#none" class="btn_link">쇼핑백 바로가기</a>
-	                           </div>
-	                           <!-- -->
-	                           <div class="foldGroup">
-	                               <ul>
-	                                   <li>
-	                                       <!-- 주문고객정보 -->
-	                                       <div class="fold_head">
-	                                           <a href="javascript:void(0)">
-	                                               <div>
-	                                                   <div class="fold_tit">
-	                                                       <span>주문고객</span>
-	                                                   </div>
-	                                                   <div class="data">
-	                                                       <span>홍길동</span>
-	                                                       <span>abcdefg@naver.com</span>
-	                                                       <span>010-1234-5647</span>
-	                                                   </div>
-	                                               </div>
-	                                           </a>
-	                                       </div>
-	                                       <div class="fold_cont" style="display: none;">
-	                                           <div class="area_default">
-	                                               <dl>
-	                                                   <div>
-	                                                       <dt>주문자명</dt>
-	                                                       <dd>홍길동</dd>
-	                                                   </div>
-	                                                   <div>
-	                                                       <dt>이메일</dt>
-	                                                       <dd>abcdefg@naver.com</dd>
-	                                                   </div>
-	                                                   <div>
-	                                                       <dt>휴대폰 번호</dt>
-	                                                       <dd>
-	                                                           010-1234-5647
-	                                                           <button type="button" class="btn_popup" id=""><span>본인인증하기</span></button>
-	                                                       </dd>
-	                                                   </div>
-	                                               </dl>
-	                                           </div>
-	                                       </div>
-	                                       <!-- //주문고객정보 -->
-	                                   </li>
-	                                   <li>
-	                                       <!-- 배송지정보 -->
-	                                       <div class="fold_head">
-	                                           <a href="javascript:void(0)">
-	                                               <div>
-	                                                   <div class="fold_tit">
-	                                                       <span>배송지 정보</span>
-	                                                   </div>
-	                                                   <div class="data">서울시 영등포구 은행로 11,8층(여의도동,일신빌딩)</div>
-	                                               </div>
-	                                           </a>
-	                                       </div>
-	                                       <div class="fold_cont" style="display: none;">
-	                                           <div class="area_default">
-	                                               <dl>
-	                                                   <div>
-	                                                       <dt>배송지명</dt>
-	                                                       <dd>
-	                                                           홍길동
-	                                                           <span class="icon_tag">
-	                                                               <em class="tag_stype1">기본 배송지</em>
-	                                                               <em class="tag_stype2">총알배송</em>
-	                                                           </span>
-	                                                       </dd>
-	                                                   </div>
-	                                                   <div>
-	                                                       <dt>배송주소</dt>
-	                                                       <dd>
-	                                                           서울시 영등포구 은행로 11,8층(여의도동,일신빌딩)
-	                                                           <button type="button" class="btn_popup" id=""><span>배송지 선택</span></button>
-	                                                       </dd>
-	                                                   </div>
-	                                                   <div>
-	                                                       <dt>휴대폰 번호</dt>
-	                                                       <dd>
-	                                                           010-1234-5647
-	                                                       </dd>
-	                                                   </div>
-	                                                   <div>
-	                                                       <dt>배송요청 사항</dt>
-	                                                       <dd>
-	                                                           직접받고 부재 시 문앞
-	                                                           <button type="button" class="btn_popup" id=""><span>변경하기</span></button>
-	                                                       </dd>
-	                                                   </div>
-	                                               </dl>
-	                                           </div>
-	                                           <!-- 해외배송상품일 경우 노출 -->
-	                                           <div class="area_overseas">
-	                                               <dl>
-	                                                   <div>
-	                                                       <dt>개인통관고유부호</dt>
-	                                                       <dd>
-	                                                           <div class="form_field">
-	                                                               <div>
-	                                                                   <input type="radio" name="rdi-overseas" id="rdi-overs1" value="" checked="">
-	                                                                   <label for="rdi-overs1"><span>받는사람 개인통관고유부호</span></label>
-	                                                                   <div class="info_box pb10">
-	                                                                       <div class="input_wrap">
-	                                                                           <input type="text" class="form_control" maxlength="13" placeholder="P로 시작하는 13자리">
-	                                                                           <button type="button" class="btn btn_dark"><span>적용</span></button>
-	                                                                       </div>
-	                                                                   </div>
-	                                                               </div>
-	                                                               <div class="mt20">
-	                                                                   <input type="radio" name="rdi-overseas" id="rdi-overs2" value="">
-	                                                                   <label for="rdi-overs2"><span>입력 안 함</span></label>
-	                                                                   <div class="info_box" style="display:none;">
-	                                                                       <p>
-	                                                                           개인통관고유부호를 입력하지 않아도 관세사무소에서 개인정보 확인을 위해 별도 연락을 드릴 예정입니다.
-	                                                                       </p>
-	                                                                   </div>
-	                                                               </div>
-	                                                           </div>
-	                                                       </dd>
-	                                                   </div>
-	                                               </dl>
-	                                               <div class="com_info_txt">
-	                                                   <p class="tit">해외 배송 안내</p>
-	                                                   <ul>
-	                                                       <li>물품가액이 $150초과할 경우 관/부과세가 발생 할 수 있습니다.</li>
-	                                                       <li>물품 종류와 해외공급자 관계없이 같은 날 입항하게 되면 합산과세 대상이 됩니다.</li>
-	                                                   </ul>
-	                                               </div>
-	                                               <div class="form_field mt30">
-	                                                   <div>
-	                                                       <input id="chk-overs-agr" type="checkbox" checked="">
-	                                                       <label for="chk-overs-agr"><span>위 정보는 원활한 통관을 위해 수집 및 판매자에게 제공하며,계속 사용하도록 안전하게 STYLE24에서 저장 &#47; 관리 합니다.&nbsp;&nbsp;<em class="c_primary bold f_size12">(필수)</em></span></label>
-	                                                   </div>
-	                                               </div>
-	                                           </div>
-	                                           <!-- //해외배송상품일 경우 노출 -->
-	                                           <!-- 주문제작상품일 경우 노출 -->
-	                                           <div class="area_customitem">
-	                                               <div class="txt_box mb30">
-	                                                   <p class="c_primary normal">현재 주문제작 상품을 포함하여 주문을 진행중 입니다.</p>
-	                                               </div>
-	                                               <div class="com_info_txt">
-	                                                   <p class="tit">주문 제작 상품 안내</p>
-	                                                   <ul>
-	                                                       <li>주문 제작 상품은 주문 후 제작이 진행되며, 제작 완료 후 배송이 시작됩니다.</li>
-	                                                       <li>주문 제작 상품의 특성상 주문 완료 후 취소/교환이 불가능합니다. (상품 하자에 한해 가능)</li>
-	                                                   </ul>
-	                                               </div>
-	                                               <div class="form_field mt30">
-	                                                   <div>
-	                                                       <input id="chk-custom-agr1" type="checkbox" checked="">
-	                                                       <label for="chk-custom-agr1"><span>주문 제작 상품에 대한 안내를 확인하였으며 배송에 동의합니다.&nbsp;&nbsp;<em class="c_primary bold f_size12">(필수)</em></span></label>
-	                                                   </div>
-	                                               </div>
-	                                           </div>
-	                                           <!-- //주문제작상품일 경우 노출 -->       
-	                                       </div>
-	                                       <!-- //배송지정보 -->
-	                                   </li>
-	                                   <li>
-	                                       <!-- 사은품선택 -->
-	                                       <div class="fold_head">
-	                                           <a href="javascript:void(0)">
-	                                               <div>
-	                                                   <div class="fold_tit">
-	                                                       <span>사은품 선택</span>
-	                                                   </div>
-	                                                   <div class="data">
-	                                                       <span>사은품 총 <em class="c_primary normal">2</em>개 선택</span>
-	                                                       <span><em class="c_primary normal">0</em>P 차감</span>
-	                                                   </div>
-	                                               </div>
-	                                           </a>
-	                                       </div>
-	                                       <div class="fold_cont" style="display: none;">
-	                                           <div class="area_default">
-	                                               <p class="txt">사은품선택1 > TBJ 남성 제기장 스웨이드 트러커 자켓 에서 주는 사은품</p>
-	                                               <div class="form_field">
-	                                                   <div class="gift">
-	                                                       <input type="checkbox" name="chk-gift" id="chk-gift1" class="chk_img" value="">
-	                                                       <label for="chk-gift1">
-	                                                           <span class="thumb"><img src="../ux/images/thumb/tmp_gift1.jpg" width="" alt=""></span>
-	                                                           <span class="name">유니 NBA 팀로고 양말 (N215AO225P)</span>
-	                                                           <span class="deduct">무료사은품</span>
-	                                                       </label>
-	                                                   </div>
-	                                                   <div class="gift">
-	                                                       <input type="checkbox" name="chk-gift" id="chk-gift2" class="chk_img" value="">
-	                                                       <label for="chk-gift2">
-	                                                           <span class="thumb"><img src="../ux/images/thumb/tmp_gift1.jpg" width="" alt=""></span>
-	                                                           <span class="name">사은품이름</span>
-	                                                           <span class="deduct">-4,000P</span>
-	                                                       </label>
-	                                                   </div>
-	                                                   <div class="gift">
-	                                                       <input type="checkbox" name="chk-gift" id="chk-gift3" class="chk_img" value="">
-	                                                       <label for="chk-gift3">
-	                                                           <span class="thumb"></span>
-	                                                           <span class="name">사은품 수령안함</span>
-	                                                           <span class="deduct">수령거부</span>
-	                                                       </label>
-	                                                   </div>                                                        
-	                                               </div>
-	                                               <div class="form_field">
-	                                                   <div class="gift_agree">
-	                                                       <p>
-	                                                           <input id="chk-gift_agree" type="checkbox"><label for="chk-gift_agree"><span>동의합니다</span></label>
-	                                                       </p>
-	                                                       <p class="mt20">
-	                                                           사은품 지금에 대한 내용을 확인하였으며, 이에 동의합니다.
-	                                                           <button type="button" class="btn_popup" id=""><span>안내 보기</span></button>
-	                                                       </p>
-	                                                   </div>
-	                                               </div>
-	                                           </div>
-	                                       </div>
-	                                       <!-- //사은품선택 -->                                       
-	                                   </li>
-	                                   <li>
-	                                       <!-- 할인/혜택 사용 -->
-	                                       <div class="fold_head">
-	                                           <a href="javascript:void(0)">
-	                                               <div>
-	                                                   <div class="fold_tit">
-	                                                       <span>할인/혜택 사용</span>
-	                                                   </div>
-	                                                   <div class="data">
-	                                                       <div class="form_field">
-	                                                           <!--<input id="chk-maxdisc" type="checkbox" checked="">-->
-	                                                           <label for="chk-maxdisc"><span>최대 할인혜택을 바로 적용하세요 (<em class="c_primary normal">-3,000원</em>)</span></label>
-	                                                       </div>
-	                                                   </div>
-	                                               </div>
-	                                           </a>
-	                                       </div>
-	                                       <div class="fold_cont" style="display: none;">
-	                                           <div class="area_default">
-	                                               <div class="maxdisc">
-	                                                   <div class="form_field">
-	                                                       <input id="chk-maxdisc" type="checkbox">
-	                                                       <label for="chk-maxdisc">
-	                                                           <span>최대 할인혜택을 바로 적용하세요!</span>
-	                                                       </label>
-	                                                   </div>
-	                                               </div>
-	                                               <dl>
-	                                                   <div>
-	                                                       <dt>할인코드</dt>
-	                                                       <dd>
-	                                                           <div class="input_wrap">
-	                                                               <input type="text" class="form_control" maxlength="13" placeholder="할인코드를 입력해주세요.">
-	                                                               <button type="submit" class="btn btn_dark">적용</button>
-	                                                           </div>
-	                                                       </dd>
-	                                                   </div>
-	                                                   <div>
-	                                                       <dt>할인쿠폰</dt>
-	                                                       <dd><a href="" class="btn_coupon_toggle">할인쿠폰 <span class="c_primary">3장</span> 적용 <i class="ico ico_ft_arrow_b"></i></a></dd>
-	                                                   </div>
-	                                               </dl>
-	                                               <div class="coupon_list">
-	                                                   <ul>
-	                                                       <li>
-	                                                           <div class="coupon">
-	                                                               <div class="item_gd">
-	                                                                   <figure>
-	                                                                       <span class="thumb"><img src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
-	                                                                       <figcaption>
-	                                                                           <div class="brand">CURLYSUE 컬리수</div>
-	                                                                           <div class="name">[★2020 겨울신상★] 리버시블 경량점퍼 CPW0XQJM51 [겨울] 리버시블 경량점퍼 CPW0XQJM51 [겨울]</div>
-	                                                                           <div class="price">
-	                                                                               <span class="selling_price">1,000,000</span>
-	                                                                           </div>
-	                                                                       </figcaption>
-	                                                                   </figure>
-	                                                               </div>
-	                                                               <div class="form_field">						
-	                                                                   <select id="" class="select_hidden">
-	                                                                       <option value="">구매금액 100,000원 이상시 10% 할인 쿠폰</option>
-	                                                                       <option value="">구매금액 100,000원 이상시 10% 할인 쿠폰</option>
-	                                                                       <option value="">구매금액 100,000원 이상시 10% 할인 쿠폰</option>
-	                                                                       <option value="">구매금액 100,000원 이상시 10% 할인 쿠폰</option>
-	                                                                       <option value="">구매금액 100,000원 이상시 10% 할인 쿠폰</option>
-	                                                                   </select>
-	                                                               </div>
-	                                                               <button type="button" class="btn_del_coupon" id=""><span>쿠폰적용해제</span></button>
-	                                                           </div>
-	                                                       </li>
-	                                                       <li>
-	                                                           <div class="coupon">
-	                                                               <div class="form_field">		
-	                                                                   <label for="">장바구니 할인쿠폰</label>				
-	                                                                   <select id="" class="select_hidden">
-	                                                                       <option value="">총 구매금액 10만원 이상 시 10,000원 할인 (5,000원 할인)</option>
-	                                                                       <option value="">총 구매금액 10만원 이상 시 10,000원 할인 (5,000원 할인)</option>
-	                                                                       <option value="">총 구매금액 10만원 이상 시 10,000원 할인 (5,000원 할인)</option>
-	                                                                       <option value="">총 구매금액 10만원 이상 시 10,000원 할인 (5,000원 할인)</option>
-	                                                                       <option value="">총 구매금액 10만원 이상 시 10,000원 할인 (5,000원 할인)</option>
-	                                                                   </select>
-	                                                               </div>
-	                                                               <button type="button" class="btn_del_coupon" id=""><span>쿠폰적용해제</span></button>
-	                                                           </div>
-	                                                       </li>
-	                                                       <li>
-	                                                           <div class="coupon">
-	                                                               <div class="form_field">		
-	                                                                   <label for="">배송비 할인쿠폰</label>				
-	                                                                   <select id="" class="select_hidden">
-	                                                                       <option value="">배송비 할인쿠폰 (최대 5,000원)</option>
-	                                                                       <option value="">배송비 할인쿠폰 (최대 5,000원)</option>
-	                                                                       <option value="">배송비 할인쿠폰 (최대 5,000원)</option>
-	                                                                       <option value="">배송비 할인쿠폰 (최대 5,000원)</option>
-	                                                                   </select>
-	                                                               </div>
-	                                                               <button type="button" class="btn_del_coupon" id=""><span>쿠폰적용해제</span></button>
-	                                                           </div>
-	                                                       </li>
-	                                                   </ul>
-	                                               </div>
-	                                           </div>
-	                                           <div class="area_point">
-	                                               <dl>
-	                                                   <div>
-	                                                       <dt>할인코드</dt>
-	                                                       <dd>
-	                                                           <div class="form_field">
-	                                                               <div>
-	                                                                   <input type="radio" name="rdi-codeuse" id="rdi-codeuse1" value="">
-	                                                                   <label for="rdi-codeuse1"><span>사용 안함</span></label>
-	                                                               </div>
-	                                                               <div>
-	                                                                   <input type="radio" name="rdi-codeuse" id="rdi-codeuse2" value="">
-	                                                                   <label for="rdi-codeuse2"><span>사용함</span></label>
-	                                                                   <span>사용가능 포인트:<em>1,500</em>P</span>
-	                                                               </div>
-	                                                           </div>
-	                                                       </dd>
-	                                                   </div>
-	                                               </dl>                                                
-	                                           </div>
-	                                           
-	                                           <div class="point_code">
-	                                               <div class="radio_check">
-	                                                   <div class="ui_col_3">
-	                                                       <p>할인코드</p>
-	                                                   </div>
-	                                                   <div class="ui_col_9">
-	                                                       <div class="form_field">
-	                                                           <input type="radio" name="radio" id="rdi-4" value="4"><label for="rdi-4"> <span>사용 안함</span> </label>
-	                                                       </div>
-	                                                       <div class="form_field">
-	                                                           <input type="radio" name="radio" id="rdi-5" value="5" checked=""><label for="rdi-5"> <span>사용함</span> <p>사용 가능 포인트 : <span>1,500</span>P</p></label>
-	                                                       </div>
-	                                                   </div>
-	                                               </div>
-	                                               <div class="form_field">
-	                                                   <label class="ui_col_3 input_label">스타일 포인트</label>
-	                                                   <div class="ui_col_9">
-	                                                       <div class="input_wrap">
-	                                                           <input type="text" class="form_control" maxlength="13" placeholder="사용할 포인트를 입력해주세요.">
-	                                                           <button type="submit" class="btn btn_dark">적용</button>
-	                                                       </div> 
-	                                                       <div class="save_point">
-	                                                           <p>보유 : <span>25,000</span>P</p>
-	                                                       </div>
-	                                                   </div>
-	                                               </div>
-	                                               <div class="form_field">
-	                                                   <label class="ui_col_3 input_label">상품권</label>
-	                                                   <div class="ui_col_9">
-	                                                       <div class="input_wrap">
-	                                                           <input type="text" class="form_control" maxlength="13" placeholder="사용할 포인트를 입력해주세요.">
-	                                                           <button type="submit" class="btn btn_dark">적용</button>
-	                                                       </div> 
-	                                                       <div class="save_point">
-	                                                           <p>보유 : <span>25,000</span>P</p>
-	                                                       </div>
-	                                                   </div>
-	                                               </div>
-	                                           </div>
-	
-	                                       </div>
-	                                       <!-- //할인/혜택 사용 -->                                       
-	                                   </li>                                    
-	                                   <li>
-	                                       <!-- 결제수단 선택 -->
-	                                       <div class="fold_head">
-	                                           <a href="javascript:void(0)">
-	                                               <div>
-	                                                   <div class="fold_tit">
-	                                                       <span>결제수단 선택</span>
-	                                                   </div>
-	                                               </div>
-	                                           </a>
-	                                       </div>
-	                                       <div class="fold_cont" style="display: none;">
-	                                           <div class="paymethod_list">
-	                                               <div class="paymethod on">
-	                                                   <div class="paymethod_wrap">
-	                                                       <input type="radio" name="radio_card" id="rdi-card-1" value="1" checked>
-	                                                       <label for="rdi-card-1" data="0"> 
-	                                                           STYLE24 간편결제
-	                                                       </label>
-	                                                       <div class="paymethod_body">
-	                                                           <div class="add_card">
-	                                                               <div class="plus_card">
-	                                                                   <div class="cross_wrap">
-	                                                                       <button>
-	                                                                           <div class="cross"></div>
-	                                                                       </button>
-	                                                                   </div>
-	                                                                   <div class="enrollment">
-	                                                                       <p>결제수단 등록</p>
-	                                                                   </div>
-	                                                               </div>
-	                                                           </div>
-	                                                           <div class="paymethod_text">
-	                                                               <p>&#183; 결제수단 등록 한번으로 간편하게 결제하실 수 있습니다.</p>
-	                                                               <p>&#183; 국내 8개 카드에 대해 이용 가능합니다. (법인카드,기프트카드,해외카드 제외)</p>
-	                                                               <p>&#183; 일반 신용카드의 할인혜택은 적용되지 않습니다.</p>
-	                                                           </div>
-	                                                       </div>
-	                                                   </div>
-	                                               </div>
-	                                               <div class="paymethod">
-	                                                   <div class="paymethod_wrap">
-	                                                       <input type="radio" name="radio_card" id="rdi-card-2" value="2">
-	                                                       <label for="rdi-card-2"  data="1"> 
-	                                                           일반 결제
-	                                                       </label>
-	                                                       <div class="paymethod_body">
-	                                                           <div class="form_field">
-	                                                               <div>
-	                                                                   <input type="radio" name="payMeansClass" id="rdi-8" value="8"><label for="rdi-8"> <span>신용카드</span> </label>
-	                                                               </div>
-	                                                               <div>
-	                                                                   <input type="radio" name="payMeansClass" id="rdi-9" value="9"><label for="rdi-9"> <span>실시간계좌이체</span> </label>
-	                                                               </div>
-	                                                               <div>
-	                                                                   <input type="radio" name="payMeansClass" id="rdi-10" value="10"><label for="rdi-10"> <span>무통장입금</span> </label> 
-	                                                               </div>
-	                                                               <div>
-	                                                                   <input type="radio" name="payMeansClass" id="rdi-11" value="11"><label for="rdi-11"> <span>휴대폰 결제</span> </label> 
-	                                                               </div>
-	                                                               <div>
-	                                                                   <input type="radio" name="payMeansClass" id="rdi-12" value="12"><label for="rdi-12"> <span>카카오페이</span> </label> 
-	                                                               </div>
-	                                                               <div>
-	                                                                   <input type="radio" name="payMeansClass" id="rdi-13" value="13"><label for="rdi-13"> <span>네이버엔페이</span> </label> 
-	                                                               </div>
-	                                                               <div>
-	                                                                   <input type="radio" name="payMeansClass" id="rdi-14" value="14"><label for="rdi-14"> <span>페이코</span> </label> 
-	                                                               </div>
-	                                                           </div>
-	                                                       </div>
-	                                                   </div>
-	                                               </div>
-	                                           </div>
-	                                           <!-- case1,2 간편결제,일반결제 결과-->
-	                                           <div class="payment type01 active">
-	                                               <div class="form_field">
-	                                                   <div>
-	                                                       <input id="chk-3" type="checkbox"><label for="chk-3"> <span>선택한 결제수단으로 향후 결제 이용에 동의합니다. <a href="#none">(선택)</a></span> </label>
-	                                                   </div>
-	                                               </div>
-	                                               <div class="privacy_consent">
-	                                                   <p>개인정보 제공에 대한 동의</p>
-	                                                   <span>개인정보를 제공받는 자 : 업체명,업체명,업체명</span>
-	                                                   <span>개인정보를 제공받는 자의 개인정보 이용 목적 : 주문상품의 배송,고객상당 및 불만처리</span>
-	                                                   <span>제공하는 개인정보의 항목:성명,주소,연락처</span>
-	                                                   <span>개인정보 제공받는 자의 개인정보 보유 및 이용기간 : 이용목적 달성 시 까지</span>
-	                                                   <div class="form_field">
-	                                                       <div>
-	                                                           <input id="chk-4" type="checkbox"><label for="chk-4"> <span>동의합니다.</span> </label>
-	                                                       </div>
-	                                                   </div>
-	                                               </div>
-	                                               <div class="form_field">
-	                                                   <div>
-	                                                       <input id="chk-5" type="checkbox"><label for="chk-5"> <span>주문하실 상품,가격,배송정보,할인정보 등을 확인하였으며,구매에 동의하시겠습니까? (전자상거래법 제8조 2항)</span> </label>
-	                                                   </div>
-	                                               </div>
-	                                               <div class="ui_row">
-	                                                   <div class="ui_col_12">
-	                                                       <button class="btn btn_dark btn_block"><span>123,456,789</span>원 결제하기</button>
-	                                                   </div>
-	                                               </div>
-	                                           </div>
-	                                           <div class="payment type02">
-	                                               <div class="form_field">
-	                                                   <div>
-	                                                       <input id="chk-3" type="checkbox"><label for="chk-3"> <span>소비자 피해 보상보험 신청 <a href="#none">(선택)</a></span> <button class="faq">FAQ확인</button> </label>
-	                                                   </div>
-	                                                   <div>
-	                                                       <p>&#145;전자상거래 등에서의 소비자보호에 관한 법률&#146;에 따라 현금 결제 시 서울보증보험(주)가 제공하는 소비자 피해보상보험을<br>신청할 수 있도록 해드리고 있습니다. (2013.11.28부터 시행)</p>
-	                                                   </div>
-	                                               </div>
-	                                               <div class="privacy_consent">
-	                                                   <p>개인정보 제공에 대한 동의</p>
-	                                                   <span>개인정보를 제공받는 자 : 업체명,업체명,업체명</span>
-	                                                   <span>개인정보를 제공받는 자의 개인정보 이용 목적 : 주문상품의 배송,고객상당 및 불만처리</span>
-	                                                   <span>제공하는 개인정보의 항목:성명,주소,연락처</span>
-	                                                   <span>개인정보 제공받는 자의 개인정보 보유 및 이용기간 : 이용목적 달성 시 까지</span>
-	                                                   <div class="form_field">
-	                                                       <div>
-	                                                           <input id="chk-4" type="checkbox"><label for="chk-4"> <span>동의합니다.</span> </label>
-	                                                       </div>
-	                                                   </div>
-	                                               </div>
-	                                               <div class="form_field">
-	                                                   <div>
-	                                                       <input id="chk-5" type="checkbox"><label for="chk-5"> <span>주문하실 상품,가격,배송정보,할인정보 등을 확인하였으며,구매에 동의하시겠습니까? (전자상거래법 제8조 2항)</span> </label>
-	                                                   </div>
-	                                               </div>
-	                                               <div class="ui_row">
-	                                                   <div class="ui_col_12">
-	                                                       <button class="btn btn_dark btn_block"><span>123,456,789</span>원 결제하기</button>
-	                                                   </div>
-	                                               </div>
-	                                           </div>
-	                                           <!-- //case1,2 간편결제,일반결제 결과-->
-	                                       </div>
-	                                   </li>
-	                               </ul>
-	                           </div>
-	                           <!-- // -->
-	                           <!--<div class="order_body">
-	                               <div class="foldGroup order">
-	                                   <ul>
-	                                       <li>
-	                                           <div class="fold_head">
-	                                               <a href="javascript:void(0)">
-	                                                   <div>
-	                                                       <p>사은품 선택</p>
-	                                                   </div>
-	                                                   <div class="info_fix">
-	                                                       <p>사은품 총 <span>2</span>개 선택</p>
-	                                                       <p><span>0</span>P 차감</p>
-	                                                   </div>
-	                                               </a>
-	                                           </div>
-	                                           <div class="fold_cont" style="display: none;">
-	                                               <div class="sec_head">
-	                                                   <div>사은품선택 1</div>
-	                                                   <div><span>TBJ 남성 제기장 스웨이드 트러커 자켓</span></div>
-	                                               </div>
-	                                               <div class="sec_body">
-	                                                   <div class="form_field point">
-	                                                       <div class="ui_col_4" data="0">
-	                                                           <input type="radio" name="radio" id="rdi-1" value="1">
-	                                                           <label for="rdi-1"> 
-	                                                               <div class="radio_img">
-	                                                                   <img src="/images/pc/dp_slide_bestItem01.png">
-	                                                               </div>
-	                                                               <div class="radio_text">
-	                                                                   <p>블랙 기모 후드티</p>
-	                                                                   <span>-4,900P</span>
-	                                                               </div>
-	                                                           </label>
-	                                                       </div>
-	                                                       <div class="ui_col_4" data="1">
-	                                                           <input type="radio" name="radio" id="rdi-2" value="2" checked="">
-	                                                           <label for="rdi-2"> 
-	                                                               <div class="radio_img">
-	                                                                   <img src="/images/pc/dp_slide_bestItem02.png">
-	                                                               </div>
-	                                                               <div class="radio_text">
-	                                                                   <p>블랙 기모 후드티</p>
-	                                                                   <span>-4,900P</span>
-	                                                               </div>
-	                                                           </label>
-	                                                       </div>
-	                                                       <div class="ui_col_4" data="2">
-	                                                           <input type="radio" name="radio" id="rdi-3" value="3" >
-	                                                           <label for="rdi-3">
-	                                                               <div class="radio_img">
-	                                                                   <img src="/images/pc/dp_slide_bestItem01.png">
-	                                                               </div>
-	                                                               <div class="radio_text">
-	                                                                   <p>사은품 수령안함</p>
-	                                                                   <span>수령거부</span>
-	                                                               </div>
-	                                                           </label> 
-	                                                       </div>
-	                                                   </div>
-	                                               </div>
-	                                               <div class="sec_foot">
-	                                                   <div class="form_field">
-	                                                       <div>
-	                                                           <input id="chk-2" type="checkbox" ><label for="chk-2"> <span>동의합니다</span> </label>
-	                                                       </div>
-	                                                   </div>
-	                                                   <div>
-	                                                       <p>사은품 지금에 대한 내용을 확인하였으며, 이에 동의합니다. <a href="#none">안내 보기</a></p>
-	                                                   </div>
-	                                               </div>
-	                                           </div>
-	                                       </li>
-	                                       <li>
-	                                           <div class="fold_head">
-	                                               <a href="javascript:void(0)">
-	                                                   <div>
-	                                                       <p>할인&#47;혜택 사용</p>
-	                                                   </div>
-	                                                   <div class="info_fix">
-	                                                       <p>최대 할인혜택을 바로 적용하세요!</p>
-	                                                   </div>
-	                                               </a>
-	                                           </div>
-	                                           <div class="fold_cont" style="display: none;">
-	                                               <div class="sale_code">
-	                                                   <div class="form_field">
-	                                                       <div>
-	                                                           <input id="chk-11" type="checkbox"><label for="chk-11"> <span>최대 할인혜택을 바로 적용하세요!</span> </label>
-	                                                       </div>
-	                                                   </div>
-	                                                   <div class="form_field">
-	                                                       <label class="ui_col_3 input_label">할인코드</label>
-	                                                       <div class="ui_col_9">
-	                                                           <div class="input_wrap">
-	                                                               <input type="text" class="form_control" maxlength="13" placeholder="사용할 포인트를 입력해주세요.">
-	                                                               <button type="submit" class="btn btn_dark">적용</button>
-	                                                           </div> 
-	                                                       </div>
-	                                                   </div>
-	                                                   <div class="form_field">
-	                                                       <label class="ui_col_3 input_label">할인쿠폰</label>
-	                                                       <div class="ui_col_9 fold">
-	                                                           <a href="javascript:void(0)">
-	                                                               <p>할인쿠폰 <span>10</span>장 적용</p>
-	                                                           </a>
-	                                                           <div class="couponfold">
-	                                                               <form class="form_wrap">
-	                                                                   <div class="form_field">
-	                                                                       <div class="form_item">
-	                                                                           <div class="shop_item_wrap">
-	                                                                               <div class="shop_img">
-	                                                                                   <img src="/images/pc/thumb/dp_item01.jpg" alt="">
-	                                                                               </div>
-	                                                                               <div class="shop_text">
-	                                                                                   <p class="brand">TBJ</p>
-	                                                                                   <p class="item_name">남성패커블 바람막이 점퍼 슈리스</p>
-	                                                                                   <p class="price"><span>158,000</span>원</p>
-	                                                                               </div>
-	                                                                           </div>
-	                                                                       </div>
-	                                                                       <select class="form-control select" data-live-search="true">
-	                                                                           <option value="hide">구매금액 100,000원 이상시 10% 할인 쿠폰</option>
-	                                                                           <option>구매금액 100,000원 이상시 10% 할인 쿠폰</option>
-	                                                                           <option>구매금액 100,000원 이상시 10% 할인 쿠폰</option>
-	                                                                           <option>구매금액 100,000원 이상시 10% 할인 쿠폰</option>
-	                                                                       </select>
-	                                                                       <button>쿠폰 적용 해제</button>
-	                                                                   </div>
-	                                                               </form>
-	                                                               <form class="form_wrap">
-	                                                                   <div class="form_field">
-	                                                                       <label class="input_label">장바구니 할인쿠폰</label>
-	                                                                       <select class="form-control select" data-live-search="true">
-	                                                                           <option value="hide">총 구매금액 10만원 이상 시 10,000원 할인 (5,000원 할인)</option>
-	                                                                           <option>구매금액 100,000원 이상시 10% 할인 쿠폰</option>
-	                                                                           <option>구매금액 100,000원 이상시 10% 할인 쿠폰</option>
-	                                                                           <option>구매금액 100,000원 이상시 10% 할인 쿠폰</option>
-	                                                                       </select>
-	                                                                       <button>쿠폰 적용 해제</button>
-	                                                                   </div>
-	                                                               </form>
-	                                                               <form class="form_wrap">
-	                                                                   <div class="form_field">
-	                                                                       <label class="input_label">장바구니 할인쿠폰</label>
-	                                                                       <select class="form-control select" data-live-search="true">
-	                                                                           <option value="hide">배송비 할인쿠폰 (최대 5,000원)</option>
-	                                                                           <option>배송비 할인쿠폰 (최대 5,000원)</option>
-	                                                                           <option>배송비 할인쿠폰 (최대 5,000원)</option>
-	                                                                           <option>배송비 할인쿠폰 (최대 5,000원)</option>
-	                                                                       </select>
-	                                                                       <button>쿠폰 적용 해제</button>
-	                                                                   </div>
-	                                                               </form>
-	                                                           </div>
-	                                                       </div>
-	                                                   </div>
-	                                               </div>
-	                                               <div class="point_code">
-	                                                   <div class="radio_check">
-	                                                       <div class="ui_col_3">
-	                                                           <p>할인코드</p>
-	                                                       </div>
-	                                                       <div class="ui_col_9">
-	                                                           <div class="form_field">
-	                                                               <input type="radio" name="radio" id="rdi-4" value="4"><label for="rdi-4"> <span>사용 안함</span> </label>
-	                                                           </div>
-	                                                           <div class="form_field">
-	                                                               <input type="radio" name="radio" id="rdi-5" value="5" checked=""><label for="rdi-5"> <span>사용함</span> <p>사용 가능 포인트 : <span>1,500</span>P</p></label>
-	                                                           </div>
-	                                                       </div>
-	                                                   </div>
-	                                                   <div class="form_field">
-	                                                       <label class="ui_col_3 input_label">스타일 포인트</label>
-	                                                       <div class="ui_col_9">
-	                                                           <div class="input_wrap">
-	                                                               <input type="text" class="form_control" maxlength="13" placeholder="사용할 포인트를 입력해주세요.">
-	                                                               <button type="submit" class="btn btn_dark">적용</button>
-	                                                           </div> 
-	                                                           <div class="save_point">
-	                                                               <p>보유 : <span>25,000</span>P</p>
-	                                                           </div>
-	                                                       </div>
-	                                                   </div>
-	                                                   <div class="form_field">
-	                                                       <label class="ui_col_3 input_label">상품권</label>
-	                                                       <div class="ui_col_9">
-	                                                           <div class="input_wrap">
-	                                                               <input type="text" class="form_control" maxlength="13" placeholder="사용할 포인트를 입력해주세요.">
-	                                                               <button type="submit" class="btn btn_dark">적용</button>
-	                                                           </div> 
-	                                                           <div class="save_point">
-	                                                               <p>보유 : <span>25,000</span>P</p>
-	                                                           </div>
-	                                                       </div>
-	                                                   </div>
-	                                               </div>
-	                                           </div>
-	                                       </li>
-	                                       <li>
-	                                           <div class="fold_head">
-	                                               <a href="javascript:void(0)">
-	                                                   <div>
-	                                                       <p>결제수단 선택</p>
-	                                                   </div>
-	                                               </a>
-	                                           </div>
-	                                           <div class="fold_cont" style="display: none;">
-	                                               <div class="paymethod_list">
-	                                                   <div class="paymethod on">
-	                                                       <div class="paymethod_wrap">
-	                                                           <input type="radio" name="radio_card" id="rdi-card-1" value="1" checked>
-	                                                           <label for="rdi-card-1" data="0"> 
-	                                                               STYLE24 간편결제
-	                                                           </label>
-	                                                           <div class="paymethod_body">
-	                                                               <div class="add_card">
-	                                                                   <div class="plus_card">
-	                                                                       <div class="cross_wrap">
-	                                                                           <button>
-	                                                                               <div class="cross"></div>
-	                                                                           </button>
-	                                                                       </div>
-	                                                                       <div class="enrollment">
-	                                                                           <p>결제수단 등록</p>
-	                                                                       </div>
-	                                                                   </div>
-	                                                               </div>
-	                                                               <div class="paymethod_text">
-	                                                                   <p>&#183; 결제수단 등록 한번으로 간편하게 결제하실 수 있습니다.</p>
-	                                                                   <p>&#183; 국내 8개 카드에 대해 이용 가능합니다. (법인카드,기프트카드,해외카드 제외)</p>
-	                                                                   <p>&#183; 일반 신용카드의 할인혜택은 적용되지 않습니다.</p>
-	                                                               </div>
-	                                                           </div>
-	                                                       </div>
-	                                                   </div>
-	                                                   <div class="paymethod">
-	                                                       <div class="paymethod_wrap">
-	                                                           <input type="radio" name="radio_card" id="rdi-card-2" value="2">
-	                                                           <label for="rdi-card-2"  data="1"> 
-	                                                               일반 결제
-	                                                           </label>
-	                                                           <div class="paymethod_body">
-	                                                               <div class="form_field">
-	                                                                   <div>
-	                                                                       <input type="radio" name="payMeansClass" id="rdi-8" value="8"><label for="rdi-8"> <span>신용카드</span> </label>
-	                                                                   </div>
-	                                                                   <div>
-	                                                                       <input type="radio" name="payMeansClass" id="rdi-9" value="9"><label for="rdi-9"> <span>실시간계좌이체</span> </label>
-	                                                                   </div>
-	                                                                   <div>
-	                                                                       <input type="radio" name="payMeansClass" id="rdi-10" value="10"><label for="rdi-10"> <span>무통장입금</span> </label> 
-	                                                                   </div>
-	                                                                   <div>
-	                                                                       <input type="radio" name="payMeansClass" id="rdi-11" value="11"><label for="rdi-11"> <span>휴대폰 결제</span> </label> 
-	                                                                   </div>
-	                                                                   <div>
-	                                                                       <input type="radio" name="payMeansClass" id="rdi-12" value="12"><label for="rdi-12"> <span>카카오페이</span> </label> 
-	                                                                   </div>
-	                                                                   <div>
-	                                                                       <input type="radio" name="payMeansClass" id="rdi-13" value="13"><label for="rdi-13"> <span>네이버엔페이</span> </label> 
-	                                                                   </div>
-	                                                                   <div>
-	                                                                       <input type="radio" name="payMeansClass" id="rdi-14" value="14"><label for="rdi-14"> <span>페이코</span> </label> 
-	                                                                   </div>
-	                                                               </div>
-	                                                           </div>
-	                                                       </div>
-	                                                   </div>
-	                                               </div>
-	                                               //case1,2 간편결제,일반결제 결과
-	                                               <div class="payment type01 active">
-	                                                   <div class="form_field">
-	                                                       <div>
-	                                                           <input id="chk-3" type="checkbox"><label for="chk-3"> <span>선택한 결제수단으로 향후 결제 이용에 동의합니다. <a href="#none">(선택)</a></span> </label>
-	                                                       </div>
-	                                                   </div>
-	                                                   <div class="privacy_consent">
-	                                                       <p>개인정보 제공에 대한 동의</p>
-	                                                       <span>개인정보를 제공받는 자 : 업체명,업체명,업체명</span>
-	                                                       <span>개인정보를 제공받는 자의 개인정보 이용 목적 : 주문상품의 배송,고객상당 및 불만처리</span>
-	                                                       <span>제공하는 개인정보의 항목:성명,주소,연락처</span>
-	                                                       <span>개인정보 제공받는 자의 개인정보 보유 및 이용기간 : 이용목적 달성 시 까지</span>
-	                                                       <div class="form_field">
-	                                                           <div>
-	                                                               <input id="chk-4" type="checkbox"><label for="chk-4"> <span>동의합니다.</span> </label>
-	                                                           </div>
-	                                                       </div>
-	                                                   </div>
-	                                                   <div class="form_field">
-	                                                       <div>
-	                                                           <input id="chk-5" type="checkbox"><label for="chk-5"> <span>주문하실 상품,가격,배송정보,할인정보 등을 확인하였으며,구매에 동의하시겠습니까? (전자상거래법 제8조 2항)</span> </label>
-	                                                       </div>
-	                                                   </div>
-	                                                   <div class="ui_row">
-	                                                       <div class="ui_col_12">
-	                                                           <button class="btn btn_dark btn_block"><span>123,456,789</span>원 결제하기</button>
-	                                                       </div>
-	                                                   </div>
-	                                               </div>
-	                                               <div class="payment type02">
-	                                                   <div class="form_field">
-	                                                       <div>
-	                                                           <input id="chk-3" type="checkbox"><label for="chk-3"> <span>소비자 피해 보상보험 신청 <a href="#none">(선택)</a></span> <button class="faq">FAQ확인</button> </label>
-	                                                       </div>
-	                                                       <div>
-	                                                           <p>&#145;전자상거래 등에서의 소비자보호에 관한 법률&#146;에 따라 현금 결제 시 서울보증보험(주)가 제공하는 소비자 피해보상보험을<br>신청할 수 있도록 해드리고 있습니다. (2013.11.28부터 시행)</p>
-	                                                       </div>
-	                                                   </div>
-	                                                   <div class="privacy_consent">
-	                                                       <p>개인정보 제공에 대한 동의</p>
-	                                                       <span>개인정보를 제공받는 자 : 업체명,업체명,업체명</span>
-	                                                       <span>개인정보를 제공받는 자의 개인정보 이용 목적 : 주문상품의 배송,고객상당 및 불만처리</span>
-	                                                       <span>제공하는 개인정보의 항목:성명,주소,연락처</span>
-	                                                       <span>개인정보 제공받는 자의 개인정보 보유 및 이용기간 : 이용목적 달성 시 까지</span>
-	                                                       <div class="form_field">
-	                                                           <div>
-	                                                               <input id="chk-4" type="checkbox"><label for="chk-4"> <span>동의합니다.</span> </label>
-	                                                           </div>
-	                                                       </div>
-	                                                   </div>
-	                                                   <div class="form_field">
-	                                                       <div>
-	                                                           <input id="chk-5" type="checkbox"><label for="chk-5"> <span>주문하실 상품,가격,배송정보,할인정보 등을 확인하였으며,구매에 동의하시겠습니까? (전자상거래법 제8조 2항)</span> </label>
-	                                                       </div>
-	                                                   </div>
-	                                                   <div class="ui_row">
-	                                                       <div class="ui_col_12">
-	                                                           <button class="btn btn_dark btn_block"><span>123,456,789</span>원 결제하기</button>
-	                                                       </div>
-	                                                   </div>
-	                                               </div>
-	                                               //case1,2 간편결제,일반결제 결과
-	                                           </div>
-	                                       </li>
-	                                   </ul>
-	                               </div>
-	                           </div>-->
-	                       </div>
-	                   </section>
-	                   <section class="od_side fr">
-	                       <div class="area_order">
-	                           <div class="tit_box">
-	                               <h3 class="subH2">주문내역</h3>
-	                               <span>
-	                                   <em class="c_primary bold">14</em>개의 상품
-	                               </span>
-	                           </div>                            
-	                           <div class="od_item_box">
-	                               <!-- 총알배송 -->
-	                               <div class="part_dlvr">
-	                                   <h4 class="subH3 mb20">
-	                                       STYLE24 총알배송
-	                                       <span>오늘 자정까지 도착</span>
-	                                   </h4>
-	                                   <div class="gd_list">
-	                                       <div class="item_gd">
-	                                           <figure>
-	                                               <span class="thumb"><img src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
-	                                               <figcaption>
-	                                                   <div class="brand">CURLYSUE 컬리수</div>
-	                                                   <div class="name">[★2020 겨울신상★] 리버시블 경량점퍼 CPW0XQJM51 [겨울] 리버시블 경량점퍼 CPW0XQJM51 [겨울]</div>
-	                                                   <div class="option">
-	                                                       <span>01_루돌프융기모상하복_D오렌지/110</span>
-	                                                       <span>수량:<em>99</em>개</span>
-	                                                   </div>
-	                                                   <div class="price">
-	                                                       <span class="selling_price">1,000,000</span>
-	                                                   </div>
-	                                               </figcaption>
-	                                           </figure>
-	                                       </div>
-	                                       <div class="item_gd">
-	                                           <figure>
-	                                               <span class="thumb"><img src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
-	                                               <figcaption>
-	                                                   <div class="brand">CURLYSUE 컬리수</div>
-	                                                   <div class="name">[★2020 겨울신상★] 리버시블 경량점퍼 CPW0XQJM51 [겨울] 리버시블 경량점퍼 CPW0XQJM51 [겨울]</div>
-	                                                   <div class="option">
-	                                                       <span>01_루돌프융기모상하복_D오렌지/110</span>
-	                                                       <span>수량:<em>99</em>개</span>
-	                                                   </div>
-	                                                   <div class="price">
-	                                                       <span class="selling_price">1,000,000</span>
-	                                                   </div>
-	                                               </figcaption>
-	                                           </figure>
-	                                       </div>
-	                                   </div>              
-	                               </div>
-	                               <!-- //총알배송 -->
-	                               <!-- 일반배송 -->
-	                               <div class="part_dlvr">
-	                                   <h4 class="subH3 mb20">
-	                                       STYLE24 일반배송
-	                                   </h4>
-	                                   <div class="gd_list">
-	                                       <div class="item_gd">
-	                                           <figure>
-	                                               <span class="thumb"><img src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
-	                                               <figcaption>
-	                                                   <div class="brand">CURLYSUE 컬리수</div>
-	                                                   <div class="name">[★2020 겨울신상★] 리버시블 경량점퍼 CPW0XQJM51 [겨울] 리버시블 경량점퍼 CPW0XQJM51 [겨울]</div>
-	                                                   <div class="option">
-	                                                       <span>01_루돌프융기모상하복_D오렌지/110</span>
-	                                                       <span>수량:<em>99</em>개</span>
-	                                                   </div>
-	                                                   <div class="price">
-	                                                       <span class="selling_price">1,000,000</span>
-	                                                   </div>
-	                                               </figcaption>
-	                                           </figure>
-	                                       </div>
-	                                       <div class="item_gd">
-	                                           <figure>
-	                                               <span class="thumb"><img src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
-	                                               <figcaption>
-	                                                   <div class="brand">CURLYSUE 컬리수</div>
-	                                                   <div class="name">[★2020 겨울신상★] 리버시블 경량점퍼 CPW0XQJM51 [겨울] 리버시블 경량점퍼 CPW0XQJM51 [겨울]</div>
-	                                                   <div class="option">
-	                                                       <span>01_루돌프융기모상하복_D오렌지/110</span>
-	                                                       <span>수량:<em>99</em>개</span>
-	                                                   </div>
-	                                                   <div class="price">
-	                                                       <span class="selling_price">1,000,000</span>
-	                                                   </div>
-	                                               </figcaption>
-	                                           </figure>
-	                                       </div>
-	                                   </div>                             
-	                               </div>
-	                               <!-- //일반배송 -->
-	                               <!-- 업체직배송 -->
-	                               <div class="part_dlvr">
-	                                   <h4 class="subH3 mb20">
-	                                       업체직배송
-	                                   </h4>
-	                                   <div class="gd_list">    
-	                                       <div class="item_gd">
-	                                           <figure>
-	                                               <span class="thumb"><img src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
-	                                               <figcaption>
-	                                                   <div class="brand">CURLYSUE 컬리수</div>
-	                                                   <div class="name">[★2020 겨울신상★] 리버시블 경량점퍼 CPW0XQJM51 [겨울] 리버시블 경량점퍼 CPW0XQJM51 [겨울]</div>
-	                                                   <div class="option">
-	                                                       <span>01_루돌프융기모상하복_D오렌지/110</span>
-	                                                       <span>수량:<em>99</em>개</span>
-	                                                   </div>
-	                                                   <div class="price">
-	                                                       <span class="selling_price">1,000,000</span>
-	                                                   </div>
-	                                               </figcaption>
-	                                           </figure>
-	                                       </div>
-	                                   </div>
-	                                   <div class="gd_list">    
-	                                       <div class="item_gd">
-	                                           <figure>
-	                                               <span class="thumb"><img src="/images/pc/thumb/tmp_odSide2.jpg" alt=""></span>
-	                                               <figcaption>
-	                                                   <div class="brand">CURLYSUE 컬리수</div>
-	                                                   <div class="name">[★2020 겨울신상★] 리버시블 경량점퍼 CPW0XQJM51 [겨울] 리버시블 경량점퍼 CPW0XQJM51 [겨울]</div>
-	                                                   <div class="option">
-	                                                       <span>01_루돌프융기모상하복_D오렌지/110</span>
-	                                                       <span>수량:<em>99</em>개</span>
-	                                                   </div>
-	                                                   <div class="price">
-	                                                       <span class="selling_price">1,000,000</span>
-	                                                   </div>
-	                                               </figcaption>
-	                                           </figure>
-	                                       </div>
-	                                   </div>                             
-	                               </div>
-	                               <!-- //업체직배송 -->
-	                               <!-- 예약배송 -->
-	                               <div class="part_dlvr">
-	                                   <h4 class="subH3 mb20">
-	                                       예약배송
-	                                   </h4>
-	                                   <div class="gd_list">
-	                                       <div class="item_gd">
-	                                           <figure>
-	                                               <span class="thumb"><img src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
-	                                               <figcaption>
-	                                                   <div class="brand">CURLYSUE 컬리수</div>
-	                                                   <div class="name">[★2020 겨울신상★] 리버시블 경량점퍼 CPW0XQJM51 [겨울] 리버시블 경량점퍼 CPW0XQJM51 [겨울]</div>
-	                                                   <div class="option">
-	                                                       <span>01_루돌프융기모상하복_D오렌지/110</span>
-	                                                       <span>수량:<em>99</em>개</span>
-	                                                   </div>
-	                                                   <div class="price">
-	                                                       <span class="selling_price">1,000,000</span>
-	                                                   </div>
-	                                               </figcaption>
-	                                           </figure>
-	                                           <p class="info_reserv">
-	                                               <i class="ico ico_calender"></i><span>2021.01.15</span> 배송예정상품
-	                                           </p>
-	                                       </div>
-	                                       <div class="item_gd">
-	                                           <figure>
-	                                               <span class="thumb"><img src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
-	                                               <figcaption>
-	                                                   <div class="brand">CURLYSUE 컬리수</div>
-	                                                   <div class="name">[★2020 겨울신상★] 리버시블 경량점퍼 CPW0XQJM51 [겨울] 리버시블 경량점퍼 CPW0XQJM51 [겨울]</div>
-	                                                   <div class="option">
-	                                                       <span>01_루돌프융기모상하복_D오렌지/110</span>
-	                                                       <span>수량:<em>99</em>개</span>
-	                                                   </div>
-	                                                   <div class="price">
-	                                                       <span class="selling_price">1,000,000</span>
-	                                                   </div>
-	                                               </figcaption>
-	                                           </figure>
-	                                           <p class="info_reserv">
-	                                               <i class="ico ico_calender"></i><span>2021.01.15</span> 배송예정상품
-	                                           </p>
-	                                       </div>
-	                                   </div>                   
-	                               </div>
-	                               <!-- //예약배송 -->                                 
-	                           </div>
-	                           <div class="od_amount_box">
-	                               <dl>
-	                                   <div>
-	                                       <dt>상품금액</dt>
-	                                       <dd>1,590,000 원</dd>
-	                                   </div>
-	                                   <div>
-	                                       <dt>배송비</dt>
-	                                       <dd>0원</dd>
-	                                   </div>
-	                                   <div>
-	                                       <dt>할인금액</dt>
-	                                       <dd class="c_primary">-1,746,500원</dd>
-	                                   </div>
-	                                   <div>
-	                                       <dt>다다익선할인금액</dt>
-	                                       <dd class="c_primary">25,000원</dd>
-	                                   </div>
-	                                   <div>
-	                                       <dt>쿠폰할인금액</dt>
-	                                       <dd class="c_primary">3,000원</dd>
-	                                   </div>
-	                                   <div>
-	                                       <dt>선포인트 사용</dt>
-	                                       <dd class="c_primary">-1,500P</dd>
-	                                   </div>
-	                                   <div>
-	                                       <dt>포인트 사용</dt>
-	                                       <dd class="c_primary">-5,500P</dd>
-	                                   </div>
-	                                   <div>
-	                                       <dt>상품권 사용</dt>
-	                                       <dd class="c_primary">-50,000원</dd>
-	                                   </div>
-	                               </dl>
-	                           </div>
-	                           <div class="totalprice_box">
-	                               <dl>
-	                                   <dt>총 결제 예정 금액</dt>
-	                                   <dd data-weight="price" data-font="lato"><span>3,546,200</span>원</dd>
-	                               </dl>
-	                               <p class="info_point">
-	                                  스타일 포인트 <span class="c_primary">3,500 P</span> 적립예정
-	                               </p>
-	                           </div>
-	                       </div>
-	                   </section>
-	                   <div class="clear"></div>
-					<!-- // CONT-BODY -->					
+						<div class="sec_head">
+							<div class="tbl type4">
+								<table>
+									<colgroup>
+										<col width="240">
+										<col width="*">
+									</colgroup>
+									<tbody>
+									<tr>
+										<th>총 <span class="c_primary bold" th:text="${delvTotCnt}"></span> 건으로 나뉘어 배송 예정</th>
+										<td class="t_l">
+											<span>총알배송<em class="c_primary bold" th:text="${wmsCnt}" id="shotDelv"></em>건</span>
+											<span>STYLE24<em class="c_primary bold" th:text="${wmsCnt}" id="wmsDelv"></em>건</span>
+											<span>업체직배송<em class="c_primary bold" th:text="${delvCnt}"></em>건</span>
+											<span>예약배송<em class="c_primary bold" th:text="${resCnt}"></em>건</span>
+										</td>
+									</tr>
+									</tbody>
+								</table>
+							</div>
+						</div>
+
+						<div class="sec_body">
+							<div class="t_r mb15">
+								<a href="/cart/list/form" class="btn_link">쇼핑백 바로가기</a>
+							</div>
+
+							<div class="foldGroup">
+								<ul>
+									<li>
+										<!-- 주문고객정보 -->
+										<div class="fold_head">
+											<a href="javascript:void(0)">
+												<div>
+													<div class="fold_tit">
+														<span>주문고객</span>
+													</div>
+													<div class="data">
+														<span th:text="${custemerInfo.custNm}"></span>
+														<span th:text="${custemerInfo.email}"></span>
+														<span th:text="${custemerInfo.cellPhnno}"></span>
+													</div>
+												</div>
+											</a>
+										</div>
+
+										<div class="fold_cont" style="display: none;">
+											<div class="area_default">
+												<dl>
+													<div>
+														<dt>주문자명</dt>
+														<dd th:text="${custemerInfo.custNm}"></dd>
+													</div>
+													<div>
+														<dt>이메일</dt>
+														<dd th:text="${custemerInfo.email}"></dd>
+													</div>
+													<div>
+														<dt>휴대폰 번호</dt>
+														<dd th:text="${custemerInfo.cellPhnno}"><button type="button" class="btn_popup" id=""><span>본인인증하기</span></button></dd>
+													</div>
+												</dl>
+											</div>
+										</div>
+										<!-- //주문고객정보 -->
+									</li>
+									<li>
+										<!-- 배송지정보 -->
+										<div class="fold_head">
+											<a href="javascript:void(0)">
+												<div>
+													<div class="fold_tit">
+														<span>배송지 정보</span>
+													</div>
+													<div class="data" th:text="${deliveryAddrInfo.recipBaseAddr} + ${deliveryAddrInfo.recipDtlAddr}"></div>
+												</div>
+											</a>
+										</div>
+										<div class="fold_cont" style="display: none;">
+											<div class="area_default">
+												<dl>
+													<div>
+														<dt>배송지명</dt>
+														<dd th:text="${deliveryAddrInfo.delvAddrNm}">
+															<span class="icon_tag">
+																<em class="tag_stype1">기본 배송지</em>
+																<em class="tag_stype2">총알배송</em>
+															</span>
+														</dd>
+													</div>
+													<div>
+														<dt>배송주소</dt>
+														<dd th:text="${deliveryAddrInfo.recipBaseAddr} + ${deliveryAddrInfo.recipDtlAddr}">
+															<button type="button" class="btn_popup" id=""><span>배송지 선택</span></button>
+														</dd>
+													</div>
+													<div>
+														<dt>휴대폰 번호</dt>
+														<dd th:text="${custemerInfo.cellPhnno}"></dd>
+													</div>
+													<div>
+														<dt>배송요청 사항</dt>
+														<dd>
+															직접받고 부재 시 문앞
+															<button type="button" class="btn_popup" id=""><span>변경하기</span></button>
+														</dd>
+													</div>
+												</dl>
+											</div>
+											<!-- 해외배송상품일 경우 노출 -->
+											<div class="area_overseas">
+												<dl>
+													<div>
+														<dt>개인통관고유부호</dt>
+														<dd>
+															<div class="form_field">
+																<div>
+																	<input type="radio" name="rdi-overseas" id="rdi-overs1" value="" checked="">
+																	<label for="rdi-overs1"><span>받는사람 개인통관고유부호</span></label>
+																	<div class="info_box pb10">
+																		<div class="input_wrap">
+																			<input type="text" class="form_control" maxlength="13" placeholder="P로 시작하는 13자리">
+																			<button type="button" class="btn btn_dark"><span>적용</span></button>
+																		</div>
+																	</div>
+																</div>
+																<div class="mt20">
+																	<input type="radio" name="rdi-overseas" id="rdi-overs2" value="">
+																	<label for="rdi-overs2"><span>입력 안 함</span></label>
+																	<div class="info_box" style="display:none;">
+																		<p>
+																			개인통관고유부호를 입력하지 않아도 관세사무소에서 개인정보 확인을 위해 별도 연락을 드릴 예정입니다.
+																		</p>
+																	</div>
+																</div>
+															</div>
+														</dd>
+													</div>
+												</dl>
+												<div class="com_info_txt">
+													<p class="tit">해외 배송 안내</p>
+													<ul>
+														<li>물품가액이 $150초과할 경우 관/부과세가 발생 할 수 있습니다.</li>
+														<li>물품 종류와 해외공급자 관계없이 같은 날 입항하게 되면 합산과세 대상이 됩니다.</li>
+													</ul>
+												</div>
+												<div class="form_field mt30">
+													<div>
+														<input id="chk-overs-agr" type="checkbox" checked="">
+														<label for="chk-overs-agr"><span>위 정보는 원활한 통관을 위해 수집 및 판매자에게 제공하며,계속 사용하도록 안전하게 STYLE24에서 저장 &#47; 관리 합니다.&nbsp;&nbsp;<em class="c_primary bold f_size12">(필수)</em></span></label>
+													</div>
+												</div>
+											</div>
+											<!-- //해외배송상품일 경우 노출 -->
+											<!-- 주문제작상품일 경우 노출 -->
+											<div class="area_customitem">
+												<div class="txt_box mb30">
+													<p class="c_primary normal">현재 주문제작 상품을 포함하여 주문을 진행중 입니다.</p>
+												</div>
+												<div class="com_info_txt">
+													<p class="tit">주문 제작 상품 안내</p>
+													<ul>
+														<li>주문 제작 상품은 주문 후 제작이 진행되며, 제작 완료 후 배송이 시작됩니다.</li>
+														<li>주문 제작 상품의 특성상 주문 완료 후 취소/교환이 불가능합니다. (상품 하자에 한해 가능)</li>
+													</ul>
+												</div>
+												<div class="form_field mt30">
+													<div>
+														<input id="chk-custom-agr1" type="checkbox" checked="">
+														<label for="chk-custom-agr1"><span>주문 제작 상품에 대한 안내를 확인하였으며 배송에 동의합니다.&nbsp;&nbsp;<em class="c_primary bold f_size12">(필수)</em></span></label>
+													</div>
+												</div>
+											</div>
+											<!-- //주문제작상품일 경우 노출 -->
+										</div>
+										<!-- //배송지정보 -->
+									</li>
+									<li>
+										<!-- 사은품선택 -->
+										<div class="fold_head">
+											<a href="javascript:void(0)">
+												<div>
+													<div class="fold_tit">
+														<span>사은품 선택</span>
+													</div>
+													<div class="data">
+														<span>사은품 총 <em class="c_primary normal">2</em>개 선택</span>
+														<span><em class="c_primary normal">0</em>P 차감</span>
+													</div>
+												</div>
+											</a>
+										</div>
+										<div class="fold_cont" style="display: none;">
+											<div class="area_default">
+												<p class="txt">사은품선택1 > TBJ 남성 제기장 스웨이드 트러커 자켓 에서 주는 사은품</p>
+												<div class="form_field">
+													<div class="gift">
+														<input type="checkbox" name="chk-gift" id="chk-gift1" class="chk_img" value="">
+														<label for="chk-gift1">
+															<span class="thumb"><img src="http://codepartners.co.kr/project/style24/pc/ux/images/thumb/tmp_gift1.jpg" width="" alt=""></span>
+															<span class="name">유니 NBA 팀로고 양말 (N215AO225P)</span>
+															<span class="deduct">무료사은품</span>
+														</label>
+													</div>
+													<div class="gift">
+														<input type="checkbox" name="chk-gift" id="chk-gift2" class="chk_img" value="">
+														<label for="chk-gift2">
+															<span class="thumb"><img src="http://codepartners.co.kr/project/style24/pc/ux/images/thumb/tmp_gift1.jpg" width="" alt=""></span>
+															<span class="name">사은품이름</span>
+															<span class="deduct">-4,000P</span>
+														</label>
+													</div>
+													<div class="gift">
+														<input type="checkbox" name="chk-gift" id="chk-gift3" class="chk_img" value="">
+														<label for="chk-gift3">
+															<span class="thumb"></span>
+															<span class="name">사은품 수령안함</span>
+															<span class="deduct">수령거부</span>
+														</label>
+													</div>
+												</div>
+												<div class="form_field">
+													<div class="gift_agree">
+														<p>
+															<input id="chk-gift_agree" type="checkbox"><label for="chk-gift_agree"><span>동의합니다</span></label>
+														</p>
+														<p class="mt20">
+															사은품 지급에 대한 내용을 확인하였으며, 이에 동의합니다.
+															<button type="button" class="btn_popup" id=""><span>안내 보기</span></button>
+														</p>
+													</div>
+												</div>
+											</div>
+										</div>
+										<!-- //사은품선택 -->
+									</li>
+									<li>
+										<!-- 할인/혜택 사용 -->
+										<div class="fold_head">
+											<a href="javascript:void(0)">
+												<div>
+													<div class="fold_tit">
+														<span>할인/혜택 사용</span>
+													</div>
+													<div class="data">
+														<div class="form_field">
+															<!--<input id="chk-maxdisc" type="checkbox" checked="">-->
+															<label for="chk-maxdisc"><span>최대 할인혜택을 바로 적용하세요 (<em class="c_primary normal">-3,000원</em>)</span></label>
+														</div>
+													</div>
+												</div>
+											</a>
+										</div>
+										<div class="fold_cont" style="display: none;">
+											<div class="area_default">
+												<div class="maxdisc">
+													<div class="form_field">
+														<input id="chk-maxdisc" type="checkbox">
+														<label for="chk-maxdisc">
+															<span>최대 할인혜택을 바로 적용하세요!</span>
+														</label>
+													</div>
+												</div>
+												<dl>
+													<div>
+														<dt>할인코드</dt>
+														<dd>
+															<div class="input_wrap">
+																<input type="text" class="form_control" maxlength="13" placeholder="할인코드를 입력해주세요.">
+																<button type="submit" class="btn btn_dark">적용</button>
+															</div>
+														</dd>
+													</div>
+													<div>
+														<dt>할인쿠폰</dt>
+														<dd><a href="" class="btn_coupon_toggle">할인쿠폰 <span class="c_primary">3장</span> 적용 <i class="ico ico_ft_arrow_b"></i></a></dd>
+													</div>
+												</dl>
+												<div class="coupon_list">
+													<ul>
+														<li>
+															<div class="coupon">
+																<div class="item_gd">
+																	<figure>
+																		<span class="thumb"><img src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
+																		<figcaption>
+																			<div class="brand">CURLYSUE 컬리수</div>
+																			<div class="name">[★2020 겨울신상★] 리버시블 경량점퍼 CPW0XQJM51 [겨울] 리버시블 경량점퍼 CPW0XQJM51 [겨울]</div>
+																			<div class="price">
+																				<span class="selling_price">1,000,000</span>
+																			</div>
+																		</figcaption>
+																	</figure>
+																</div>
+																<div class="form_field">
+																	<select id="" class="select_hidden">
+																		<option value="">구매금액 100,000원 이상시 10% 할인 쿠폰</option>
+																		<option value="">구매금액 100,000원 이상시 10% 할인 쿠폰</option>
+																		<option value="">구매금액 100,000원 이상시 10% 할인 쿠폰</option>
+																		<option value="">구매금액 100,000원 이상시 10% 할인 쿠폰</option>
+																		<option value="">구매금액 100,000원 이상시 10% 할인 쿠폰</option>
+																	</select>
+																</div>
+																<button type="button" class="btn_del_coupon" id=""><span>쿠폰적용해제</span></button>
+															</div>
+														</li>
+														<li>
+															<div class="coupon">
+																<div class="form_field">
+																	<label for="">장바구니 할인쿠폰</label>
+																	<select id="" class="select_hidden">
+																		<option value="">총 구매금액 10만원 이상 시 10,000원 할인 (5,000원 할인)</option>
+																		<option value="">총 구매금액 10만원 이상 시 10,000원 할인 (5,000원 할인)</option>
+																		<option value="">총 구매금액 10만원 이상 시 10,000원 할인 (5,000원 할인)</option>
+																		<option value="">총 구매금액 10만원 이상 시 10,000원 할인 (5,000원 할인)</option>
+																		<option value="">총 구매금액 10만원 이상 시 10,000원 할인 (5,000원 할인)</option>
+																	</select>
+																</div>
+																<button type="button" class="btn_del_coupon" id=""><span>쿠폰적용해제</span></button>
+															</div>
+														</li>
+														<li>
+															<div class="coupon">
+																<div class="form_field">
+																	<label for="">배송비 할인쿠폰</label>
+																	<select id="" class="select_hidden">
+																		<option value="">배송비 할인쿠폰 (최대 5,000원)</option>
+																		<option value="">배송비 할인쿠폰 (최대 5,000원)</option>
+																		<option value="">배송비 할인쿠폰 (최대 5,000원)</option>
+																		<option value="">배송비 할인쿠폰 (최대 5,000원)</option>
+																	</select>
+																</div>
+																<button type="button" class="btn_del_coupon" id=""><span>쿠폰적용해제</span></button>
+															</div>
+														</li>
+													</ul>
+												</div>
+											</div>
+											<div class="area_point">
+												<dl>
+													<div>
+														<dt>할인코드</dt>
+														<dd>
+															<div class="form_field">
+																<div>
+																	<input type="radio" name="rdi-codeuse" id="rdi-codeuse1" value="">
+																	<label for="rdi-codeuse1"><span>사용 안함</span></label>
+																</div>
+																<div>
+																	<input type="radio" name="rdi-codeuse" id="rdi-codeuse2" value="">
+																	<label for="rdi-codeuse2"><span>사용함</span></label>
+																	<span>사용가능 포인트:<em>1,500</em>P</span>
+																</div>
+															</div>
+														</dd>
+													</div>
+												</dl>
+											</div>
+
+											<div class="point_code">
+												<div class="radio_check">
+													<div class="ui_col_3">
+														<p>할인코드</p>
+													</div>
+													<div class="ui_col_9">
+														<div class="form_field">
+															<input type="radio" name="radio" id="rdi-4" value="4"><label for="rdi-4"> <span>사용 안함</span> </label>
+														</div>
+														<div class="form_field">
+															<input type="radio" name="radio" id="rdi-5" value="5" checked=""><label for="rdi-5"> <span>사용함</span> <p>사용 가능 포인트 : <span>1,500</span>P</p></label>
+														</div>
+													</div>
+												</div>
+												<div class="form_field">
+													<label class="ui_col_3 input_label">스타일 포인트</label>
+													<div class="ui_col_9">
+														<div class="input_wrap">
+															<input type="text" class="form_control" maxlength="13" placeholder="사용할 포인트를 입력해주세요.">
+															<button type="submit" class="btn btn_dark">적용</button>
+														</div>
+														<div class="save_point">
+															<p>보유 : <span>25,000</span>P</p>
+														</div>
+													</div>
+												</div>
+												<div class="form_field">
+													<label class="ui_col_3 input_label">상품권</label>
+													<div class="ui_col_9">
+														<div class="input_wrap">
+															<input type="text" class="form_control" maxlength="13" placeholder="사용할 포인트를 입력해주세요.">
+															<button type="submit" class="btn btn_dark">적용</button>
+														</div>
+														<div class="save_point">
+															<p>보유 : <span>25,000</span>P</p>
+														</div>
+													</div>
+												</div>
+											</div>
+
+										</div>
+										<!-- //할인/혜택 사용 -->
+									</li>
+									<li>
+										<!-- 결제수단 선택 -->
+										<div class="fold_head">
+											<a href="javascript:void(0)">
+												<div>
+													<div class="fold_tit">
+														<span>결제수단 선택</span>
+													</div>
+												</div>
+											</a>
+										</div>
+										<div class="fold_cont" style="display: none;">
+											<div class="paymethod_list">
+												<div class="paymethod on">
+													<div class="paymethod_wrap">
+														<input type="radio" name="radio_card" id="rdi-card-1" value="1" checked>
+														<label for="rdi-card-1" data="0">
+															STYLE24 간편결제
+														</label>
+														<div class="paymethod_body">
+															<div class="add_card">
+																<div class="plus_card">
+																	<div class="cross_wrap">
+																		<button>
+																			<div class="cross"></div>
+																		</button>
+																	</div>
+																	<div class="enrollment">
+																		<p>결제수단 등록</p>
+																	</div>
+																</div>
+															</div>
+															<div class="paymethod_text">
+																<p>&#183; 결제수단 등록 한번으로 간편하게 결제하실 수 있습니다.</p>
+																<p>&#183; 국내 8개 카드에 대해 이용 가능합니다. (법인카드,기프트카드,해외카드 제외)</p>
+																<p>&#183; 일반 신용카드의 할인혜택은 적용되지 않습니다.</p>
+															</div>
+														</div>
+													</div>
+												</div>
+												<div class="paymethod">
+													<div class="paymethod_wrap">
+														<input type="radio" name="radio_card" id="rdi-card-2" value="2">
+														<label for="rdi-card-2"  data="1">
+															일반 결제
+														</label>
+														<div class="paymethod_body">
+															<div class="form_field">
+																<div>
+																	<input type="radio" name="payMeansClass" id="rdi-8" value="8"><label for="rdi-8"> <span>신용카드</span> </label>
+																</div>
+																<div>
+																	<input type="radio" name="payMeansClass" id="rdi-9" value="9"><label for="rdi-9"> <span>실시간계좌이체</span> </label>
+																</div>
+																<div>
+																	<input type="radio" name="payMeansClass" id="rdi-10" value="10"><label for="rdi-10"> <span>무통장입금</span> </label>
+																</div>
+																<div>
+																	<input type="radio" name="payMeansClass" id="rdi-11" value="11"><label for="rdi-11"> <span>휴대폰 결제</span> </label>
+																</div>
+																<div>
+																	<input type="radio" name="payMeansClass" id="rdi-12" value="12"><label for="rdi-12"> <span>카카오페이</span> </label>
+																</div>
+																<div>
+																	<input type="radio" name="payMeansClass" id="rdi-13" value="13"><label for="rdi-13"> <span>네이버엔페이</span> </label>
+																</div>
+																<div>
+																	<input type="radio" name="payMeansClass" id="rdi-14" value="14"><label for="rdi-14"> <span>페이코</span> </label>
+																</div>
+															</div>
+														</div>
+													</div>
+												</div>
+											</div>
+											<!-- case1,2 간편결제,일반결제 결과-->
+											<div class="payment type01 active">
+												<div class="form_field">
+													<div>
+														<input id="chk-3" type="checkbox"><label for="chk-3"> <span>선택한 결제수단으로 향후 결제 이용에 동의합니다. <a href="#none">(선택)</a></span> </label>
+													</div>
+												</div>
+												<div class="privacy_consent">
+													<p>개인정보 제공에 대한 동의</p>
+													<span>개인정보를 제공받는 자 : 업체명,업체명,업체명</span>
+													<span>개인정보를 제공받는 자의 개인정보 이용 목적 : 주문상품의 배송,고객상당 및 불만처리</span>
+													<span>제공하는 개인정보의 항목:성명,주소,연락처</span>
+													<span>개인정보 제공받는 자의 개인정보 보유 및 이용기간 : 이용목적 달성 시 까지</span>
+													<div class="form_field">
+														<div>
+															<input id="chk-4" type="checkbox"><label for="chk-4"> <span>동의합니다.</span> </label>
+														</div>
+													</div>
+												</div>
+												<div class="form_field">
+													<div>
+														<input id="chk-5" type="checkbox"><label for="chk-5"> <span>주문하실 상품,가격,배송정보,할인정보 등을 확인하였으며,구매에 동의하시겠습니까? (전자상거래법 제8조 2항)</span> </label>
+													</div>
+												</div>
+												<div class="ui_row">
+													<div class="ui_col_12">
+														<button class="btn btn_dark btn_block"><span>123,456,789</span>원 결제하기</button>
+													</div>
+												</div>
+											</div>
+											<div class="payment type02">
+												<div class="form_field">
+													<div>
+														<input id="chk-3" type="checkbox"><label for="chk-3"> <span>소비자 피해 보상보험 신청 <a href="#none">(선택)</a></span> <button class="faq">FAQ확인</button> </label>
+													</div>
+													<div>
+														<p>&#145;전자상거래 등에서의 소비자보호에 관한 법률&#146;에 따라 현금 결제 시 서울보증보험(주)가 제공하는 소비자 피해보상보험을<br>신청할 수 있도록 해드리고 있습니다. (2013.11.28부터 시행)</p>
+													</div>
+												</div>
+												<div class="privacy_consent">
+													<p>개인정보 제공에 대한 동의</p>
+													<span>개인정보를 제공받는 자 : 업체명,업체명,업체명</span>
+													<span>개인정보를 제공받는 자의 개인정보 이용 목적 : 주문상품의 배송,고객상당 및 불만처리</span>
+													<span>제공하는 개인정보의 항목:성명,주소,연락처</span>
+													<span>개인정보 제공받는 자의 개인정보 보유 및 이용기간 : 이용목적 달성 시 까지</span>
+													<div class="form_field">
+														<div>
+															<input id="chk-4" type="checkbox"><label for="chk-4"> <span>동의합니다.</span> </label>
+														</div>
+													</div>
+												</div>
+												<div class="form_field">
+													<div>
+														<input id="chk-5" type="checkbox"><label for="chk-5"> <span>주문하실 상품,가격,배송정보,할인정보 등을 확인하였으며,구매에 동의하시겠습니까? (전자상거래법 제8조 2항)</span> </label>
+													</div>
+												</div>
+												<div class="ui_row">
+													<div class="ui_col_12">
+														<button class="btn btn_dark btn_block"><span>123,456,789</span>원 결제하기</button>
+													</div>
+												</div>
+											</div>
+											<!-- //case1,2 간편결제,일반결제 결과-->
+										</div>
+									</li>
+								</ul>
+							</div>
+						</div>
+					</section>
+
+					<section class="od_side fr">
+						<div class="area_order">
+							<div class="tit_box">
+								<h3 class="subH2">주문내역</h3>
+								<span>
+									<em class="c_primary bold" th:text="${delvTotCnt}"></em> 개의 상품
+								</span>
+							</div>
+							<div class="od_item_box">
+								<!-- 총알배송, 일반배송 -->
+								<div class="part_dlvr" id="wmsDelvArea" style="display:none;">
+									<h4 class="subH3 mb20" id="shotDelvTitle">STYLE24 총알배송<span>오늘 자정까지 도착</span></h4>
+									<h4 class="subH3 mb20" id="wmsDelvTitle">STYLE24 일반배송</h4>
+									<div class="gd_list">
+
+										<th:block th:each="goods, status : ${wmsCartList}">
+											<div class="item_gd">
+												<figure>
+													<span class="thumb"><img src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
+													<figcaption>
+														<div class="brand" th:text="${goods.brandEnm}"></div>
+														<div class="name" th:text="${goods.goodsNm}"></div>
+														<div class="option" th:each="opt, index : ${goods.itemNmArr}">
+															<span class="option">옵션:<em th:text="${goods.optCdArr[index.index]}"></em></span>
+														</div>
+														<br/>
+														<span>수량:<em th:text="${goods.goodsQty}"></em>개</span>
+														<div class="price">
+															<span class="selling_price" th:text="|${#numbers.formatInteger(goods.currPrice, 1, 'COMMA')} 원|"></span>
+														</div>
+													</figcaption>
+												</figure>
+											</div>
+										</th:block>
+										
+										
+										
+									</div>
+									
+									
+								</div>
+								<!-- //총알배송, 일반배송 -->
+
+								<!-- 업체직배송 -->
+								<div class="part_dlvr" id="delvDelvArea" style="display:none;">
+									<h4 class="subH3 mb20">업체직배송</h4>
+									<div class="gd_list">
+										<div class="item_gd">
+											<th:block th:each="goods, status : ${delvCartList}">
+												<div class="item_gd">
+													<figure>
+														<span class="thumb"><img src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
+														<figcaption>
+															<div class="brand" th:text="${goods.brandEnm}"></div>
+															<div class="name" th:text="${goods.goodsNm}"></div>
+															<div class="option">
+																<span th:text="${goods.optCd}"></span>
+																<span>수량:<em th:text="${goods.goodsQty}"></em>개</span>
+															</div>
+															<div class="price">
+																<span class="selling_price" th:text="${goods.currPrice}"></span>
+															</div>
+														</figcaption>
+													</figure>
+												</div>
+											</th:block>
+										</div>
+									</div>
+								</div>
+								<!-- //업체직배송 -->
+
+								<!-- 예약배송 -->
+								<div class="part_dlvr" id="resDelvArea" style="display:none;">
+									<h4 class="subH3 mb20">예약배송</h4>
+									<div class="gd_list">
+										<div class="item_gd">
+											<th:block th:each="goods, status : ${resCartList}">
+												<div class="item_gd">
+													<figure>
+														<span class="thumb"><img src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
+														<figcaption>
+															<div class="brand" th:text="${goods.brandEnm}"></div>
+															<div class="name" th:text="${goods.goodsNm}"></div>
+															<div class="option">
+																<span th:text="${goods.optCd}"></span>
+																<span>수량:<em th:text="${goods.goodsQty}"></em>개</span>
+															</div>
+															<div class="price">
+																<span class="selling_price" th:text="${goods.currPrice}"></span>
+															</div>
+														</figcaption>
+													</figure>
+												</div>
+											</th:block>
+										</div>
+									</div>
+								</div>
+								<!-- //예약배송 -->
+							</div>
+
+							<div class="od_amount_box">
+								<dl>
+									<div>
+										<dt>상품금액</dt>
+										<dd>1,590,000 원</dd>
+									</div>
+									<div>
+										<dt>배송비</dt>
+										<dd>0원</dd>
+									</div>
+									<div>
+										<dt>할인금액</dt>
+										<dd class="c_primary">-1,746,500원</dd>
+									</div>
+									<div>
+										<dt>다다익선할인금액</dt>
+										<dd class="c_primary">25,000원</dd>
+									</div>
+									<div>
+										<dt>쿠폰할인금액</dt>
+										<dd class="c_primary">3,000원</dd>
+									</div>
+									<div>
+										<dt>선포인트 사용</dt>
+										<dd class="c_primary">-1,500P</dd>
+									</div>
+									<div>
+										<dt>포인트 사용</dt>
+										<dd class="c_primary">-5,500P</dd>
+									</div>
+									<div>
+										<dt>상품권 사용</dt>
+										<dd class="c_primary">-50,000원</dd>
+									</div>
+								</dl>
+							</div>
+
+
+							<div class="totalprice_box">
+								<dl>
+									<dt>총 결제 예정 금액</dt>
+									<dd data-weight="price" data-font="lato"><span>3,546,200</span>원</dd>
+								</dl>
+								<p class="info_point">
+									스타일 포인트 <span class="c_primary">3,500 P</span> 적립예정
+								</p>
+							</div>
+
+
+						</div>
+					</section>
+					<div class="clear"></div>
+					<!-- // CONT-BODY -->
 				</div>
 			</div>
 		</div>
 	</div>
-	<!-- // container -->	
+	<!-- // container -->
+
+	<script th:inline="javascript">
+		// 변수선언
+		var wmsCnt 			= [[${wmsCnt}]];
+		var resCnt 			= [[${resCnt}]];
+		var delvCnt 		= [[${delvCnt}]];
+		var shotDelvYn		= [[${shotDelvYn}]];
+
+		// 총알배송가능 지역, 총알배송 가능 시간 체크
+		var fnGetDailyDeliveryCheck = function () {
+			// TODO
+			var jsonObj 	= {"zipNo" : 12345};
+			var jsonData 	= JSON.stringify(jsonObj);
+
+			gagajf.ajaxJsonSubmit(
+				"/order/getDailyDeliveryCheck"
+				, jsonData
+				, function (result) {
+					// 자사몰 일반배송
+					$("#shotDelv").text(0);
+					$("#wmsDelv").text(wmsCnt);
+					$("#wmsDelvTitle").css("display", "block");
+					$("#shotDelvTitle").css("display", "none");
+
+					// 자사몰 총알배송
+					if (shotDelvYn == "Y") {
+						if (parseInt(result) > 0) {
+							$("#shotDelv").text(wmsCnt);
+							$("#wmsDelv").text(0);
+							
+							$("#wmsDelvTitle").css("display", "none");
+							$("#shotDelvTitle").css("display", "block");
+						}
+					}
+				}
+			)
+		}
+	</script>
+
+	<script type="text/javascript">
+		// 컨텐츠 호출
+		$(document).ready( function() {
+			// 1. 총알배송가능 지역, 총알배송 가능 시간 체크
+			fnGetDailyDeliveryCheck();
+			
+			// 2. 배송목록 화면 노출, 비노출 처리
+			// 2.1 자사일반배송노출
+			if (wmsCnt > 0) {
+				$("#wmsDelvArea").css("display", "block");
+			}
+			
+			// 2.2 입점업체일반배송노출
+			if (delvCnt > 0) {
+				$("#delvDelvArea").css("display", "block");
+			}
+			
+			// 2.3 자사예약배송노출
+			if (resCnt > 0) {
+				$("#resDelvArea").css("display", "block");
+			}
+		});
+
+		$(function(){
+			$('.od .od_cont').on('click','.area_overseas input',function(e){
+				//해외배송 입력
+				e.preventDefault();
+				$(this).parent('div').find('.info_box').show();
+				$(this).parent('div').siblings('div').find('.info_box').hide();
+			}).on('click','.btn_coupon_toggle',function(e){
+				//할인쿠폰 확인
+				e.preventDefault();
+				$('.coupon_list').toggle();
+				$(this).toggleClass('on');
+			});
+		});
+	</script>
 </th:block>
-	
-<script type="text/javascript">
- // 컨텐츠 호출
-    $(document).ready( function() {
-    	
-    });
- 
-    $(function(){
-        $('.od .od_cont').on('click','.area_overseas input',function(e){
-            //해외배송 입력
-            e.preventDefault();
-            $(this).parent('div').find('.info_box').show();
-            $(this).parent('div').siblings('div').find('.info_box').hide();
-        }).on('click','.btn_coupon_toggle',function(e){
-            //할인쿠폰 확인
-            e.preventDefault();
-            $('.coupon_list').toggle();
-            $(this).toggleClass('on');
-        });
-    });
-</script>
+
+
+
+
 
 </body>
-</html>
+</html>

+ 193 - 0
src/main/webapp/WEB-INF/views/web/order/OrderNoMemberWeb.html

@@ -0,0 +1,193 @@
+<!DOCTYPE html>
+<html lang="ko"
+	  xmlns:th="http://www.thymeleaf.org"
+	  xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+	  layout:decorator="web/common/layout/DefaultLayoutWeb">
+<!--
+ *******************************************************************************
+ * @source  : OrderNoMemberWeb.html
+ * @desc    : 비회원 주문/결제 Page
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2020 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.02.01   jsh77b     최초 작성
+ *******************************************************************************
+ -->
+<body>
+
+<th:block layout:fragment="content">
+
+	<div class="wrap">
+		<div class="content nonMBorder">
+			<!-- 페이지특정 클래스 = nonMBorder -->
+			<div class="cont_head">
+				<h2 class="t_c mb60">비회원 주문하기</h2>
+			</div>
+			<div class="cont_body">
+				<form id="orderForm" name="orderForm" class="form_wrap form_col_c form_full" action="#" th:action="@{'/order/form'}" th:method="post">
+					<input type="hidden" name="shotDelvYn" th:value="${order.shotDelvYn}" /><!-- 장바구니화면 총알배송여부 -->
+					<!-- 장바구니화면 시퀀스 배열 등록 -->
+					<th:block th:each="cartSq , index : ${order.cartSqArr}">
+						<input type="hidden" name="cartSqArr" th:value="${cartSq}" />
+					</th:block>
+					
+					<div class="form_head">
+						<p>
+							비회원 주문을 위한 주문자 정보 입력 및 개인정보 수집/이용 동의에<br>체크하신 후 주문을 완료하실 수
+							있습니다.
+						</p>
+					</div>
+					
+					<div class="form_field">
+						<label class="input_label sr-only">이름(주문자명)</label>
+						<div class="ui_col_12">
+							<div class="input_wrap">
+								<input type="text" name="custNm" id="custNm" placeholder="이름(주문자명)">
+							</div>
+						</div>
+					</div>
+					<div class="form_field">
+						<label class="input_label sr-only">휴대폰 번호</label>
+						<div class="ui_col_12">
+							<div class="input_wrap">
+								<input type="text" name="cellPhnno" id="cellPhnno" placeholder="휴대폰 번호">
+							</div>
+						</div>
+					</div>
+					<div class="form_field">
+						<label class="input_label sr-only">이메일주소</label>
+						<div class="ui_col_12">
+							<div class="input_wrap">
+								<input type="text" name="email" id="email" placeholder="이메일주소">
+							</div>
+						</div>
+					</div>
+					<div class="form_field">
+						<label class="input_label sr-only">배송주소 우편번호</label>
+						<div class="ui_col_12">
+							<div class="input_wrap" style="display: flex;">
+								<input type="text" name="recipZipcode" id="recipZipcode" placeholder="우편번호">
+								<button type="submit" class="btn btn_default">우편번호 찾기</button>
+							</div>
+						</div>
+					</div>
+					<div class="form_field">
+						<label class="input_label sr-only">배송주소 기본주소</label>
+						<div class="ui_col_12">
+							<input type="text" name="recipBaseAddr" id="recipBaseAddr" placeholder="기본주소">
+						</div>
+					</div>
+					<div class="form_field">
+						<label class="input_label sr-only">배송주소 상세주소</label>
+						<div class="ui_col_12">
+							<input type="text" name="recipDtlAddr" id="recipDtlAddr" placeholder="상세주소">
+						</div>
+					</div>
+					
+					<!-- 주소 출력 
+					<div class="help_block">
+						<p><span>도로명</span>서울특별시 서초구 서운로 57번길</p>
+						<p><span>지번</span>서울특별시 서초구 서포동 60-28</p>
+					</div>
+					-->
+					
+					<!-- //주소 출력 -->
+					<div class="form_field">
+						<div>
+							<input id="chk-2" type="checkbox"><label for="chk-2">
+								<p>
+									비회원 개인정보 수집&#47;이용 동의 <span>(필수)</span>
+								</p>
+							</label>
+						</div>
+					</div>
+					
+					<div class="form_field txt_area">
+						<div
+							style="overflow: auto; max-height: 176px; border: 1px solid #ddd;">
+							<strong>제1조(목적)</strong>
+							<p>이 약관은 (유)내고향시푸드(전자거래 사업자)이 운영하는 홈페이지(이하 "쇼핑몰"이라 한다)에서
+								제공하는 인터넷 관련 서비스(이하 "서비스"라 한다)를 이용함에 있어 (유)내고향시푸드와 이용자의 권리·의무 및
+								책임사항을 규정함을 목적으로 합니다. ※ 「PC통신 등을 이용하는 전자거래에 대해서도 그 성질에 반하지 않는 한
+								이 약관을 준용합니다」 제2조(정의) ① "쇼핑몰" 이란 사업자가 재화 또는 용역을 이용자에게 제공하기 위하여
+								컴퓨터 등 정보통신설비를 이용하여 재화 또는 용역을 거래할 수 있도록 설정한 가상의 영업장을 말하며, 아울러
+								쇼핑몰을 운영하는 사업자의 의미로도 사용합니다. ② "이용자"란 "쇼핑몰"에 접속하여 이 약관에 따라 "쇼핑몰"이
+								제공하는 서비스를 받는 회원 및 비회원을 말합니다. ③ "회원"이라 함은 "쇼핑몰"에 개인정보를 제공하여
+								회원등록을 한 자로서, "쇼핑몰"의 정보를 지속적으로 제공받으며, "쇼핑몰"이 제공하는 서비스를 계속적으로 이용할
+								수 있는 자를 말합니다. ④ "비회원"이라 함은 회원에 가입하지 않고 "쇼핑몰"이 제공하는 서비스를 이용하는 자를
+								말합니다. 제3조 (약관의 명시와 개정) ① "쇼핑몰"은 이 약관의 내용과 상호, 영업소 소재지, 대표자의 성명,
+								사업자등록번호, 연락처(전화, 팩스, 전자우편 주소 등) 등을 이용자가 알 수 있도록 사이트의 초기
+								서비스화면(전면)에 게시합니다. ② "쇼핑몰"은 약관의 규제 등에 관한 법률, 전자거래기본법, 전자서명법,
+								정보통신망 이용촉진 등에 관한 법률, 방문판매 등에 관한법률, 소비자보호법 등 관련법을 위배하지 않는 범위에서 이
+								약관을 개정할 수 있습니다. ③ "쇼핑몰"이 약관을 개정할 경우에는 적용일자 및 개정사유를 명시하여 현행약관과
+								함께 홈페이지의 초기화면에 그 적용일자 7일 이전부터 적용일자 전일까지 공지합니다. ④ "쇼핑몰"이 약관을 개정할
+								경우에는 그 개정약관은 그 적용일자 이후에 체결되는 계약에만 적용되고 그 이전에 이미 체결된 계약에 대해서는 개정
+								전의 약관조항이 그대로 적용됩니다. 다만 이미 계약을 체결한 이용자가 개정약관 조항의 적용을 받기를 원하는 뜻을
+								제3항에 의한 개정약관의 공지기간 내에 "쇼핑몰"에 송신하여 "쇼핑몰"의 동의를 받은 경우에는 개정약관 조항이
+								적용됩니다. ⑤ 이 약관에서 정하지 아니한 사항과 이 약관의 해석에 관하여는 정부가 제정한 전자거래소비자보호지침
+								및 관계법령 또는 상관례에 따릅니다. 제4조(서비스의 제공 및 변경) ① "쇼핑몰"은 다음과 같은 업무를
+								수행합니다. 1. 재화 또는 용역에 대한 정보 제공 및 구매계약의 체결 2. 구매계약이 체결된 재화 또는 용역의
+								배송 3. 기타 "쇼핑몰"이 정하는 업무 ② "쇼핑몰"은 재화의 품절 또는 기술적 사양의 변경 등의 경우에는 장차
+								체결되는 계약에 의해 제공할 재화·용역의 내용을 변경할 수 있습니다. 이 경우에는 변경된 재화·용역의 내용 및
+								제공일자를 명시하여 현재의 재화·용역의 내용을 게시한 곳에 그 제공일자 이전 7일부터 공지합니다. ③ "쇼핑몰"이
+								제공하기로 이용자와 계약을 체결한 서비스의 내용을 재화의 품절 또는 기술적 사양의 변경 등의 사유로 변경할
+								경우에는 "쇼핑몰"은 이로 인하여 이용자가 입은 손해를 배상합니다. 단, "쇼핑몰"에 고의 또는 과실이 없는
+								경우에는 그러하지 아니합니다.</p>
+						</div>
+					</div>
+					<div class="form_field">
+						<div class="ui_row btn_group_md">
+							<div class="ui_col_6">
+								<button class="btn btn_default btn_block" id="btn_cancel">
+									<span>취소</span>
+								</button>
+							</div>
+							<div class="ui_col_6">
+								<button class="btn btn_dark btn_block" id="btn_order">
+									<span>주문하기</span>
+								</button>
+							</div>
+						</div>
+					</div>
+					<div class="form_info">
+						<p>STYLE24에 회원가입을 하시면 더 많은 혜택을 받으실 수 있습니다!</p>
+						<a href="#none" id="btn_join">회원가입</a>
+					</div>
+				</form>
+			</div>
+		</div>
+	</div>
+
+	<script th:inline="javascript">
+		
+	</script>
+
+	<script type="text/javascript">
+		// 컨텐츠 호출
+		$(document).ready( function() {
+			
+		});
+		
+		// 취소버튼
+		$("btn_cancel").on("click", function() {
+			
+		});
+		
+		// 주문하기버튼
+		$("btn_order").on("click", function() {
+			// TODO 유효성 체크 추가
+			$("#orderForm").submit();
+		});
+		
+		// 회원가입버튼
+		$("btn_join_member").on("click", function() {
+			
+		});
+	</script>
+</th:block>
+
+</body>
+</html>

+ 2 - 2
src/main/webapp/ux/pc/css/common.css

@@ -1,8 +1,8 @@
 @charset "utf-8";
 
 @import "reset.css";
-@import "font.css?v=20210204";
-@import "layout.css?v=20210204";
+@import "font.css";
+@import "layout.css";
 
 
 /* h1 ~ h6  */