Merge branch 'develop' into jsshin

src/main/java/com/style24/front/biz/dao/TsfGoodsDao.java

@@ -135,7 +135,7 @@ public interface TsfGoodsDao {
 	 * @date 2021. 3. 18
 	 */
 	Collection<GoodsStock> getGoodsOptionList(Goods goods);
-	
+
 	/**
 	 * 상품 고시정보
 	 *
@@ -215,7 +215,7 @@ public interface TsfGoodsDao {
 	 * @since 2021. 3. 7
 	 */
 	GoodsSafeNo getGoodsSafeNo(Goods goods);
-	
+
 	/**
 	 * 상품  배송안내정보
 	 *
@@ -225,7 +225,7 @@ public interface TsfGoodsDao {
 	 * @since 2021. 03. 08
 	 */
 	Delivery getGoodsDeliveryInfo(String goodsCd);
-	
+
 	/**
 	 * 상품 다다익선 목록
 	 *
@@ -235,7 +235,7 @@ public interface TsfGoodsDao {
 	 * @date 2021. 3. 8
 	 */
 	Collection<Goods> getTmtbGoodsList(Goods goods);
-	
+
 	/**
 	 * 재입고 알림 미 알림 조회
 	 *
@@ -245,7 +245,7 @@ public interface TsfGoodsDao {
 	 * @date 2021. 3. 10
 	 */
 	ReinboundInform getNotReinboundInform(ReinboundInform reinboundInform);
-	
+
 	/**
 	 * 재입고알림 생성
 	 *
@@ -255,7 +255,7 @@ public interface TsfGoodsDao {
 	 * @date 2021. 3. 10
 	 */
 	void createReinboundInform(ReinboundInform reinboundInform);
-	
+
 	/**
 	 * 재입고알림 수정
 	 *
@@ -265,7 +265,7 @@ public interface TsfGoodsDao {
 	 * @date 2021. 3. 10
 	 */
 	void updateReinboundInform(ReinboundInform reinboundInform);
-	
+
 	/**
 	 * 실측사이즈 조회
 	 *
@@ -275,7 +275,7 @@ public interface TsfGoodsDao {
 	 * @date 2021. 3. 10
 	 */
 	Collection<Measurement> getMeasurementList(Goods goods);
-	
+
 	/**
 	 * 사이즈 정보 조회
 	 *
@@ -285,5 +285,15 @@ public interface TsfGoodsDao {
 	 * @date 2021. 3. 11
 	 */
 	Collection<SizeInfo> getSizeInfoList(SizeInfo sizeInfo);
-	
+
+	/**
+	 * 세트상품 구성상품정보 조회
+	 *
+	 * @param
+	 * @return
+	 * @author eskim
+	 * @since 2021. 3. 21
+	 */
+	Collection<GoodsCompose> getGoodsSetComposeList(Goods goods);
+
 }

src/main/java/com/style24/front/biz/dao/TsfOrderChangeDao.java

@@ -17,15 +17,25 @@ import com.style24.persistence.domain.Point;
 public interface TsfOrderChangeDao {
 
 	/**
-	 * 마이페이지 취소/반품 목록 조회
+	 * 마이페이지 취소 목록 조회
 	 *
 	 * @param Order
 	 * @return Collection<Order>
 	 * @author card007
-	 * @since 2021. 02. 26
+	 * @since 2021. 03. 19
 	 */
 	Collection<Order> getCancelListForMypage(Order order);
 
+	/**
+	 * 마이페이지 반품 목록 조회
+	 *
+	 * @param Order
+	 * @return Collection<Order>
+	 * @author card007
+	 * @since 2021. 02. 26
+	 */
+	Collection<Order> getReturnListForMypage(Order order);
+
 	/**
 	 * 사용 상품권 정보 조회
 	 *

src/main/java/com/style24/front/biz/dao/TsfPlanningDao.java

@@ -1,5 +1,6 @@
 package com.style24.front.biz.dao;
 
+import java.util.ArrayList;
 import java.util.Collection;
 
 import com.style24.core.support.annotation.ShopDs;
@@ -56,25 +57,26 @@ public interface TsfPlanningDao {
 	Collection<Plan> getPlanGoodsList(Plan plan);
 	
 	/**
-	 * 기획전 상세정보
+	 * 기획전 접근 가능 등급 고객
 	 *
 	 * @param 기획전 번호
 	 * @return
 	 * @author sowon
-	 * @date 2020. 7. 27
+	 * @date 2021. 3. 19
 	 */
-	Plan getPlanDetailInfo(Plan plan);
+	ArrayList<Plan> accessCustGrade(Plan plan);
+	
 	
 	/**
-	 * 기획전 고객등급 확인 목록
+	 * 기획전 상세정보
 	 *
-	 * @param
+	 * @param 기획전 번호
 	 * @return
 	 * @author sowon
-	 * @date 2021. 3. 8
+	 * @date 2020. 7. 27
 	 */
-	Collection<Plan> planCustGrade(Plan plan);
-
+	Plan getPlanDetailInfo(Plan plan);
+	
 	/**
 	 * 이벤트 갯수 조회
 	 * 

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

@@ -562,11 +562,21 @@ public class TsfCartService {
 				order.setItemNmArr(order.getItemNm().split("!@!"));
 				order.setOptCdArr(order.getOptCd().split(","));
 				order.setItemQtyArr(order.getItemQtyr().split(","));
+				order.setOptCd1Arr(order.getOptCd1().split(","));
+				order.setOptCd2Arr(order.getOptCd2().split(","));
+				order.setColorNmArr(order.getColorNm().split(","));
 			} else {
-				String[] arr = {order.getItemNm()}, arr2 = {order.getOptCd()}, arr3 = {order.getItemQtyr()};
+				/*String[] arr = {order.getItemNm()}, arr2 = {order.getOptCd()}, arr3 = {order.getItemQtyr()};
 				order.setItemNmArr(arr);
 				order.setOptCdArr(arr2);
-				order.setItemQtyArr(arr3);
+				order.setItemQtyArr(arr3);*/
+
+				String[] arr = {order.getItemNm()}, arr2 = {order.getOptCd1()}, arr3 = {order.getOptCd2()}, arr4 = {order.getItemQtyr()}, arr5 = {order.getColorNm()};
+				order.setItemNmArr(arr);
+				order.setOptCd1Arr(arr2);
+				order.setOptCd2Arr(arr3);
+				order.setItemQtyArr(arr4);
+				order.setColorNmArr(arr5);
 			}
 
 			// 1.3 배송정책별 상품 구분

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

@@ -316,7 +316,7 @@ public class TsfGoodsService {
 	public Collection<GoodsStock> getGoodsOption2List(Goods goods) {
 		return goodsDao.getGoodsOption2List(goods);
 	}
-	
+
 	/**
 	 * 상품 옵션 목록 - 입점용
 	 *
@@ -329,8 +329,6 @@ public class TsfGoodsService {
 		return goodsDao.getGoodsOptionList(goods);
 	}
 
-	
-	
 	/**
 	 * 상품 고시정보
 	 *
@@ -553,4 +551,48 @@ public class TsfGoodsService {
 	public String createGoodsCoupon(Goods goods) {
 		return couponService.createGoodsCoupon(goods);
 	}
+
+	/**
+	 * 세트상품 구성상품정보 조회
+	 *
+	 * @param
+	 * @return
+	 * @author eskim
+	 * @since 2021. 3. 21
+	 */
+	public Collection<GoodsCompose> getGoodsSetComposeList(Goods goods) {
+		Collection<GoodsCompose> getGoodsSetComposeList = goodsDao.getGoodsSetComposeList(goods);
+		for (GoodsCompose goodsExtend : getGoodsSetComposeList) {
+			Goods tmpGoods = new Goods();
+			tmpGoods.setGoodsCd(goodsExtend.getCompsGoodsCd());
+			tmpGoods.setSupplyCompCd(goods.getSupplyCompCd());
+			tmpGoods.setFrontGb(goods.getFrontGb());
+			tmpGoods.setIsApp(goods.getIsApp());
+			tmpGoods.setSiteCd(goods.getSiteCd());
+			tmpGoods.setCustGb(goods.getCustGb());
+			tmpGoods.setCustNo(goods.getCustNo());
+
+			// 상품상세
+			Goods resultGoods = this.getGoodsDesc(tmpGoods);
+			if (resultGoods != null) {
+				goodsExtend.setGoodsTitle(resultGoods.getGoodsTitle());
+				goodsExtend.setGoodsTitleDesc(resultGoods.getGoodsTitleDesc());
+				goodsExtend.setGoodsSpecialDesc(resultGoods.getGoodsSpecialDesc());
+				goodsExtend.setGoodsTopDesc(resultGoods.getGoodsTopDesc());
+				goodsExtend.setGoodsDownDesc(resultGoods.getGoodsDownDesc());
+				goodsExtend.setGoodsDesc(resultGoods.getGoodsDesc());
+			}
+
+			// 상품 옵션1(색상) 정보
+			goodsExtend.setGoodsOption1List(goodsDao.getGoodsOption1List(tmpGoods));
+			// 상품 옵션2(사이즈) 정보
+			//goodsExtend.setGoodsOption2List(goodsDao.getGoodsOption2List(tmpGoods));
+			// 고시 정보
+			goodsExtend.setGoodsNotiList(goodsDao.getGoodsNotiList(tmpGoods));
+			// 이미지 정보
+			goodsExtend.setGoodsImgList(goodsDao.getGoodsImgList(tmpGoods));
+
+		}
+		return getGoodsSetComposeList;
+	}
 }

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

@@ -1,6 +1,8 @@
 package com.style24.front.biz.service;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -31,45 +33,68 @@ public class TsfOrderChangeService {
 	private TscOrderChangeService coreOrderChangeService;
 
 	/**
-	 * 마이페이지 취소/반품 목록 조회
+	 * 마이페이지 취소 목록 조회
 	 *
 	 * @param Order
 	 * @return Collection<Order>
 	 * @author card007
-	 * @since 2021. 02. 26
+	 * @since 2021. 03. 19
 	 */
 	public GagaMap getCancelListForMypage(Order order) {
 		GagaMap map = new GagaMap();
-		Boolean shotDelv = false;
-		Boolean selfMall = false;
-		Boolean supplyMall = false;
-		
+
 		Collection<Order> result = orderChangeDao.getCancelListForMypage(order);
-		for (Order tmpOrder : result) {
-			// 총알배송 아이콘 설정
-			if (!shotDelv && "Y".equals(tmpOrder.getShotDelvYn())) {
-				shotDelv = true;
-			}
-
-			// STYLE24 일반배송 아이콘 설정
-			if (!selfMall && "Y".equals(tmpOrder.getSelfGoodsYn())) {
-				selfMall = true;
-			}
-
-			// 업체직배송 아이콘 설정
-			if (!supplyMall && "N".equals(tmpOrder.getSelfGoodsYn())) {
-				supplyMall = true;
-			}
-		}
-		
-		map.set("shotDelv", shotDelv);
-		map.set("selfMall", selfMall);
-		map.set("supplyMall", supplyMall);
-		map.set("oneData", result.iterator().next());
+		Order oneData = result.iterator().next();
+		oneData.setOrdDtlNoArr(getOrdDtlNoArr(result));
+
+		map.set("oneData", oneData);
+		map.set("cancelList", result);
+
+		return map;
+	}
+
+	/**
+	 * 마이페이지 반품 목록 조회
+	 *
+	 * @param Order
+	 * @return Collection<Order>
+	 * @author card007
+	 * @since 2021. 02. 26
+	 */
+	public GagaMap getReturnListForMypage(Order order) {
+		GagaMap map = new GagaMap();
+
+		Collection<Order> result = orderChangeDao.getReturnListForMypage(order);
+		Order oneData = result.iterator().next();
+		oneData.setOrdDtlNoArr(getOrdDtlNoArr(result));
+
+		map.set("oneData", oneData);
 		map.set("returnList", result);
+
 		return map;
 	}
 
+	/**
+	 * 마이페이지 주문상세번호 배열 처리
+	 *
+	 * @param Collection<Order>
+	 * @return int[]
+	 * @author card007
+	 * @since 2021. 03. 19
+	 */
+	private int[] getOrdDtlNoArr(Collection<Order> orderList) {
+		Order order = new Order();
+		List<Integer> ordDtlNoList = new ArrayList<>();
+		
+		for (Order tmp : orderList) {
+			ordDtlNoList.add(tmp.getOrdDtlNo());
+		}
+		
+		order.setOrdDtlNoArr(ordDtlNoList.stream().mapToInt(Integer::intValue).toArray());
+		
+		return ordDtlNoList.stream().mapToInt(Integer::intValue).toArray();
+	}
+
 	/**
 	 * 사용 상품권 정보 조회
 	 *

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

@@ -286,11 +286,15 @@ public class TsfOrderService {
 				result.setPayMeans(TscConstants.PayMeans.CREDIT_CARD.value());
 			}
 
+			// 모바일 주문의 경우 result에서 고객 번호 보유중.
+			if(TscConstants.FrontGb.PC.value().equals(TsfSession.getFrontGb())) {
+				result.setUpdNo(param.getCustNo());
+				result.setRegNo(param.getCustNo());
+			}
 			result.setPaySq(param.getPaySq());
-			result.setUpdNo(param.getCustNo());
-			result.setRegNo(param.getCustNo());
 			result.setPayGb("O");
 
+			// TB_PAYMENT 등록. 실패시 PG 환불.
 			if(coreOrderDao.insertPayment(result) < 1) {
 				if(TscConstants.PgGb.KCP.value().equals(param.getPgGb()) || TscConstants.PgGb.PAYCO.value().equals(param.getPgGb())) {
 					coreKcpService.kcpPayRollBack(result, request);
@@ -302,8 +306,6 @@ public class TsfOrderService {
 					throw new IllegalArgumentException("결제 정보 저장 실패. 새로고침 후 다시 시작해주세요.");
 				}
 			}
-
-			coreKcpService.kcpPayRollBack(result, request);
 		} catch(Exception e) {
 			e.printStackTrace();
 			throw new IllegalArgumentException(e.getMessage());

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

@@ -1,13 +1,19 @@
 package com.style24.front.biz.service;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.style24.front.biz.dao.TsfPlanningDao;
 import com.style24.front.support.env.TsfConstants;
+import com.style24.front.support.security.session.TsfSession;
 import com.style24.persistence.domain.Cate4Srch;
+import com.style24.persistence.domain.Login;
 import com.style24.persistence.domain.Plan;
 import com.style24.persistence.domain.Point;
 
@@ -82,8 +88,21 @@ public class TsfPlanningService {
 	 * @author sowon
 	 * @since 2021. 3. 9
 	 */
-	public Collection<Plan>planCustGrade(Plan plan) {
-		return planningDao.planCustGrade(plan);
+	public void accessCustGrade(Plan plan){
+		if (!TsfSession.isLogin()) {
+			throw new IllegalArgumentException("로그인 후 접근이 가능합니다.");
+		}
+		else {
+			String custGrade = TsfSession.getInfo().getCustGrade();
+			List<Plan> custGradeList = planningDao.accessCustGrade(plan);
+			System.out.println("=====" + custGradeList.iterator().next().getCustGrade());
+			/*
+			 * if (!custGradeList.) { throw new IllegalArgumentException("너 왜그래"); }
+			 */
+			
+		}
+		
+		
 	}
 	
 	/**

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

@@ -50,7 +50,7 @@ public class TsfReviewService {
 			loopReview.setReviewAttachList(reviewDao.getReviewAttachList(loopReview));
 			loopReview.setGoodsOptionList(reviewDao.getReviewGoodsOptionList(loopReview));
 		}
-		log.info("getReviewList {}", reviewList);
+		//log.info("getReviewList {}", reviewList);
 		
 		return reviewList;
 	}

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

@@ -4,7 +4,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.Locale;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -22,18 +21,14 @@ import com.style24.core.biz.service.TscEnvsetService;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.front.biz.service.TsfDisplayService;
 import com.style24.front.support.controller.TsfBaseController;
-import com.style24.front.support.env.TsfConstants;
+import com.style24.front.support.security.session.TsfSession;
 import com.style24.persistence.domain.BrandGroup;
-import com.style24.persistence.domain.Cate1;
+import com.style24.persistence.domain.Cate4Srch;
 import com.style24.persistence.domain.Contents;
 import com.style24.persistence.domain.GnbTab;
-
-
-import com.style24.front.support.security.session.TsfSession;
-
-import com.style24.persistence.domain.MainLayout;
-import com.style24.persistence.domain.Cate4Srch;
 import com.style24.persistence.domain.GoodsSearch;
+import com.style24.persistence.domain.MainLayout;
+
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -66,9 +61,9 @@ public class TsfDisplayController extends TsfBaseController {
 	public ModelAndView mallMain(Device device, @RequestParam HashMap<String, String> paramMap) {
 		ModelAndView mav = new ModelAndView();
 		String mainCateNo = "";
-		if(device.isMobile() || "Y".equals(paramMap.get("mobileYn"))){
+		if (device.isMobile() || "Y".equals(paramMap.get("mobileYn"))) {
 			mainCateNo = "1720";
-		}else{
+		} else {
 			mainCateNo = "1700";
 		}
 		Collection<MainLayout> mainLayoutCollection = displayService.getMainLayout(mainCateNo);
@@ -76,10 +71,10 @@ public class TsfDisplayController extends TsfBaseController {
 		//mav.addObject("preview", paramMap.get("preview"));
 		//mav.addObject("viewDt", paramMap.get("viewDt"));
 		//mav.addObject("viewPage", "20");
-		for(MainLayout mainLayout : mainLayoutCollection){
+		for (MainLayout mainLayout : mainLayoutCollection) {
 			String contentsLoc = mainLayout.getContentsLoc();
 			Contents contents = new Contents();
-			log.info("mallMain contentsLoc:::{}",contentsLoc);
+			log.info("mallMain contentsLoc:::{}", contentsLoc);
 			contents.setContentsLoc(contentsLoc);
 			contents.setPreview(paramMap.get("preview"));
 			contents.setViewDt(paramMap.get("viewDt"));
@@ -90,10 +85,10 @@ public class TsfDisplayController extends TsfBaseController {
 			cate4Srch = displayService.getCate4srch(cate4Srch);
 			mainLayout.setCate4Srch(cate4Srch);
 
-			if("C".equals(mainLayout.getContentsYn())){
+			if ("C".equals(mainLayout.getContentsYn())) {
 				mainLayout.setContentsList(displayService.getContentsList(contents));
-			}else{
-				log.info("nullpoint contentsLoc::::{}",contentsLoc);
+			} else {
+				log.info("nullpoint contentsLoc::::{}", contentsLoc);
 				GoodsSearch goodsSearch = new GoodsSearch();
 				goodsSearch.setCateType("G031_20");
 				goodsSearch.setSoldoutGoodsDisplayYn("N");
@@ -102,11 +97,11 @@ public class TsfDisplayController extends TsfBaseController {
 				goodsSearch.setFrontGb(getSession().getFrontGb());
 				//int floorUnit = envsetService.getPayUnit(TscConstants.Site.STYLE24.value()); // 가격 원단위 관리
 				//goodsSearch.setFloorUnit(floorUnit);
-				if(TsfSession.getInfo() != null){
+				if (TsfSession.getInfo() != null) {
 					goodsSearch.setCustGb(TsfSession.getInfo().getCustGb());
 					goodsSearch.setCustNo(TsfSession.getInfo().getCustNo());
 					goodsSearch.setCustGrade(TsfSession.getInfo().getCustGrade());
-				}else{
+				} else {
 					goodsSearch.setCustGb("00");
 				}
 
@@ -119,7 +114,7 @@ public class TsfDisplayController extends TsfBaseController {
 			}
 			mainLayoutList.add(mainLayout);
 		}
-		log.info("mainLayoutList::{}",mainLayoutList);
+		log.info("mainLayoutList::{}", mainLayoutList);
 		mav.addObject("mainLayoutList", mainLayoutList);
 		mav.setViewName(super.getDeviceViewName("display/MallMainForm"));
 
@@ -141,17 +136,17 @@ public class TsfDisplayController extends TsfBaseController {
 		return displayService.getGnbBrandGroupList(contents);
 	}
 
-	/**
-	 * 전체 카테고리 목록
-	 * @return
-	 * @author gagamel
-	 * @since 2021. 3. 15
-	 */
-	@GetMapping("/all/cate/list")
-	@ResponseBody
-	public Collection<Cate1> getAllCategoryList() {
-		return displayService.getAllCategoryList(TsfConstants.CateGb.BYITEM.value());
-	}
+//	/**
+//	 * 전체 카테고리 목록
+//	 * @return
+//	 * @author gagamel
+//	 * @since 2021. 3. 15
+//	 */
+//	@GetMapping("/all/cate/list")
+//	@ResponseBody
+//	public Collection<Cate1> getAllCategoryList() {
+//		return displayService.getAllCategoryList(TsfConstants.CateGb.BYITEM.value());
+//	}
 
 	/**
 	 * GNB 탭 목록

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

@@ -75,13 +75,13 @@ public class TsfGoodsController extends TsfBaseController {
 
 	@Autowired
 	private TsfCouponService couponService;
-	
+
 	@Autowired
 	private TsfReviewService reviewService;
 
 	@Autowired
 	private TsfRendererService rendererService;
-	
+
 	@Value("${has-ssl}")
 	private String hasSsl;
 
@@ -130,7 +130,10 @@ public class TsfGoodsController extends TsfBaseController {
 			paramsGoods.setColorCd(goods.getMainColorCd());
 		}
 		paramsGoods.setSelfGoodsYn(goods.getSelfGoodsYn());
-				
+		if (TscConstants.GoodsType.DEAL.value().equals(goods.getGoodsType()) || TscConstants.GoodsType.SET.value().equals(goods.getGoodsType())) {
+			paramsGoods.setColorCd("XX");
+		}
+
 		// 상품 상세
 		goods = goodsService.getGoodsDesc(goods);
 
@@ -156,12 +159,12 @@ public class TsfGoodsController extends TsfBaseController {
 		// 상품 공지
 		mav.addObject("goodsNoticeList", goodsService.getGoodsNoticeList(paramsGoods));
 
-		if ("G056_D".equals(goods.getGoodsType())) {	// 딜상품
+		if (TscConstants.GoodsType.DEAL.value().equals(goods.getGoodsType())) {	// 딜상품
 			// 딜 구성상품 정보
 			paramsGoods.setGoodsComposeSearchYn("Y");
-			mav.addObject("goodsExtendList", goodsService.getGoodsDealComposeList(paramsGoods));
+			mav.addObject("goodsDealComposeList", goodsService.getGoodsDealComposeList(paramsGoods));
 		} else {
-			if ("G056_N".equals(goods.getGoodsType())) {	// 일반상품
+			if (TscConstants.GoodsType.NORMAL.value().equals(goods.getGoodsType())) {	// 일반상품
 				if ("Y".equals(goods.getSelfGoodsYn())) {  // 자사상품
 					// 상품 옵션1(색상) 정보
 					mav.addObject("goodsOption1List", goodsService.getGoodsOption1List(paramsGoods));
@@ -180,8 +183,8 @@ public class TsfGoodsController extends TsfBaseController {
 				lookbook.setGoodsCd(paramsGoods.getGoodsCd());
 				mav.addObject("lookbookList", coreLookbookService.getLookbookListForGoods(lookbook));
 
-			} else if ("G056_S".equals(goods.getGoodsType())) {		// 셋트상품
-//				mav.addObject("goodsExtendList", goodsService.getGoodsSetExtendList(paramsGoods));
+			} else if (TscConstants.GoodsType.SET.value().equals(goods.getGoodsType())) {		// 셋트상품
+				mav.addObject("goodsComposeList", goodsService.getGoodsSetComposeList(paramsGoods));
 			}
 			// 상품쿠폰
 			paramsGoods.setMaxRownum(1);
@@ -207,7 +210,7 @@ public class TsfGoodsController extends TsfBaseController {
 		review.setRownum(1);
 		review.setGoodsType(goods.getGoodsType());
 		mav.addObject("bestReviewList", reviewService.getReviewList(review));
-		
+
 		// 카드 혜택안내
 		CardPromotion cardPromotion = new CardPromotion();
 		cardPromotion.setRownum(1); // 혜택유형별로 1건씩
@@ -228,7 +231,7 @@ public class TsfGoodsController extends TsfBaseController {
 
 		mav.addObject("params", paramsGoods);
 
-		if ("D".equals(goods.getGoodsType())) {
+		if (TscConstants.GoodsType.DEAL.value().equals(goods.getGoodsType())) {
 			if ("Y".equals(mobileYn)) {
 				mav.setViewName("mob/goods/GoodsDealFormMob");
 			} else {
@@ -241,7 +244,7 @@ public class TsfGoodsController extends TsfBaseController {
 				mav.setViewName(super.getDeviceViewName("goods/GoodsDetailForm"));
 			}
 		}
-		log.info("||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||");
+
 		return mav;
 	}
 
@@ -615,18 +618,14 @@ public class TsfGoodsController extends TsfBaseController {
 
 		// 상품 기본정보
 		mav.addObject("goodsInfo", goods);
-		
-		// 사이즈 정보
-		// 입점은 옵션1 노출
-		// 자사는 옵션2 노출
-		
+
 		// 상품평 포인트
 		GagaMap reviewPoint = new GagaMap();
 		reviewPoint.set("textReviewPoint", envsetService.getTextReviewPoint(TscConstants.Site.STYLE24.value()));	//텍스트상품평포인트
 		reviewPoint.set("photoReviewPoint", envsetService.getPhotoReviewPoint(TscConstants.Site.STYLE24.value()));	//포토상품평포인트
 		reviewPoint.set("bestReviewPoint", envsetService.getBestReviewPoint(TscConstants.Site.STYLE24.value()));	//베스트상품평포인트
 		mav.addObject("reviewPoint", reviewPoint);
-		
+
 		Review review = new Review();
 		review.setGoodsCd(goods.getGoodsCd());
 		mav.addObject("reviewCount", reviewService.getReviewTotalCount(review));	// 전체상품평 건수 
@@ -640,43 +639,43 @@ public class TsfGoodsController extends TsfBaseController {
 		review.setBestYn("");
 		review.setRownum(0);	// 전체 조회
 		mav.addObject("photoReviewList", reviewService.getReviewList(review));	//포토상품평
-		
+
 		// 상품평에 등록된 사이즈 정보
-		mav.addObject("reviewOptionList", reviewService.getReviewOptionList(goods.getGoodsCd()));	
-		
+		mav.addObject("reviewOptionList", reviewService.getReviewOptionList(goods.getGoodsCd()));
+
 		// 유야동: 베이비(07), 키즈여아(08), 키즈남아(09), 키즈공통(10), 주니어여야(11), 주니어남아(12), 주니어공통(13), 성인G: 유아동 제외 전체
 		// 유야동 키 공통코드 G091, 성인 키 공통코드 G090
-		String[] arrItem = {"07","08","09","10","11","12","13"}; 
-		ArrayList<String>  itemList = new ArrayList<>(Arrays.asList(arrItem));
-		
+		String[] arrItem = {"07", "08", "09", "10", "11", "12", "13"};
+		ArrayList<String> itemList = new ArrayList<>(Arrays.asList(arrItem));
+
 		// 키전체 
 		Collection<CommonCode> reviewHeightList = new ArrayList<CommonCode>();
-		log.info("goods.getItemkindCd().substring(0, 2) => {} ",goods.getItemkindCd().substring(0, 2) );
+		log.info("goods.getItemkindCd().substring(0, 2) => {} ", goods.getItemkindCd().substring(0, 2));
 		if (itemList.contains(goods.getItemkindCd().substring(0, 2))) {
 			reviewHeightList = rendererService.getAvailCommonCodeList("G091");
-		}else {
+		} else {
 			reviewHeightList = rendererService.getAvailCommonCodeList("G090");
 		}
-		
+
 		// 상품평 키
 		mav.addObject("reviewHeightList", reviewHeightList);
-		
+
 		// 유야동 몸무게 공통코드 G093, 성인 몸무게 공통코드 G092
 		// 몸무게
 		Collection<CommonCode> reviewWeightList = new ArrayList<CommonCode>();
 		if (itemList.contains(goods.getItemkindCd().substring(0, 2))) {
 			reviewWeightList = rendererService.getAvailCommonCodeList("G093");
-		}else {
+		} else {
 			reviewWeightList = rendererService.getAvailCommonCodeList("G092");
 		}
-		
+
 		// 상품평 몸무게
 		mav.addObject("reviewWeightList", reviewWeightList);
-		
+
 		mav.setViewName(super.getDeviceViewName("goods/GoodsReviewForm"));
 		return mav;
 	}
-	
+
 	/**
 	 * 상품평 목록
 	 * @param review
@@ -688,10 +687,26 @@ public class TsfGoodsController extends TsfBaseController {
 	@ResponseBody
 	public GagaMap getGoodsReviewList(@RequestBody Review review) {
 
-		log.info(" getGoodsReviewList =>{}", review);
+		//log.info(" getGoodsReviewList =>{}", review);
 
 		GagaMap result = new GagaMap();
 
+		review.setReviewHeightSt(0);
+		review.setReviewHeightEd(0);
+		if (StringUtils.isNotBlank(review.getReviewHeight())) {
+			String[] arrHeight = review.getReviewHeight().split("\\-");
+			review.setReviewHeightSt(Integer.parseInt(arrHeight[0]));
+			review.setReviewHeightEd(Integer.parseInt(arrHeight[1]));
+		}
+
+		review.setReviewWeightSt(0);
+		review.setReviewWeightEd(0);
+		if (StringUtils.isNotBlank(review.getReviewWeight())) {
+			String[] arrWeight = review.getReviewWeight().split("\\-");
+			review.setReviewWeightSt(Integer.parseInt(arrWeight[0]));
+			review.setReviewWeightEd(Integer.parseInt(arrWeight[1]));
+		}
+
 		TscPageRequest pageable = new TscPageRequest((review.getPageNo() > 0 ? review.getPageNo() - 1 : 0), review.getPageSize(), review.getPageUnit());
 		pageable.setTotalCount(reviewService.getReviewTotalCount(review));
 		review.setPageable(pageable);
@@ -699,11 +714,9 @@ public class TsfGoodsController extends TsfBaseController {
 		if (TsfSession.isLogin()) {
 			review.setCustNo(TsfSession.getInfo().getCustNo());
 		}
-		
+
 		result.set("paging", review);
-		log.info("-------------------------------------------------------------");
 		result.set("dataList", reviewService.getReviewList(review));
-		log.info("-------------------------------------------------------------");
 
 		return result;
 	}
@@ -721,10 +734,10 @@ public class TsfGoodsController extends TsfBaseController {
 		Goods paramsGoods = new Goods();
 		paramsGoods.setGoodsCd(goodsCd);
 		setGoods(paramsGoods);
-		Goods goods = goodsService.getGoodsInfo(paramsGoods);
+		//Goods goods = goodsService.getGoodsInfo(paramsGoods);
 
 		// 상품 기본정보
-		mav.addObject("goodsInfo", goods);
+		mav.addObject("params", paramsGoods);
 
 		mav.setViewName(super.getDeviceViewName("goods/GoodsReviewPhotoForm"));
 		return mav;
@@ -736,9 +749,9 @@ public class TsfGoodsController extends TsfBaseController {
 	 * @author eskim
 	 * @since 2021. 3. 8
 	 */
-	@GetMapping("/review/detail/layer")
-	public ModelAndView goodsReviewPhotoDetailForm(Review review) { 
-		log.info("goodsReviewPhotoDetailForm {}", review);
+	@PostMapping("/review/detail/layer")
+	public ModelAndView goodsReviewDetailForm(Review review) {
+		//log.info("goodsReviewDetailForm {}", review);
 		ModelAndView mav = new ModelAndView();
 		// 상품관련 기본값 설정(회원 등급, 앱, PC/모바일 등)
 		Goods paramsGoods = new Goods();
@@ -748,10 +761,12 @@ public class TsfGoodsController extends TsfBaseController {
 
 		// 상품 기본정보
 		mav.addObject("params", paramsGoods);
-		
+
+		mav.addObject("review", review);
+
 		mav.addObject("reviewList", reviewService.getReviewList(review));
 
-		mav.setViewName(super.getDeviceViewName("goods/GoodsReviewBestForm"));
+		mav.setViewName(super.getDeviceViewName("goods/GoodsReviewDetailForm"));
 		return mav;
 	}
 

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

@@ -462,7 +462,7 @@ public class TsfMypageController extends TsfBaseController {
 	 * @author card007
 	 * @since 2021. 02. 25
 	 */
-	@PostMapping("/cancel/form")
+	@PostMapping("/return/form")
 	@ResponseBody
 	public ModelAndView returnForm(Order order) {
 		ModelAndView mav = new ModelAndView();
@@ -485,13 +485,16 @@ public class TsfMypageController extends TsfBaseController {
 		mav.addObject("customerInfo", customer);
 
 		// 반품 가능 리스트 조회
-		mav.addObject("returnList", orderChangeService.getCancelListForMypage(order));
+		GagaMap map = orderChangeService.getReturnListForMypage(order);
+		Order oneData = (Order) map.get("oneData");
+		mav.addObject("returnList", map);
+		mav.addObject("oneData", oneData);
 
 		// 사용 상품권 정보 조회
-		mav.addObject("usedGiftCardInfo", orderChangeService.getUsedGiftcardInfo(order));
+		mav.addObject("usedGiftCardInfo", orderChangeService.getUsedGiftcardInfo(oneData));
 
 		// 사용 포인트 정보 조회
-		mav.addObject("usedPointInfo", orderChangeService.getUsedPointInfo(order));
+		mav.addObject("usedPointInfo", orderChangeService.getUsedPointInfo(oneData));
 
 		// 주문 결제정보 조회
 		mav.addObject("paymentInfo", orderService.getPaymentInfoForMypage(order));
@@ -507,6 +510,43 @@ public class TsfMypageController extends TsfBaseController {
 		return mav;
 	}
 
+	/**
+	 * 마이페이지 취소신청 화면
+	 *
+	 * @param Order
+	 * @return ModelAndView
+	 * @author card007
+	 * @since 2021. 03. 19
+	 */
+	@PostMapping("/cancel/form")
+	@ResponseBody
+	public ModelAndView cancelForm(Order order) {
+		ModelAndView mav = new ModelAndView();
+
+		// 고객번호 설정
+		int custNo = TsfSession.getInfo().getCustNo();
+		order.setCustNo(custNo);
+
+		// 취소 가능 리스트 조회
+		GagaMap map = orderChangeService.getCancelListForMypage(order);
+		Order oneData = (Order) map.get("oneData");
+		mav.addObject("cancelList", map);
+		mav.addObject("oneData", oneData);
+
+		// 사용 상품권 정보 조회
+		mav.addObject("usedGiftCardInfo", orderChangeService.getUsedGiftcardInfo(oneData));
+
+		// 사용 포인트 정보 조회
+		mav.addObject("usedPointInfo", orderChangeService.getUsedPointInfo(oneData));
+
+		// 주문 결제정보 조회
+		mav.addObject("paymentInfo", orderService.getPaymentInfoForMypage(order));
+
+		mav.setViewName(super.getDeviceViewName("/mypage/MypageCancelForm"));
+
+		return mav;
+	}
+
 	/**
 	 * 마이페이지 STYLE24 포인트화면
 	 *
@@ -519,14 +559,6 @@ public class TsfMypageController extends TsfBaseController {
 	public ModelAndView stylePointForm(Point point) {
 		ModelAndView mav = new ModelAndView();
 
-		// 테스트용 (삭제예정)
-		GagaMap map = new GagaMap();
-		map.setString("custIp", TsfSession.getIpAddress());
-		map.setString("bankNm", "김지철");
-		map.setString("accountNo", "110500288201");
-		map.setString("bankCd", "88");
-		// 테스트용 (삭제예정)
-
 		int custNo = TsfSession.getInfo().getCustNo();
 		point.setCustNo(custNo);
 		// 잔여포인트

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

@@ -249,12 +249,23 @@ public class TsfOrderController extends TsfBaseController {
 			// 2.1 주문고객 정보조회
 			deliveryAddrInfo = coreOrderService.getDeliveryAddrInfo(order);
 			
-			if (deliveryAddrInfo == null) {
-				deliveryAddrInfo = new Order();
+			if (deliveryAddrInfo.getDelvAddrNm() == null || "".equals(deliveryAddrInfo.getDelvAddrNm())) {
 				deliveryAddrInfo.setDelvAddrNm(deliveryAddrInfo.getCustNm());
+			}
+			
+			if (deliveryAddrInfo.getRecipZipcode() == null || "".equals(deliveryAddrInfo.getRecipZipcode())) {
 				deliveryAddrInfo.setRecipZipcode("00000");
+			}
+			
+			if (deliveryAddrInfo.getRecipBaseAddr() == null || "".equals(deliveryAddrInfo.getRecipBaseAddr())) {
 				deliveryAddrInfo.setRecipBaseAddr("기본주소정보없음");
-				deliveryAddrInfo.setRecipDtlAddr("상제주소정보없음");
+			}
+			
+			if (deliveryAddrInfo.getRecipDtlAddr() == null || "".equals(deliveryAddrInfo.getRecipDtlAddr())) {
+				deliveryAddrInfo.setRecipDtlAddr("상세주소정보없음");
+			}
+			
+			if (deliveryAddrInfo.getDelvMemo() == null || "".equals(deliveryAddrInfo.getDelvMemo())) {
 				deliveryAddrInfo.setDelvMemo("직접받고 부재시 문 앞");
 			}
 		} else {

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

@@ -154,6 +154,7 @@ public class TsfPgController extends TsfBaseController {
 		}
 
 		param.setUpdNo(param.getCustNo());
+		param.setFrontGb(TsfSession.getFrontGb());
 
 		// 2. 결재정보등록(TB_PAYMENT)
 		param = orderService.orderPgPayResult(param, request, response);

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

@@ -1,18 +1,23 @@
 package com.style24.front.biz.web;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 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.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.gagaframework.web.rest.server.GagaResponse;
 import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.front.biz.service.TsfPlanningService;
@@ -53,24 +58,17 @@ public class TsfPlanningController extends TsfBaseController {
 	public ModelAndView PlanningMainForm(Plan plan) throws Exception {
 		ModelAndView mav = new ModelAndView();
 		Cate4Srch cate = new Cate4Srch();
-		
-		// 디바이스 set
-		//plan.setFrontGb(TsfSession.getFrontGb());
-		
+			
 		// 카테고리 
 		mav.addObject("categoryList", planningService.getPlanCate1(cate));
-		mav.addObject("cateNo", plan.getCateNo());
-		
-		
+		mav.addObject("cateNo", plan.getCateNo());		
 		
 		// 각 카테고리 기획전 갯수
 		mav.addObject("planCount",planningService.getPlanAllCount(plan));
 		
 		cate.setCate1No(plan.getCateNo());
-		mav.addObject("cateNm", planningService.getPlanCate1(cate).iterator().next().getCate1Nm());
-			
-		
-		
+		mav.addObject("cateNm", planningService.getPlanCate1(cate).iterator().next().getCate1Nm());			
+				
 		mav.addObject("planList", planningService.getPlanList(plan));
 		mav.addObject("goodsList", planningService.getPlanGoodsList(plan));
 		mav.setViewName(super.getDeviceViewName("planning/PlanningMainForm"));
@@ -84,10 +82,12 @@ public class TsfPlanningController extends TsfBaseController {
 	 * @author sowon
 	 * @since 2021. 3. 9
 	 */
-	@GetMapping("/detail/form")
-	@ResponseBody
-	public ModelAndView PlanningDetailForm(Plan plan) throws Exception {
+	@PostMapping("/detail/form")
+	public ModelAndView PlanningDetailForm(@RequestBody Plan plan) throws Exception {
 		ModelAndView mav = new ModelAndView();
+		// 접근 가능 고객 등급 확인
+		planningService.accessCustGrade(plan);
+	
 		// 상세정보
 		//plan.setSiteCd(TsfConstants.SITE_CD);
 		
@@ -97,10 +97,6 @@ public class TsfPlanningController extends TsfBaseController {
 		Plan planInfo = planningService.getPlanDetailInfo(plan);
 		mav.addObject("planInfo", planInfo);
 
-		if (planInfo == null || planInfo.getPlanSq() == null) {
-			mav.setViewName("redirect:/planning/main/form");
-			return mav;
-		}
 		
 		// 다른기획전 보기 
 		mav.addObject("planList", planningService.getPlanList(plan));

src/main/java/com/style24/front/support/controller/TsfBaseController.java

@@ -2,6 +2,7 @@ package com.style24.front.support.controller;
 
 import java.sql.SQLException;
 import java.sql.SQLRecoverableException;
+import java.util.Collection;
 import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
@@ -41,7 +42,10 @@ import com.fasterxml.jackson.databind.JsonMappingException;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.front.support.env.TsfConstants;
 import com.style24.front.support.security.session.TsfSession;
+import com.style24.front.support.startup.TsfEnvsetInfo;
+import com.style24.persistence.domain.Cate1;
 import com.style24.persistence.domain.Login;
+import com.style24.persistence.domain.Meta;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -116,6 +120,25 @@ public class TsfBaseController {
 		return TsfConstants.SNSLOGIN_PREFIX;
 	}
 
+	/**
+	 * 쇼핑몰 메타정보
+	 * @return
+	 */
+	@ModelAttribute("metaInfo")
+	public Meta getMetaInfo() {
+//		return TsfEnvsetInfo.getInstance().getMetaInfo();
+		return (new TsfEnvsetInfo()).getMetaInfo();
+	}
+
+	/**
+	 * 전체카테고리 목록
+	 * @return
+	 */
+	@ModelAttribute("allCateList")
+	public Collection<Cate1> getAllCateList() {
+		return (new TsfEnvsetInfo()).getAllCateList();
+	}
+
 	@ModelAttribute("osType")
 	public String getOsType() {
 		return TsfSession.getAttribute("osType");

src/main/java/com/style24/front/support/startup/TsfEnvsetInfo.java

@@ -0,0 +1,77 @@
+package com.style24.front.support.startup;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.annotation.PostConstruct;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.style24.core.biz.service.TscEnvsetService;
+import com.style24.core.support.env.TscConstants;
+import com.style24.front.biz.service.TsfDisplayService;
+import com.style24.front.support.env.TsfConstants;
+import com.style24.persistence.domain.Cate1;
+import com.style24.persistence.domain.Meta;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 각종 환경설정 정보 조회. 초기 로딩 시 가져옴
+ * 		1. 메타정보
+ * 		2. 카테고리정보
+ * @author gagamel
+ * @since 2021. 3. 19
+ */
+@Component
+@Slf4j
+public class TsfEnvsetInfo {
+
+	private static Meta meta = new Meta();
+	private static Collection<Cate1> allCateList = new ArrayList<>();
+
+	@Autowired
+	private TscEnvsetService envsetService;
+
+	@Autowired
+	private TsfDisplayService displayService;
+
+	@PostConstruct
+	public void init() {
+		meta = envsetService.getMetaInfo(TscConstants.Site.STYLE24.value());
+		log.info("\n\n---- Meta Info. ------------------------------------------");
+		log.info("meta: [{}]", meta);
+		log.info("\n------------------------------------------------------------\n");
+
+		allCateList = displayService.getAllCategoryList(TsfConstants.CateGb.BYITEM.value());
+		log.info("\n\n---- All Category List -----------------------------------");
+		log.info("allCateList: [{}]", allCateList);
+		log.info("\n------------------------------------------------------------\n");
+	}
+
+	/**
+	 * 쇼핑몰 메타정보
+	 * @return
+	 */
+	public Meta getMetaInfo() {
+		if (meta == null) {
+			meta = envsetService.getMetaInfo(TscConstants.Site.STYLE24.value());
+		}
+
+		return meta;
+	}
+
+	/**
+	 * 전체 카테고리 목록
+	 * @return
+	 */
+	public Collection<Cate1> getAllCateList() {
+		if (allCateList == null) {
+			allCateList = displayService.getAllCategoryList(TsfConstants.CateGb.BYITEM.value());
+		}
+
+		return allCateList;
+	}
+
+}

src/main/java/com/style24/persistence/domain/GoodsCompose.java

@@ -35,6 +35,8 @@ public class GoodsCompose extends TscBaseDomain {
 	private String sysImgNm;
 	private String crud;
 	private String compsGoodsNm;
+	private String compsGoodsFullNm;
+	private String colorCd;
 
 //	private String optionTitle;
 //	private String optionNm;
@@ -46,7 +48,18 @@ public class GoodsCompose extends TscBaseDomain {
 	private String supplyCompCd;
 
 	//private Collection<Coupon> goodsCouponList;
+	private Collection<GoodsStock> goodsOption1List;
+	private Collection<GoodsStock> goodsOption2List;
 	private Collection<GoodsNotiInfo> goodsNotiList;
 	private Collection<GoodsStock> goodsSizeList;
 	private Collection<GoodsImg> goodsImgList;
+
+	//상품상세 구분(10:상품타이틀,20:상품타이틀내용,30:상품특징,40:상위컨텐츠,50:하위컨텐츠,60:상위컨텐츠-모바일,70:하위컨텐츠-모바일,80:상품상세(as-is,입점))
+	private String goodsTitle; 			// 10:상품타이틀
+	private String goodsTitleDesc;		// 20:상품타이틀내용
+	private String goodsSpecialDesc;	// 30:상품특징
+	private String goodsTopDesc;		// 40:상위컨텐츠, 60:상위컨텐츠-모바일
+	private String goodsDownDesc;		// 50:하위컨텐츠, 70:하위컨텐츠-모바일
+	private String goodsDesc;			// 80:상품상세(as-is,입점)
+
 }

src/main/java/com/style24/persistence/domain/Plan.java

@@ -102,6 +102,10 @@ public class Plan extends TscBaseDomain{
 		private String cateNm;		// 카테고리명
 		private Integer cateNo;		// 카테고리번호
 		
+		// 고객등급
+		private String custGradeName;	// 접근가능고객 등급 네임
+		
+		
 		// 기획전 응모
 		@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 		private String[] planQtitle;

src/main/java/com/style24/persistence/domain/Review.java

@@ -63,6 +63,15 @@ public class Review extends TscBaseDomain {
 	private String goodsType;		// 상품유형
 	private int rownum;
 	
+	private String reviewScore;		// 상품평 검색조건 평점
+	private String reviewOption;	// 상품평 검색조건 옵션
+	private String reviewHeight;	// 상품평 검색조건 키	0-150
+	private int reviewHeightSt;	// 상품평 검색조건 구간시작	0
+	private int reviewHeightEd;	// 상품평 검색조건 구간종료	150
+	private String reviewWeight;	// 상품평 검색조건 몸무게	0-50
+	private int reviewWeightSt;	// 상품평 검색조건 몸무게 구간시작	0
+	private int reviewWeightEd;	// 상품평 검색조건 몸무게 구간종료	50
+	
 	// Masking
 	public String getMaskingCustId() {
 		return (this.custId != null) ?  MaskingUtils.id(this.custId) : this.custId;
@@ -79,4 +88,5 @@ public class Review extends TscBaseDomain {
 	private int pageNo = 1;
 	private int pageSize = 10;
 	private int pageUnit = 10;
+	
 }

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

@@ -497,6 +497,7 @@
 		SELECT GROUP_CONCAT(Z.ITEM_NM ORDER BY Z.CART_DTL_SQ SEPARATOR '!@!') AS ITEM_NM
 			 , GROUP_CONCAT(Z.ITEM_CD ORDER BY Z.CART_DTL_SQ) AS ITEM_CD
 			 , GROUP_CONCAT(Z.OPT_CD ORDER BY Z.CART_DTL_SQ) AS OPT_CD
+			 , GROUP_CONCAT(Z.COLOR_NM ORDER BY Z.CART_DTL_SQ) AS COLOR_NM
 			 , GROUP_CONCAT(Z.OPT_CD1 ORDER BY Z.CART_DTL_SQ) AS OPT_CD1
 			 , GROUP_CONCAT(Z.OPT_CD2 ORDER BY Z.CART_DTL_SQ) AS OPT_CD2
 			 , GROUP_CONCAT(Z.ITEM_QTY ORDER BY Z.CART_DTL_SQ) AS ITEM_QTYR
@@ -523,7 +524,8 @@
 					 , CD.OPT_CD
 					 , CD.ITEM_QTY
 					 , CD.CART_DTL_SQ
-					 , O.OPT_CD1
+					 , (SELECT COLOR_KNM FROM TB_COLOR C WHERE COLOR_CD = IFNULL(NULLIF(O.OPT_CD1,'') , G.MAIN_COLOR_CD ) AND USE_YN  = 'Y') AS COLOR_NM
+		             , O.OPT_CD1
 					 , O.OPT_CD2
 					 , G.GOODS_TYPE
 					 , G.SUPPLY_COMP_CD

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

@@ -27,32 +27,26 @@
 	
 	<select id="getGiftcardUseList" parameterType="GiftCard" resultType="GiftCard">
 		/*TsfGiftcard.getGiftcardUseList*/
-		SELECT A.* 
-		      ,(CASE A.OCCUR_GB WHEN 'G074_11'THEN '+' 
-		                        WHEN 'G074_12'THEN '-'
-		                        WHEN 'G074_13'THEN '+'
-		                        WHEN 'G074_14'THEN '-'
-		                        WHEN 'G074_15'THEN '-'
-		                        WHEN 'G074_16'THEN '-'
-		                        WHEN 'G074_17'THEN '+'
-		                        WHEN 'G074_18'THEN '+'
-		                        WHEN 'G074_19'THEN '-'
-		       END) AS BALANCE
-		      ,(CASE A.OCCUR_GB WHEN 'G074_11'THEN '상품권 등록'        
-                         WHEN 'G074_12'THEN '상품권 사용'       
-                         WHEN 'G074_13'THEN '상품권 사용취소'     
-                         WHEN 'G074_14'THEN '상품권 유효기간만료'   
-                         WHEN 'G074_15'THEN '상품권 파기'       
-                         WHEN 'G074_16'THEN '상품권 현금전환'     
-                         WHEN 'G074_17'THEN '결품으로 인한 기간 연장'
-                         WHEN 'G074_18'THEN '오환불로 인한 금액추가' 
-                         WHEN 'G074_19'THEN '오환불로 인한 금액차감' 
-               END) AS BALANCE_NAME
-		      ,B.GOODS_CD 
-		      ,D.GOODS_NM 
-		FROM TB_CUST_GIFTCARD_HST A LEFT JOIN TB_ORDER_DETAIL B ON A.ORD_DTL_NO = B.ORD_DTL_NO AND A.ORD_NO = B.ORD_NO
-									LEFT JOIN TB_CUST_GIFTCARD C ON A.CUST_GFCD_SQ =C.CUST_GFCD_SQ 
-									LEFT JOIN TB_GOODS D ON B.GOODS_CD = D.GOODS_CD 
+		SELECT A.GFCD_HST_SQ
+		      , A.CUST_NO
+		      , A.OCCUR_GB
+		      , A.OCCUR_DTL_DESC
+		      , A.GFCD_AMT
+		      , A.CUST_GFCD_SQ
+		      , A.ORD_NO
+		      , A.ORD_DTL_NO
+		      , A.REG_NO
+		      , A.REG_DT
+		      , A.UPD_NO
+		      , A.UPD_DT
+		      , B.GOODS_CD 
+		      , D.GOODS_NM 
+		FROM TB_CUST_GIFTCARD_HST A INNER JOIN TB_ORDER_DETAIL B 
+													ON A.ORD_DTL_NO = B.ORD_DTL_NO AND A.ORD_NO = B.ORD_NO
+									INNER JOIN TB_CUST_GIFTCARD C 
+													ON A.CUST_GFCD_SQ =C.CUST_GFCD_SQ 
+									INNER JOIN TB_GOODS D 
+													ON B.GOODS_CD = D.GOODS_CD 
 		WHERE 1=1
 		 AND A.CUST_NO = #{custNo}
 		 <choose>

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

@@ -179,6 +179,9 @@
 		INNER JOIN TB_GOODS_SUMMARY GS ON G.GOODS_CD = GS.GOODS_CD
 		INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		                      AND B.USE_YN = 'Y'
+		INNER JOIN TB_SITE_BRAND SB ON B.BRAND_CD  = SB.BRAND_CD
+		                            AND SB.USE_YN = 'Y'
+		                            AND SB.SITE_CD = #{siteCd}
 		INNER JOIN TB_BRAND_GROUP D ON B.BRAND_GROUP_NO = D.BRAND_GROUP_NO
 		                            AND D.USE_YN = 'Y'
 		INNER JOIN TB_DELV_FEE_POLICY E ON G.SUPPLY_COMP_CD = E.SUPPLY_COMP_CD
@@ -232,63 +235,14 @@
 		    AND NOW() BETWEEN A.SOCIAL_STDT AND A.SOCIAL_EDDT
 		    AND A.FRONT_GB IN ('A', #{frontGb})
 		    AND A.APPLY_GB = 'A' -- 적용
+		    <if test='adminYn == null or adminYn != "Y"'>
+		    AND C.GOODS_STAT = 'G008_90'
+		    </if>
 		    ORDER BY A.SOCIAL_SQ DESC
 		) A
 		LIMIT 1
 	</select>
 	
-	<!-- 상품 옵션1 목록  - 자사용 -->
-	<select id="getGoodsOption1List_ORG" parameterType="Goods" resultType="GoodsStock">
-		/* TsfGoods.getGoodsOption1List */
-		SELECT GOODS_CD
-		     , OPT_CD1
-		     , STOCK_QTY
-		     , SOLDOUT_YN
-		     , DISP_ORD
-		     , SYS_IMG_NM
-		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, 'XX') AND DEFAULT_IMG_YN = 'Y') AS SYS_IMG_NM
-		          , (CASE WHEN IFNULL(S.STOCK_QTY,0) - G.MIN_ORD_QTY >= 0 THEN STOCK_QTY
-		                 ELSE 0
-		            END ) AS STOCK_QTY
-		          , S.SOLDOUT_YN
-		          , S.DISP_ORD
-		     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
-		                           , MIN(SOLDOUT_YN) AS SOLDOUT_YN
-		                           , MIN(DISP_ORD) AS DISP_ORD
-		                      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' -- 일반상품
-		     ORDER BY O.DISP_ORD
-		) Z
-		WHERE 1 = 1
-		<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 DISP_ORD
-	</select>
-	
 	<!-- 상품 옵션1 목록 - 자사용 -->
 	<select id="getGoodsOption1List" parameterType="Goods" resultType="GoodsStock">
 		/* TsfGoods.getGoodsOption1List */
@@ -305,6 +259,9 @@
 		                             AND O.DISP_YN = 'Y' 
 		      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>
 		) A
 		WHERE ROWNUM = 1
 	</select>
@@ -332,65 +289,20 @@
 		           , O.SOLDOUT_YN
 		           , O.DISP_ORD
 		           , (SELECT MIN_ORD_QTY FROM TB_GOODS WHERE GOODS_CD = O.GOODS_CD ) AS MIN_ORD_QTY
-		      FROM TB_OPTION O 
+		      FROM TB_GOODS G
+		      INNER JOIN TB_OPTION O ON G.GOODS_CD = O.GOODS_CD
+		                             AND O.OPT_CD1 = #{colorCd}
+		                             AND O.DISP_YN = 'Y' 
 		      INNER JOIN VW_STOCK VS ON O.GOODS_CD = VS.GOODS_CD
 		                          AND O.OPT_CD = VS.OPT_CD
-		      WHERE O.GOODS_CD = #{goodsCd}
-		      AND O.OPT_CD1 = #{colorCd}
-		      AND O.DISP_YN = 'Y'
+		      WHERE G.GOODS_CD = #{goodsCd}
+		      <if test='adminYn == null or adminYn != "Y"'>
+		      AND G.GOODS_STAT = 'G008_90'
+		      </if>
 		     ) B
 		ORDER BY DISP_ORD
 	</select>
 	
-	<!-- 상품 옵션2 목록  - 자사용-->
-	<select id="getGoodsOption2List_ORG" parameterType="Goods" resultType="GoodsStock">
-		/* TsfGoods.getGoodsOption2List */
-		SELECT GOODS_CD
-		     , OPT_CD
-		     , OPT_CD1
-		     , OPT_CD2
-		     , STOCK_QTY
-		     , SOLDOUT_YN
-		     , DISP_ORD
-		FROM (
-		    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
-		               , CURR_STOCK_QTY AS STOCK_QTY
-		               , SOLDOUT_YN
-		               , DISP_ORD
-		               , (SELECT MIN_ORD_QTY FROM TB_GOODS WHERE GOODS_CD = A.GOODS_CD ) AS MIN_ORD_QTY
-		          FROM VW_STOCK A
-		          WHERE GOODS_CD = #{goodsCd}
-		          AND COLOR = #{colorCd}
-		          AND DISP_YN = 'Y'
-		        ) B
-		     ) Z
-		WHERE 1 = 1
-		<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 DISP_ORD
-	</select>
-	
 	<!-- 상품 옵션 목록  - 입점용-->
 	<select id="getGoodsOptionList" parameterType="Goods" resultType="GoodsStock">
 		/* TsfGoods.getGoodsOptionList */
@@ -415,11 +327,15 @@
 		           , O.SOLDOUT_YN
 		           , O.DISP_ORD
 		           , (SELECT MIN_ORD_QTY FROM TB_GOODS WHERE GOODS_CD = O.GOODS_CD ) AS MIN_ORD_QTY
-		      FROM TB_OPTION O 
+		      FROM TB_GOODS G
+		      INNER JOIN TB_OPTION O ON G.GOODS_CD = O.GOODS_CD
+		                             AND O.DISP_YN = 'Y' 
 		      INNER JOIN VW_STOCK VS ON O.GOODS_CD = VS.GOODS_CD
 		                          AND O.OPT_CD = VS.OPT_CD
-		      WHERE O.GOODS_CD = #{goodsCd}
-		      AND O.DISP_YN = 'Y'
+		      WHERE G.GOODS_CD = #{goodsCd}
+		      <if test='adminYn == null or adminYn != "Y"'>
+		      AND G.GOODS_STAT = 'G008_90'
+		      </if>
 		     ) B
 		ORDER BY DISP_ORD
 	</select>
@@ -671,7 +587,7 @@
 		     , CERT_STATE
 		     , CERT_DIV
 		     , CERT_DT
-		FROM   TB_GOODS_SAFE_NO A
+		FROM TB_GOODS_SAFE_NO A
 		WHERE GOODS_CD = #{goodsCd}
 	</select>
 	
@@ -738,11 +654,16 @@
 		      INNER JOIN TB_GOODS G ON B.GOODS_CD = G.GOODS_CD
 		                            AND G.GOODS_STAT = 'G008_90'
 		                            AND G.SELF_MALL_YN = 'Y'
+		                            <if test='adminYn == null or adminYn != "Y"'>
+		                            AND G.GOODS_STAT = 'G008_90'
+		                            </if>
 		      INNER JOIN TB_BRAND D ON G.BRAND_CD = D.BRAND_CD
 		                    AND D.USE_YN = 'Y'
+		      INNER JOIN TB_SITE_BRAND SB ON B.BRAND_CD  = SB.BRAND_CD
+		                            AND SB.USE_YN = 'Y'
+		                            AND SB.SITE_CD = #{siteCd}
 		      INNER JOIN TB_BRAND_GROUP E ON D.BRAND_GROUP_NO = E.BRAND_GROUP_NO
 		                            AND E.USE_YN = 'Y'
-		      
 		      LEFT OUTER JOIN (SELECT GOODS_CD
 		                            , SUM(CASE WHEN SOLDOUT_YN = 'Y' THEN 0
 		                                       ELSE CURR_STOCK_QTY END) AS STOCK_QTY
@@ -888,4 +809,33 @@
 		ORDER BY A.SIZE_GB, A.DISP_ORD
 	</select>
 	
+	<!-- 셋트 구성상품의 구성상품 -->
+	<select id="getGoodsSetComposeList"  parameterType="Goods" resultType="GoodsCompose">
+		/* TsfGoods.getGoodsSetComposeList */
+		SELECT A.GOODS_CD
+		     , A.COMPS_GOODS_CD
+		     , G.GOODS_NM AS COMPS_GOODS_NM
+		     , CONCAT(IF(IFNULL(G.GOODS_GB,'') IN ('G073_11','G073_15', ''), '',IFNULL(CONCAT('[',FN_GET_CODE_NM('G073',G.GOODS_GB),']'),'') )
+		             ,IF(G.FOREIGN_BUY_YN='Y','[해외구매대행]','' )
+		             ,IF(G.PARALLEL_IMPORT_YN = 'Y','[병행수입]','')
+		             ,IF(G.ORDER_MADE_YN='Y','[주문제작]','')
+		             ,G.GOODS_NM ) AS COMPS_GOODS_FULL_NM
+		     , A.QTY
+		     , G.BRAND_CD
+		     , G.MAIN_COLOR_CD AS COLOR_CD
+		     , G.ITEMKIND_CD
+		     , (SELECT TI.SIZE_GB FROM TB_ITEMKIND TI WHERE TI.ITEMKIND_CD = G.ITEMKIND_CD) AS SIZE_GB
+		FROM TB_GOODS_COMPOSE A
+		INNER JOIN TB_GOODS G ON A.COMPS_GOODS_CD = G.GOODS_CD
+		                      AND G.SELF_MALL_YN = 'Y' -- 자사몰 노출
+		INNER JOIN TB_BRAND B ON  G.BRAND_CD = B.BRAND_CD
+		                      AND B.USE_YN = 'Y'
+		INNER JOIN TB_SITE_BRAND SB ON B.BRAND_CD  = SB.BRAND_CD
+		                            AND SB.USE_YN = 'Y'
+		                            AND SB.SITE_CD = #{siteCd}
+		WHERE A.GOODS_CD = #{goodsCd}
+		AND A.USE_YN = 'Y'
+		ORDER BY A.DISP_ORD
+	</select>
+	
 </mapper>

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

@@ -15,9 +15,105 @@
 	</sql>
 	<!--// Paging -->
 
-	<!-- 마이페이지 취소/반품 목록 조회 -->
+	<!-- 마이페이지 취소 목록 조회 -->
 	<select id="getCancelListForMypage" parameterType="Order" resultType="Order">
 		/* TscOrderChange.getCancelListForMypage */
+		SELECT O.ORD_NO
+		     , DATE_FORMAT(O.ORD_DT, '%Y.%m.%d')				AS ORD_DT
+		     , O.CUST_NO
+		     , OD.ORD_DTL_NO
+		     , OD.ORD_DTL_STAT
+		     , FN_GET_CODE_NM('G013', OD.ORD_DTL_STAT)			AS ORD_DTL_STAT_NM
+		     , OD.ORD_EXCH_GB
+		     , CASE WHEN OD.ORD_DTL_STAT IN ('G013_20', 'G013_30', 'G013_40') THEN 'Y'
+					ELSE 'N'
+				END												AS ALL_CAN_YN
+		     , OD.GOODS_CD
+		     , G1.GOODS_NM
+		     , G1.GOODS_TYPE
+		     , FN_GET_CODE_NM('G056', G1.GOODS_TYPE)			AS GOODS_TYPE_NM
+		     , G2.GOODS_CD										AS ITEM_CD
+		     , G2.GOODS_NM										AS ITEM_NM
+		     , ODI.ORD_DTL_ITEM_SQ
+		     , ODI.OPT_CD
+		     , ODI.OPT_CD1
+		     , ODI.OPT_CD2
+		     , ODI.ITEM_QTY
+		     , ODI.ITEM_PRICE
+		     , ODI.OPT_ADD_PRICE
+		     , ODI.ORD_AMT
+		     , ODI.CNCL_RTN_AMT
+		     , ODI.CPN1_DC_AMT
+		     , ODI.TMTB1_DC_AMT
+		     , ODI.TMTB2_DC_AMT
+		     , ODI.GOODS_CPN_DC_AMT
+		     , ODI.CART_CPN_DC_AMT
+		     , ODI.PNT_DC_AMT
+		     , ODI.PRE_PNT_DC_AMT
+		     , ODI.GFCD_USE_AMT
+		     , ODI.REAL_ORD_AMT
+		     , GI.SYS_IMG_NM
+		     , OD.ORD_QTY
+		     , OD.CNCL_RTN_QTY
+		     , CASE WHEN OCD.ORD_REQ_CHG_QTY IS NULL THEN 0
+					ELSE OCD.ORD_REQ_CHG_QTY * ODI.ITEM_QTY
+				END												AS ORD_REQ_CHG_QTY
+		     , OD.ORD_QTY - OD.CNCL_RTN_QTY - IF(OCD.ORD_REQ_CHG_QTY IS NULL, 0, OCD.ORD_REQ_CHG_QTY * ODI.ITEM_QTY) AS ORD_CAN_CHG_QTY
+		     , OD.SAVE_PNT_AMT
+		     , OD.SHIP_COMP_CD
+		     , OD.GIFT_PACK_YN
+		     , FN_GET_SUPPLY_COMP_NM(OD.SUPPLY_COMP_CD)			AS SUPPLY_COMP_NM
+		     , OD.INVOICE_NO
+		     , OD.SUPPLY_COMP_CD
+		     , OD.DELV_FEE_CD
+		     , OD.SHOT_DELV_YN
+		     , G1.SELF_GOODS_YN
+		     , CONCAT(B.BRAND_ENM, ' ', B.BRAND_KNM)			AS BRAND_NM
+		  FROM TB_ORDER O
+		 INNER JOIN TB_ORDER_DETAIL OD
+		    ON O.ORD_NO = OD.ORD_NO
+		 INNER JOIN TB_ORDER_DETAIL_ITEM ODI
+		    ON OD.ORD_NO = ODI.ORD_NO
+		   AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
+		 INNER JOIN TB_GOODS G1
+		    ON OD.GOODS_CD = G1.GOODS_CD
+		 INNER JOIN TB_GOODS G2
+		    ON ODI.ITEM_CD = G2.GOODS_CD
+		 INNER JOIN TB_BRAND B
+		    ON B.BRAND_CD = G1.BRAND_CD
+		  LEFT OUTER JOIN (SELECT OD.ORD_DTL_NO
+								, SUM(OCD.CHG_QTY) AS ORD_REQ_CHG_QTY
+							 FROM TB_ORDER_CHANGE_DETAIL OCD
+							INNER JOIN TB_ORDER_DETAIL OD
+							   ON OCD.ORD_DTL_NO = OD.ORD_DTL_NO
+							WHERE OD.ORD_NO = #{ordNo}
+							  AND OCD.DEL_YN = 'N'
+							  AND OCD.CHG_STAT IN ('G685_20', 'G685_30', 'G685_33', 'G685_40')
+							GROUP BY OCD.ORD_DTL_NO
+						  ) OCD
+		    ON OD.ORD_DTL_NO = OCD.ORD_DTL_NO
+		  LEFT OUTER JOIN TB_GOODS_IMG GI
+		    ON OD.GOODS_CD = GI.GOODS_CD
+		   AND ODI.OPT_CD1 = GI.COLOR_CD
+		   AND GI.DEFAULT_IMG_YN = 'Y'
+		 WHERE O.ORD_NO = #{ordNo}
+		   AND OD.ORD_DTL_STAT IN ('G013_10', 'G013_11', 'G013_20', 'G013_30')
+		<choose>
+			<when test='custNo != null and custNo != ""'>
+		   AND O.CUST_NO = #{custNo}
+			</when>
+			<otherwise>
+		   AND O.ORD_NO = #{ordNo}
+		   AND O.ORD_NM = #{orderNm}
+			</otherwise>
+		</choose>
+		   AND O.DISP_YN = 'Y'
+		 ORDER BY OD.ORD_DTL_NO
+	</select>
+
+	<!-- 마이페이지 반품 목록 조회 -->
+	<select id="getReturnListForMypage" parameterType="Order" resultType="Order">
+		/* TscOrderChange.getReturnListForMypage */
 		SELECT O.ORD_NO
 		     , DATE_FORMAT(O.ORD_DT, '%Y.%m.%d')				AS ORD_DT
 		     , OD.ORD_DTL_NO

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

@@ -37,6 +37,7 @@
 		FROM TB_PLAN P  
 		WHERE 1=1
 		   AND P.DEL_YN = 'N'
+		   AND P.OPEN_YN = 'Y'
 		   AND P.PLAN_GB = 'P'
 		   <if test="cateNo != null and cateNo != ''">
 		   AND P.PLAN_SQ IN (
@@ -108,13 +109,15 @@
 			AND P1.PLAN_SQ != #{planSq}
 		</if>
 		 <!--  AND P1.FRONT_GB IN (#{frontGb}, 'A') -->
+		  <if test="cateNo != null and cateNo != ''">
 		  AND P1.PLAN_SQ IN (
 				   						SELECT PLAN_SQ 
 				   						FROM TB_PLAN_CATE 
-				   						 <if test="cateNo != null and cateNo != ''">
+				   						
 				   						WHERE CATE_NO = #{cateNo}
-				   						</if>
+				   						
 				   					)
+		 </if>
 		ORDER BY P1.NEW_PLAN DESC, ABS(DATEDIFF(P1.DISP_EDDT,NOW())) 
 	</select>
 	
@@ -166,13 +169,15 @@
 					 AND PD.DISP_YN = 'Y'
 					 AND PG.DEL_YN = 'N'
 					 AND P.PLAN_GB = 'P'
+					 <if test="cateNo != null and cateNo != ''">
 				     AND P.PLAN_SQ IN (
 				   						SELECT PLAN_SQ 
 				   						FROM TB_PLAN_CATE 
-				   						 <if test="cateNo != null and cateNo != ''">
+				   						 
 				   						WHERE CATE_NO = #{cateNo}
-				   						</if>
+				   						
 				   	 					)
+				   	 </if>
 				)Z
 				ORDER BY Z.DISP_ORD ASC, STOCK_QTY_SUM DESC
 			)F
@@ -227,16 +232,6 @@
 		</if>
 	</select>
 	
-	<select id="planCustGrade" resultType="int" parameterType="Plan">
-		/* TsfPlanning.planCustGrade */
-		SELECT G.CUST_GRADE 
-			  ,G.PLAN_SQ 
-			  ,G.REG_DT 
-			  ,G.REG_NO 
-		FROM TB_PLAN_CUST_GRADE G 
-		WHERE PLAN_SQ = #{planSq}
-	</select>
-	
 	<select id="getEventAllCount" resultType="int" parameterType="Plan">
 		/* TsfPlanning.getEventAllCount */
 		SELECT COUNT(*) AS CNT
@@ -298,5 +293,16 @@
 		ORDER BY P1.NEW_PLAN DESC , ABS(DATEDIFF(P1.DISP_EDDT,NOW()))  
 	</select>
 	
+	<select id="accessCustGrade"  parameterType="Plan" resultType="Plan">
+		SELECT CUST_GRADE
+			  ,(CASE CUST_GRADE WHEN 'G110_10'THEN 'VIP'
+			                    WHEN 'G110_20'THEN 'GOLD'
+			                    WHEN 'G110_30'THEN 'SILVER'
+			                    WHEN 'G110_40'THEN 'BRONZE'
+			                    WHEN 'G110_50'THEN 'WELCOME'END) AS CUST_GRADE_NAME
+		FROM TB_PLAN TP INNER JOIN tb_plan_cust_grade g ON TP.PLAN_SQ = G.PLAN_SQ 
+		WHERE TP.PLAN_SQ = #{planSq}
+	</select>
+	
 
 </mapper>

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

@@ -36,9 +36,41 @@
 		AND R.BEST_YN = 'Y'
 		</if>
 		<if test='photoYn != null and photoYn == "Y"'>
-		AND EXISTS (SELECT 1 FROM TB_REVIEW_ATTACH WHERE DEL_YN = 'N' AND REVIEW_SQ = R.REVIEW_SQ)
+		AND EXISTS (SELECT 1 
+		            FROM TB_REVIEW_ATTACH 
+		            WHERE DEL_YN = 'N' 
+		            AND REVIEW_SQ = R.REVIEW_SQ
+		            AND (FILE_GB  = 'I'
+		                 OR
+		                 FILE_GB = 'M' AND R.CONFIRM_YN = 'Y'
+		                )
+		            )
+		</if>
+		<if test="reviewScore != null and reviewScore != ''">
+		AND R.SCORE = #{reviewScore}
+		</if>
+		<if test="reviewOption != null and reviewOption != ''">
+		AND EXISTS (SELECT 1
+		            FROM TB_ORDER_DETAIL_ITEM ODI 
+		            WHERE ODI.ORD_NO = R.ORD_NO 
+		            AND ODI.ORD_DTL_NO  = R.ORD_DTL_NO
+		            AND ODI.OPT_CD2 = #{reviewOption}
+		           )
+		</if>
+		<if test="reviewHeight != null and reviewHeight != ''">
+		 <![CDATA[
+		AND R.HEIGHT >= #{reviewHeightSt}
+		AND R.HEIGHT < #{reviewHeightEd}
+		]]>
+		</if>
+		<if test="reviewWeight != null and reviewWeight != ''">
+		<![CDATA[
+		AND R.WEIGHT >= #{reviewWeightSt}
+		AND R.WEIGHT < #{reviewWeightEd}
+		]]>
 		</if>
 		AND R.DEL_YN = 'N'
+		AND R.DISP_YN = 'Y'
 	</select>
 		
 	<!-- 상품 리뷰 목록 -->
@@ -88,15 +120,54 @@
 		     , C.CUST_ID 
 		     , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = IFNULL(G.MAIN_COLOR_CD,'XX') AND DEFAULT_IMG_YN = 'Y') AS SYS_IMG_NM
 		     , (SELECT TI.SIZE_GB FROM TB_ITEMKIND TI WHERE TI.ITEMKIND_CD = G.ITEMKIND_CD) AS SIZE_GB
-		     <![CDATA[
-		     , (SELECT MAX(REVIEW_SQ) FROM TB_REVIEW WHERE REVIEW_SQ < #{reviewSq} AND GOODS_CD = R.GOODS_CD AND REVIEW_GB = 'P' AND DEL_YN = 'N') AS PREV_REVIEW_SQ
-		     , (SELECT MIN(REVIEW_SQ) FROM TB_REVIEW WHERE REVIEW_SQ > #{reviewSq} AND GOODS_CD = R.GOODS_CD AND REVIEW_GB = 'P' AND DEL_YN = 'N') AS NEXT_REVIEW_SQ
-		     ]]>
+		     
+		     , (SELECT MAX(REVIEW_SQ) 
+		        FROM TB_REVIEW R
+		        WHERE REVIEW_SQ <![CDATA[<]]> #{reviewSq} 
+		        AND GOODS_CD = R.GOODS_CD 
+		        AND DEL_YN = 'N'
+		        <if test='bestYn != null and bestYn == "Y"'>
+		        AND BEST_YN = 'Y'
+		        </if>
+		        <if test='photoYn != null and photoYn == "Y"'>
+		        AND EXISTS (SELECT 1 
+		                    FROM TB_REVIEW_ATTACH 
+		                    WHERE DEL_YN = 'N' 
+		                    AND REVIEW_SQ = R.REVIEW_SQ
+		                    AND (FILE_GB  = 'I'
+		                         OR
+		                         FILE_GB = 'M' AND R.CONFIRM_YN = 'Y'
+		                        )
+		                    )
+		        </if>
+		        ) AS PREV_REVIEW_SQ
+		     , (SELECT MIN(REVIEW_SQ) 
+		        FROM TB_REVIEW 
+		        WHERE REVIEW_SQ > #{reviewSq}
+		        AND GOODS_CD = R.GOODS_CD 
+		        AND DEL_YN = 'N'
+		        <if test='bestYn != null and bestYn == "Y"'>
+		        AND BEST_YN = 'Y'
+		        </if>
+		        <if test='photoYn != null and photoYn == "Y"'>
+		        AND EXISTS (SELECT 1 
+		                    FROM TB_REVIEW_ATTACH 
+		                    WHERE DEL_YN = 'N' 
+		                    AND REVIEW_SQ = R.REVIEW_SQ
+		                    AND (FILE_GB  = 'I'
+		                         OR
+		                         FILE_GB = 'M' AND R.CONFIRM_YN = 'Y'
+		                        )
+		                    )
+		        </if>
+		        ) AS NEXT_REVIEW_SQ
+		     
 		     , RANK() OVER(ORDER BY R.REVIEW_SQ DESC) AS RNUM
 		FROM TB_REVIEW R 
 		INNER JOIN TB_GOODS G ON R.GOODS_CD = G.GOODS_CD
 		INNER JOIN TB_ORDER_DETAIL OD ON R.ORD_NO = OD.ORD_NO 
-		                               AND R.ORD_DTL_NO  = OD.ORD_DTL_NO 
+		                              AND R.ORD_DTL_NO  = OD.ORD_DTL_NO 
+		                              AND R.GOODS_CD = OD.GOODS_CD
 		INNER JOIN TB_CUSTOMER C ON R.REG_NO  = C.CUST_NO
 		AND R.GOODS_CD = #{goodsCd}
 		<if test="reviewSq != null and reviewSq != ''" >
@@ -106,9 +177,41 @@
 		AND R.BEST_YN = 'Y'
 		</if>
 		<if test='photoYn != null and photoYn == "Y"'>
-		AND EXISTS (SELECT 1 FROM TB_REVIEW_ATTACH WHERE DEL_YN = 'N' AND REVIEW_SQ = R.REVIEW_SQ)
+		AND EXISTS (SELECT 1 
+		            FROM TB_REVIEW_ATTACH 
+		            WHERE DEL_YN = 'N' 
+		            AND REVIEW_SQ = R.REVIEW_SQ
+		            AND (FILE_GB  = 'I'
+		                 OR
+		                 FILE_GB = 'M' AND R.CONFIRM_YN = 'Y'
+		                )
+		            )
 		</if>
 		AND R.DEL_YN = 'N'
+		AND R.DISP_YN = 'Y'
+		<if test="reviewScore != null and reviewScore != ''">
+		AND R.SCORE = #{reviewScore}
+		</if>
+		<if test="reviewOption != null and reviewOption != ''">
+		AND EXISTS (SELECT 1
+		            FROM TB_ORDER_DETAIL_ITEM ODI 
+		            WHERE ODI.ORD_NO = R.ORD_NO 
+		            AND ODI.ORD_DTL_NO  = R.ORD_DTL_NO
+		            AND ODI.OPT_CD2 = #{reviewOption}
+		           )
+		</if>
+		<if test="reviewHeight != null and reviewHeight != ''">
+		 <![CDATA[
+		AND R.HEIGHT >= #{reviewHeightSt}
+		AND R.HEIGHT < #{reviewHeightEd}
+		]]>
+		</if>
+		<if test="reviewWeight != null and reviewWeight != ''">
+		<![CDATA[
+		AND R.WEIGHT >= #{reviewWeightSt}
+		AND R.WEIGHT < #{reviewWeightEd}
+		]]>
+		</if>
 		)Z
 		<if test="rownum != null and rownum > 0 ">
 		WHERE RNUM = 1
@@ -122,13 +225,19 @@
 		SELECT A.RV_ATC_SQ
 		     , A.REVIEW_SQ
 		     , A.FILE_GB
-		     , A.ORG_FILE_NM
 		     , A.SYS_FILE_NM
 		     , A.DEL_YN 
 		     , RANK() OVER(ORDER BY a.FILE_GB DESC) AS NUMB
-		FROM TB_REVIEW_ATTACH A 
-		WHERE A.DEL_YN = 'N'
-		AND A.REVIEW_SQ = #{reviewSq}
+		FROM  TB_REVIEW R
+		INNER JOIN TB_REVIEW_ATTACH A ON R.REVIEW_SQ = A.REVIEW_SQ
+		                              AND A.DEL_YN = 'N'
+		WHERE R.DISP_YN = 'Y'
+		AND R.DEL_YN = 'N'
+		AND R.REVIEW_SQ = #{reviewSq}
+		AND (A.FILE_GB  = 'I'
+		     OR
+		     A.FILE_GB = 'M' AND R.CONFIRM_YN = 'Y'
+		    )
 	</select>
 	
 	<!-- 상품평 상품 옵션 목록 -->

src/main/webapp/WEB-INF/views/mob/cart/CartListFormMob.html

@@ -9,55 +9,6 @@
 
 <th:block layout:fragment="content">
 
-<script type="text/javascript" th:src="${@environment.getProperty('pg.kcp.js.url')}" src=""></script>
-<script type="text/javascript" src="/ux/mo/js/payment.js"></script>
-<script type="text/javascript">
-	$(document).on("click", "#buyBtn", function() {
-		let orderData = {
-			pgGb		: "KCP"
-			, payMeans	: "G014_10"
-			, ordNo		: "5"
-			, goodsNm	: "상품 테스트"
-			, payAmt	: "1233"
-			, ordNm		: "이태영"
-			, ordEmail	: "xodud1202@naver.com"
-			, ordTelno	: "02-0000-0000"
-			, ordPhnno	: "010-7111-0000"
-		};
-
-		let jsonData = JSON.stringify(orderData);
-
-		$.ajax( {
-			type		: "POST",
-			url			: '/order/create/preOrder',
-			data		: jsonData,
-			dataType	: 'html',
-			beforeSend : function(xhr, settings) {
-				xhr.setRequestHeader("AJAX"			, "true");
-				xhr.setRequestHeader('Accept'		, 'application/json');
-				xhr.setRequestHeader('Content-Type'	, 'application/json');
-				gagajf.showProgressbar(true);
-			},
-			error : function(e) {
-				alert(3);
-			},
-			success 	: function(result) {
-				// 결재정보로드
-				$("#orderInfo").html(result);
-				kcp_AJAX();
-				//jsf__pay(document.order_info);
-				//fnKakaoPaymentReady();
-				//fnNaverPaymentReady();
-			}
-		});
-	});
-</script>
-
-
-
-
-<div id="orderInfo" name="orderInfo"></div>
-<input type="button" id="buyBtn" value="KCP TEST" style="width:100px;height:200px;" />
 
 </th:block>
 

src/main/webapp/WEB-INF/views/mob/pg/kcpOrderMob.html

@@ -16,7 +16,6 @@
 	<input type="hidden" name="payMeans"		th:value="${payment.payMeans}" />
 
 	<input type="hidden" name="encoding_trans"	value="UTF 8" />	<!-- 추가 인코딩 네임은 대문자 -->
-	<input type="hidden" name="PayUrl"			value="" />			<!-- 주문페이지 소스에 이미 PayUrl 이 input 값에 있다면 추가하지 않습니다 -->
 
 	<input type="hidden" name="req_tx"			th:value="${payment.reqTx}" />		<!-- 요청의 종류를 구분하는 변수 결제요청페이지의 경우 ‘pay’로 설정 -->
 	<input type="hidden" name="shop_name"		th:value="${payment.siteName}" />	<!-- 상점이름(영문으로 작성권장) -->
@@ -50,16 +49,12 @@
 	<input type="hidden" name="use_pay_method"	value=""/>
 	<input type="hidden" name="cash_yn"         value=""/>
 	<input type="hidden" name="cash_tr_code"	value=""/>
-
-
-
+	<input type="hidden" name="param_opt_1"		th:value="${payment.pgGb}" />		<!-- 모바일은 URL 로 변수 이동하므로 추가 변수로 KCP인지 PAYCO인지 송부 -->
+	<input type="hidden" name="param_opt_2"		th:value="${payment.shopUserId}" />	<!-- 모바일은 URL 로 변수 이동하므로 추가 변수로 custNo 송부 -->
 
 	<input type="hidden" name="shop_user_id"	th:value="${payment.shopUserId}" />	<!-- 필수, 쇼핑몰회원ID 기관에 따라 RM 조치를 위해 쇼핑몰 관리 ID를 필수로 요청 -->
 
 
-
-
-
 	<!-- 신용카드 정보 -->
 
 
@@ -70,7 +65,7 @@
 	<input type="hidden" name="tablet_size"     value="<%=tablet_size%>">
 
 	<!-- 무통장입금 정보 -->
-	<!-- <input type="hidden" name="vcnt_expire_term"	th:value="${payment.vcntExpireTerm}"/> -->	<!-- 무통장입금 유효기간 설정 (3 = 3일) -->
+	<input type="hidden" name="vcnt_expire_term"	th:value="${payment.vcntExpireTerm}"/>	<!-- 무통장입금 유효기간 설정 (ex. 3 = 3일) -->
 
 	<!-- 2012년 8월 18일 전자상거래법 개정 관련 설정 부분 -->
 	<!-- 제공 기간 설정 0:일회성 1:기간설정(ex 1:2012010120120131)  -->
@@ -84,12 +79,9 @@
 			필수 항목 : 표준웹에서 값을 설정하는 부분으로 반드시 포함되어야 합니다
 			값을 설정하지 마십시오
 	-->
-
-
 	<input type="hidden" name="ret_pay_method"  value=""/>
 	<input type="hidden" name="tran_cd"         value=""/>
 
-
 	<!-- 주문정보 검증 관련 정보 : 표준웹 에서 설정하는 정보입니다 -->
 	<input type="hidden" name="ordr_chk"        value=""/>
 

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

@@ -0,0 +1,269 @@
+<html lang="ko"
+	  xmlns:th="http://www.thymeleaf.org">
+<!-- 옵션변경 팝업 -->
+<div class="modal-dialog cartOptionModal" role="document">
+	<div class="modal-content">
+		<div class="modal-header">
+			<h5 class="modal-title" id="optModifyLabel">옵션변경</h5>
+			<div class="prod_title">
+				<span class="brand" th:text="|${cart.brandEnm + ' ' + cart.brandKnm}|"></span>
+				<span class="name" th:text="${cart.goodsNm}"></span>
+			</div>
+		</div>
+
+		<div class="modal-body">
+			<div class="pop_cont">
+				<div class="prod_info">
+					<div class="prod_preview">
+						<div class="area_pic">
+							<ul class="pic_list">
+								<th:block th:if="${setType.equals(cart.goodsType) or cart.selfGoodsYn.equals('N')}">
+									<li th:each="img, index : ${cart.cartImgList}">
+										<span class="thumb"><img th:src="${cart.imgPath + '/' + img.sysImgNm}" src="#" alt="" /></span>
+									</li>
+								</th:block>
+								<th:block th:if="${!setType.equals(cart.goodsType) and cart.selfGoodsYn.equals('Y')}">
+									<th:block th:each="comp, status : ${cart.cartCompsList}">
+										<th:block th:each="color, index : ${comp.cartColorList}">
+											<th:block th:if="${color.cartOptCd1 != null and color.cartOptCd1.equals(color.optCd1)}">
+												<li th:each="img, index : ${color.cartImgList}">
+													<span class="thumb"><img th:src="${cart.imgPath + '/' + img.sysImgNm}" src="#" alt="" /></span>
+												</li>
+											</th:block>
+										</th:block>
+									</th:block>
+								</th:block>
+							</ul>
+						</div>
+						<div class="area_order">
+							<th:block th:each="comp, status : ${cart.cartCompsList}">
+								<!-- 세트상품 옵션 -->
+								<th:block th:if="${setType.equals(cart.goodsType)}">
+									<div class="opt_select setOption">
+										<div class="opt_header">
+											<span class="title" th:text="${comp.goodsNm}"></span>
+										</div>
+
+										<!-- 컬러 변경시 만들어줄 size option -->
+										<th:block th:each="color, index : ${comp.cartColorList}">
+											<span style="display:none;">
+												<select th:classappend="|color_${color.goodsCd}_${color.optCd1}|">
+													<th:block th:each="size, i : ${color.cartSizeList}">
+														<th:block th:if="${color.optCd1.equals(size.optCd1)}">
+															<option th:value="${size.optCd}" th:text="${size.optCd2}"></option>
+														</th:block>
+													</th:block>
+												</select>
+											</span>
+										</th:block>
+
+										<div class="form_field">
+											<select class="setColorSelect">
+												<th:block th:each="color, index : ${comp.cartColorList}">
+													<option th:data="${comp.goodsCd}" th:value="${color.optCd1}" rel="icon-temperature" th:text="${color.colorNm}" th:selected="${color.cartColorNm != null}"></option>
+												</th:block>
+											</select>
+										</div>
+										<div class="form_field">
+											<th:block th:each="color, index : ${comp.cartColorList}">
+											<select th:data="${color.goodsCd}" th:class="|size_${comp.goodsCd} setSizeSelect|">
+												<th:block th:each="size, i : ${color.cartSizeList}">
+													<th:block th:if="${color.optCd1.equals(size.optCd1)}">
+														<option th:data="${comp.cartDtlSq}" th:value="${size.optCd}" th:text="${size.optCd2}" th:selected="${size.cartOptCd != null}"></option>
+													</th:block>
+												</th:block>
+											</select>
+											</th:block>
+										</div>
+									</div>
+								</th:block>
+
+								<!-- 자사 일반 상품 옵션 -->
+								<th:block th:if="${!setType.equals(cart.goodsType) and 'Y'.equals(cart.selfGoodsYn)}">
+									<div class="opt_color">
+										<div class="opt_header">
+											<span class="title">컬러</span>
+											<th:block th:each="color, index : ${comp.cartColorList}">
+												<th:block th:if="${color.cartColorNm != null}">
+													<span class="color" th:text="${color.cartColorNm}"></span>
+												</th:block>
+											</th:block>
+										</div>
+										<ul>
+											<li th:each="color, index : ${comp.cartColorList}" class="selfGoodsColor">
+												<a href="" th:cartDtlSq="${color.cartDtlSq}" th:classappend="${color.cartColorNm != null} ? 'on'" class="selfGoodsColorSelect" th:data="${color.optCd1}">
+													<img th:src="${cart.imgPath + '/' + color.sysImgNm}" src="#" th:alt="${color.colorNm}" alt="" />
+												</a>
+											</li>
+										</ul>
+									</div>
+
+									<div class="opt_size">
+										<div class="opt_header">
+											<span class="title">사이즈</span>
+										</div>
+										<div class="form_field selfGoodsSize">
+											<th:block th:each="color, index : ${comp.cartColorList}">
+												<th:block th:if="${color.cartColorNm != null}">
+													<th:block th:each="size, index : ${color.cartSizeList}">
+														<div>
+															<input type="radio" name="rdi-optsize" th:id="|${'rdi-optsize' + size.goodsCd + '-' + size.optCd}|" th:value="${size.optCd}" th:checked="${size.cartOptCd != null}" th:disabled="${size.soldoutYn == 'Y' or cart.goodsQty > size.currStockQty}">
+															<label th:for="|${'rdi-optsize' + size.goodsCd + '-' + size.optCd}|"><span th:text="${size.optCd2}"></span></label>
+														</div>
+													</th:block>
+												</th:block>
+											</th:block>
+										</div>
+									</div>
+								</th:block>
+
+								<!-- 입점업체 상품 옵션 -->
+								<th:block th:if="${!setType.equals(cart.goodsType) and !'Y'.equals(cart.selfGoodsYn)}">
+									<div class="opt_select">
+										<div class="opt_header">
+											<span class="title">옵션선택</span>
+										</div>
+										<div class="form_field">
+											<select class="selfGoodsColor">
+												<th:block th:each="color, index : ${comp.cartColorList}">
+												<option th:data="${color.cartDtlSq}" th:value="${color.optCd}" th:text="${color.optCd1 + '/' + color.optCd2}" th:selected="${color.cartOptCd != null}"></option>
+												</th:block>
+											</select>
+										</div>
+									</div>
+								</th:block>
+							</th:block>
+							<div class="opt_count">
+								<div class="opt_header">
+									<span class="title">수량</span>
+								</div>
+								<div class="number_count">
+									<span class="minus"><span class="sr-only">감소</span></span>
+									<input type="text" name="goodsQty" maxlength="3" style='ime-mode:disabled' th:value="${cart.goodsQty}" />
+									<!-- <input type="text" name="goodsQty" maxlength="3" style='ime-mode:disabled' th:value="2" /> -->
+									<span class="plus"><span class="sr-only">추가</span></span>
+								</div>
+							</div>
+							<div class="btn_group_block">
+								<button class="btn btn_dark btn_block" th:onclick="|fnChangeCartOption(${cart.cartSq})|"><span>옵션변경</span></button>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+<!-- //옵션변경 팝업 -->
+
+
+<script th:inline="javascript">
+	// 세트상품 컬러 변경시
+	$(".setColorSelect").on("change", function(e) {
+		let goodsCd = $(this).find("option:checked").attr("data");
+		$(".setOption .size_" + goodsCd).html("");
+		$(".setOption .size_" + goodsCd).html($(".color_" + goodsCd + "_" + $(this).val()).html());
+	});
+
+	// 자사 일반 상품 컬러 선택시
+	$(".selfGoodsColorSelect").on("click", function(e) {
+		let html = "";
+		let cart = [[${cart}]];
+		let color =  [[${cart.cartCompsList[0].cartColorList}]];
+		let optCd1 = $(this).attr("data");
+
+		for(let i = 0 ; i < color.length ; i++) {
+			let size = color[i].cartSizeList;
+			for(let j = 0 ; j < size.length ; j++) {
+				if(optCd1 == size[j].optCd1) {
+					html += "<div>";
+					html += "<input type='radio' name='rdi-optsize' id='" + size[j].goodsCd + "-" + size[j].optCd + "' value='" + size[j].optCd + "' ";
+					if(size[j].soldoutYn == "Y" || cart.goodsQty > size[j].currStockQty) {
+						html += "disabled = 'disabled'";
+					}
+					html += " />\n";
+					html += "<label for='" + size[j].goodsCd + "-" + size[j].optCd + "'><span>" + size[j].optCd2 + "</span></label>\n"
+					html += "</div>\n";
+				}
+			}
+		}
+
+		$(".selfGoodsSize").html(html);
+	});
+
+	function fnChangeCartOption(cartSq) {
+		let cart = [[${cart}]];
+		let cartDtlSqArr = [], itemCds = [], optCds = [];
+		let data;
+
+		if(cart.goodsType == "G056_S") {
+			$(".setSizeSelect").each(function() {
+				optCds.push($(this).val());
+				itemCds.push($(this).attr("data"));
+				cartDtlSqArr.push($(this).find("option:checked").attr("data"));
+			});
+
+			data = {
+				  cartSq : cart.cartSq
+				, goodsCd : cart.goodsCd
+				, goodsType : cart.goodsType
+				, cartDtlSqArr : cartDtlSqArr
+				, itemCds : itemCds
+				, optCds : optCds
+				, goodsQty : $("input[name=goodsQty]").val()
+			}
+		} else if(cart.goodsType != "G056_S" && cart.selfGoodsYn == "Y") {
+			optCds.push($(".selfGoodsSize").find("input[name=rdi-optsize]:checked").val());
+			itemCds.push(cart.goodsCd);
+			$(".selfGoodsColorSelect").each(function() {
+				if($(this).attr("cartDtlSq") > 0) {
+					cartDtlSqArr.push($(this).attr("cartDtlSq"));
+				}
+			});
+
+			data = {
+				  cartSq : cart.cartSq
+				, goodsCd : cart.goodsCd
+				, goodsType : cart.goodsType
+				, cartDtlSqArr : cartDtlSqArr
+				, itemCds : itemCds
+				, optCds : optCds
+				, goodsQty : $("input[name=goodsQty]").val()
+			}
+		} else {
+			optCds.push($(".selfGoodsColor").val());
+			itemCds.push(cart.goodsCd);
+			$(".selfGoodsColor option").each(function() {
+				if($(this).attr("data") > 0) {
+					cartDtlSqArr.push($(this).attr("data"));
+				}
+			});
+
+			data = {
+				cartSq : cart.cartSq
+				, goodsCd : cart.goodsCd
+				, goodsType : cart.goodsType
+				, cartDtlSqArr : cartDtlSqArr
+				, itemCds : itemCds
+				, optCds : optCds
+				, goodsQty : $("input[name=goodsQty]").val()
+			}
+		}
+
+		$.ajax( {
+			type: "POST",
+			url : '/cart/change/option',
+			contentType: 'application/json',
+			dataType : 'json',
+			data : JSON.stringify(data),
+			success : function(result) {
+				alert(result.message);
+				$(".closeCartOptionModal").trigger("click");
+				getCartList();
+			}
+		});
+	}
+</script>
+
+</div>
+<a href="#close-modal" rel="modal:close" class="close-modal closeCartOptionModal">Close</a>
+</html>

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

@@ -5,11 +5,11 @@
 
 	<!-- CONT-BODY -->
 	<div class="od_cont">
-		<div class="sec_head shotDelvSelect">
+		<div class="sec_head">
 			<div class="tbl type4">
 				<table>
 					<colgroup>
-						<col width="150">
+						<col width="170">
 						<col width="*">
 					</colgroup>
 					<tbody>
@@ -21,7 +21,7 @@
 							<div class="form_field">
 								<div>
 									<input type="radio" name="shotDelvUseYn" id="blt_ship1" value="Y" th:checked="${order.shotCanYn.equals('Y')}">
-									<label for="blt_ship1"><span><em class="tag">총알배송</em><span th:text="|${order.shotDelvDt}일 24:00 까지 도착|"></span></span></label>
+									<label for="blt_ship1"><span><em class="tag primary_line">총알배송</em><span th:text="|${order.shotDelvDt}일 24:00 까지 도착|"></span></span></label>
 								</div>
 								<div>
 									<input type="radio" name="shotDelvUseYn" id="blt_ship2" value="N" th:checked="${!order.shotCanYn.equals('Y')}">
@@ -35,277 +35,534 @@
 			</div>
 		</div>
 		<div class="sec_body">
-			<!-- 총알배송 -->
-			<div class="part_deliver wmsList" th:if="${wmsCartList != null and wmsCartList.size() > 0}">
-				<h3 class="subH2 mb20" th:if="${order.shotCanYn.equals('Y')}">
-					STYLE24 총알배송
-					<span class="ml10">오늘 자정까지 도착</span>
-				</h3>
-				<h3 class="subH2 mb20" th:if="${order.shotCanYn.equals('N')}">
-					STYLE24 일반배송
-				</h3>
-				<div class="tbl type2">
-					<table>
-						<colgroup>
-							<col width="900">
-							<col width="*">
-						</colgroup>
-						<tbody>
-						<th:block th:each="cart, status : ${wmsCartList}">
-							<tr class="cartInfo wmsCartInfo">
-								<input type="hidden" name="applyQtySectionYn" th:value="${cart.applyQtySectionYn}" />
-								<input type="hidden" name="applyAmtSectionYn" th:value="${cart.applyAmtSectionYn}" />
-								<input type="hidden" name="qtyTmtbSq" th:value="${cart.qtyTmtbSq}" />
-								<input type="hidden" name="qtyTmtbNm" th:value="${cart.qtyTmtbNm}" />
-								<input type="hidden" name="amtTmtbSq" th:value="${cart.amtTmtbSq}" />
-								<input type="hidden" name="amtTmtbNm" th:value="${cart.amtTmtbNm}" />
-								<input type="hidden" name="currPrice" th:value="${cart.currPrice}" />
-								<input type="hidden" name="soldoutYn" th:value="${cart.soldoutYn}" />
-								<input type="hidden" name="tmtbDcAmt" th:value="${cart.tmtbDcAmt}" />
-								<input type="hidden" name="cartSq" th:value="${cart.cartSq}" />
-
-								<td>
-									<!-- 주문가능 상품 -->
-									<div class="info_item" th:classappend="${cart.soldoutYn.equals('Y')} ? unable"> <!-- 주문불가시 class="unable" 추가 / 인풋, 버튼 disable 처리 -->
-										<div class="form_box">
-											<p class="form_field">
-												<input th:id="|od_item_${cart.cartSq}|" name="cartSqArr" type="checkbox" th:value="${cart.cartSq}" th:checked="${cart.soldoutYn.equals('N')}" th:disabled="${cart.soldoutYn.equals('Y')}"/>
-												<label th:for="|od_item_${cart.cartSq}|">
-													<span class="sr-only">상품선택</span>
-												</label>
-											</p>
+			<form class="form_wrap">
+				<div class="sec_select">
+					<div>
+						<div class="form_field">
+							<input id="od_item_all" type="checkbox"><label for="od_item_all"><span>전체선택</span></label>
+						</div>
+						<button type="button" class="btn btn_default btn_sm"><span>선택삭제</span></button>
+					</div>
+				</div>
+				<div class="sec_part">
+					<h3 class="subH2">
+						STYLE24 배송
+					</h3>
+					<div class="area_part">
+						<h4 class="subH2">
+							총알배송
+							<span class="tit_info">오늘 자정까지 도착</span>
+						</h4>
+						<div class="part_goods">
+							<div class="goods_cont">
+								<!-- 주문상품 -->
+								<th:block th:each="cart, status : ${wmsCartList}">
+									<div class="cartInfo goods_info wmsCartInfo">
+										<input type="hidden" name="applyQtySectionYn" th:value="${cart.applyQtySectionYn}" />
+										<input type="hidden" name="applyAmtSectionYn" th:value="${cart.applyAmtSectionYn}" />
+										<input type="hidden" name="qtyTmtbSq" th:value="${cart.qtyTmtbSq}" />
+										<input type="hidden" name="qtyTmtbNm" th:value="${cart.qtyTmtbNm}" />
+										<input type="hidden" name="amtTmtbSq" th:value="${cart.amtTmtbSq}" />
+										<input type="hidden" name="amtTmtbNm" th:value="${cart.amtTmtbNm}" />
+										<input type="hidden" name="currPrice" th:value="${cart.currPrice}" />
+										<input type="hidden" name="soldoutYn" th:value="${cart.soldoutYn}" />
+										<input type="hidden" name="tmtbDcAmt" th:value="${cart.tmtbDcAmt}" />
+										<input type="hidden" name="cartSq" th:value="${cart.cartSq}" />
+
+										<div class="order_desc">
+											<div class="form_box">
+												<div class="form_field">
+													<input th:id="|od_item_${cart.cartSq}|" name="cartSqArr" type="checkbox" th:value="${cart.cartSq}" th:checked="${cart.soldoutYn.equals('N')}" th:disabled="${cart.soldoutYn.equals('Y')}"/>
+													<label th:for="|od_item_${cart.cartSq}|">
+														<span class="sr-only">상품선택</span>
+													</label>
+												</div>
+											</div>
+											<div class="goods_box">
+												<div class="gd_item">
+													<a href="">
+														<span class="thumb">
+															<img th:src="${IMG_PATH} + '/' + ${cart.sysImgNm}" src="/" width="100%" alt="">
+														</span>
+														<p>
+															<span class="brand" th:text="|${cart.brandEnm} ${cart.brandKnm}|"></span>
+														</p>
+														<p>
+															<span class="name" th:text="${cart.goodsNm}"></span>
+														</p>
+													</a>
+												</div>
+												<div class="gd_opt">
+													<div class="option_wrap">
+														<span class="title sr-only">주문 옵션</span>
+														<th:block th:each="opt, index : ${cart.itemNmArr}">
+															<th:block th:if="${cart.goodsType.equals('G056_S')}">
+																<span class="option" th:text="${cart.itemNmArr[index.index]} + ' / ' + ${cart.colorNmArr[index.index]} + ' / ' + ${cart.optCd2Arr[index.index]}"></span>
+															</th:block>
+															<th:block th:if="${!cart.goodsType.equals('G056_S')}">
+																<span class="option" th:text="${cart.colorNmArr[index.index]} + ' / ' + ${cart.optCd2Arr[index.index]}"></span>
+															</th:block>
+														</th:block>
+													</div>
+												</div>
+												<div class="gd_calc">
+													<p>
+														<span class="count">수량&nbsp;<em th:text="${cart.goodsQty}"></em>개</span>
+													</p>
+												</div>
+												<div class="gd_exinfo">
+													<p th:if="${!#strings.isEmpty(cart.delvResDt)}"><span class="tag primary_line">총알배송</span><span th:text="|${cart.delvResDt} 배송예정|">2020.12.25 배송예정</span></p>
+													<p th:if="${(cart.qtyTmtbSq > 0 and cart.applyQtySectionYn == 'Y') or (cart.amtTmtbSq > 0 and cart.applyAmtSectionYn == 'Y')}"><span class="tag primary">SALE</span>다다익선 할인 적용</p>
+												</div>
+											</div>
+											<div class="calc_box">
+												<th:block  th:if="${cart.tmtbDcAmt < cart.currPrice}">
+													<p><span class="price_org"><em th:text="${#numbers.formatInteger(cart.currPrice, 1, 'COMMA')}"></em>원</span></p>
+													<p><span class="price_sale"><em th:text="${#numbers.formatInteger(cart.tmtbDcAmt, 1, 'COMMA')}"></em>원</span></p>
+												</th:block>
+												<th:block th:if="${cart.tmtbDcAmt == cart.currPrice}">
+													<p><span class="price_sale"><em th:text="${#numbers.formatInteger(cart.currPrice, 1, 'COMMA')}"></em>원</span></p>
+												</th:block>
+												<p>
+													<span class="point">
+														<em th:text="${#numbers.formatInteger(cart.savePntAmt, 1, 'COMMA')}"></em><stong>P</stong>&nbsp;적립예정
+													</span>
+												</p>
+											</div>
+											<div class="button_box">
+												<p th:if="${cart.soldoutYn.equals('Y')}"><button type="button" class="btn btn_dark btn_sm" disabled=""><span>구매 불가</span></button></p>
+												<p th:if="${cart.soldoutYn.equals('N')}"><button type="button" class="btn btn_primary btn_sm" th:onclick="|fnSubmitNoMember(${cart.cartSq})|"><span>바로 구매</span></button></p>
+
+												<p><button type="button" id="btn_opt_modify1" class="btn btn_default btn_sm" th:onclick="|fnChangeCartOptCd(${cart.cartSq})|"><span>옵션 / 수량 변경</span></button></p>
+												<div class="util">
+													<span>
+														<button type="button" class="btn_favorite" th:classappend="${cart.wishCnt > 0} ? active" onclick="cfnPutWishList(this)" th:goodsCd="${cart.goodsCd}" th:ithrCd="${cart.ithrCd}" th:contentsLoc="${cart.contentsLoc}">
+															<span><i class="ico ico_like2"></i><em class="sr-only">관심상품 추가</em></span>
+														</button>
+													</span>
+													<span>
+														<button type="button" class="btn_delete" th:onclick="|deleteCart(${cart.cartSq})|">
+															<span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span>
+														</button>
+													</span>
+												</div>
+											</div>
 										</div>
-										<div class="thumb_box">
-											<a href="">
-												<img th:src="${IMG_PATH} + '/' + ${cart.sysImgNm}" src="/" width="100%" alt="">
-											</a>
+									</div>
+								</th:block>
+								<!-- //주문상품 -->
+								<!-- 주문상품 -->
+								<div class="goods_info">
+									<div class="order_desc">
+										<div class="form_box">
+											<div class="form_field">
+												<input id="od_item_12" type="checkbox"><label for="od_item_12"><span class="sr-only">상품선택</span></label>
+											</div>
 										</div>
-										<div class="info_box">
-											<p class="od_name">
+										<div class="goods_box">
+											<div class="gd_item">
 												<a href="">
-													<span class="brand" th:text="|${cart.brandEnm} ${cart.brandKnm}|"></span>
-													<span th:if="${!#strings.isEmpty(cart.delvResDt)}" class="reserv_date" th:text="|${cart.delvResDt} 배송예정|"></span>
-													<span class="name" th:text="${cart.goodsNm}"></span>
+                                                                    <span class="thumb">
+                                                                        <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
+                                                                    </span>
+													<p>
+														<span class="brand">Mollimelli 몰리멜리</span>
+													</p>
+													<p>
+														<span class="name">남성 오버 소매배색 컬러가디건 (n205ap9829p)</span>
+													</p>
 												</a>
+											</div>
+											<div class="gd_opt">
+												<div class="option_wrap">
+													<span class="title sr-only">주문 옵션</span>
+													<span class="option">BLACK&nbsp;/&nbsp;XXL</span>
+												</div>
+											</div>
+											<div class="gd_calc">
+												<p>
+													<span class="count">수량&nbsp;<em>1</em>개</span>
+												</p>
+											</div>
+										</div>
+										<div class="calc_box">
+											<p>
+												<span class="price_org"><em>39,990</em>원</span>
 											</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>
-											</p>
-											<p class="od_opt">
-												<span class="count">수량:<em th:text="${cart.goodsQty}"></em>개</span>
-											</p>
-
-											<p class="od_modify">
-												<button type="button" class="btn_opt_pop" th:onclick="|changeCartOptCd(${cart.cartSq})|"><span>옵션/수량변경</span></button>
+											<p>
+												<span class="price_sale"><em>15,120</em>원</span>
+											<p>
+												<span class="point"><em>999,999</em><stong>P</stong>&nbsp;적립예정</span>
 											</p>
-											<!-- 다다익선 적용 -->
-											<div class="od_moresale applyTmtb" th:if="${(cart.qtyTmtbSq > 0 and cart.applyQtySectionYn == 'Y') or (cart.amtTmtbSq > 0 and cart.applyAmtSectionYn == 'Y')}">
-												<a href="" class="btn_moresale">
-													<i class="ico ico_saletag"></i><span>다다익선 할인적용!</span>
+										</div>
+										<div class="button_box">
+											<p><button type="button" class="btn btn_primary btn_sm"><span>바로 구매</span></button></p>
+											<p><button type="button" id="btn_opt_modify2" class="btn btn_default btn_sm"><span>옵션 / 수량 변경</span></button></p>
+											<div class="util">
+                                                                <span>
+                                                                    <button type="button" class="btn_favorite"><span><i class="ico ico_like2"></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>
+											</div>
+										</div>
+									</div>
+								</div>
+								<!-- //주문상품 -->
+							</div>
+						</div>
+					</div>
+					<div class="area_part">
+						<h4 class="subH2">
+							일반배송
+						</h4>
+						<div class="part_goods">
+							<div class="goods_cont">
+								<!-- 주문상품 -->
+								<div class="goods_info">
+									<div class="order_desc">
+										<div class="form_box">
+											<div class="form_field">
+												<input id="od_item_21" type="checkbox"><label for="od_item_21"><span class="sr-only">상품선택</span></label>
+											</div>
+										</div>
+										<div class="goods_box">
+											<div class="gd_item">
+												<a href="">
+                                                                    <span class="thumb">
+                                                                        <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
+                                                                    </span>
+													<p>
+														<span class="brand">Mollimelli 몰리멜리</span>
+													</p>
+													<p>
+														<span class="name">남성 오버 소매배색 싸이로 리얼 컬러 블록 세미오버핏 이중지 심플 기본 와이넥 원단추 캐시미어 굵은 꼬임 10종 컬러가디건 (n205ap9829p)</span>
+													</p>
 												</a>
-												<div class="li_moresale applyTmtbNm">
-													<ul>
-														<li th:if="${cart.qtyTmtbSq > 0 and cart.applyQtySectionYn == 'Y'}" th:text="${cart.qtyTmtbNm}"></li>
-														<li th:if="${cart.amtTmtbSq > 0 and cart.applyAmtSectionYn == 'Y'}" th:text="${cart.amtTmtbNm}"></li>
-													</ul>
+											</div>
+											<div class="gd_opt">
+												<div class="option_wrap">
+													<span class="title sr-only">주문 옵션</span>
+													<span class="option">슬림핏 마이크로 체크 네이비컬러 세미오버핏 이중 심플 기본 와이넥 원단추 캐시미어 굵은 스탠드카라 베이직 셋업수트 자켓&nbsp;/&nbsp;BLACK&nbsp;/&nbsp;XXL</span>
 												</div>
 											</div>
-											<!-- 다다익선 미적용 -->
-											<div class="od_moresale notApplyTmtb" th:if="${(cart.qtyTmtbSq > 0 and cart.applyQtySectionYn == 'N') or (cart.amtTmtbSq > 0 and cart.applyAmtSectionYn == 'N')}">
-												<a href="" class="btn_moresale">
-													<i class="ico ico_saletag"></i><span>다다익선 상품보기</span>
+											<div class="gd_calc">
+												<p>
+													<span class="count">수량&nbsp;<em>1</em>개</span>
+												</p>
+											</div>
+											<div class="gd_exinfo">
+												<p>2020.12.25 배송예정</p>
+												<p><a href="" class="btn_moresale"><span class="tag primary">SALE</span>다다익선 상품보기</a></p>
+											</div>
+										</div>
+										<div class="calc_box">
+											<p>
+												<span class="price_org"><em>39,990</em>원</span>
+											</p>
+											<p>
+												<span class="price_sale"><em>15,120</em>원</span>
+											<p>
+												<span class="point"><em>999,999</em><stong>P</stong>&nbsp;적립예정</span>
+											</p>
+										</div>
+										<div class="button_box">
+											<button type="button" class="btn btn_primary btn_sm"><span>바로 구매</span></button>
+											<p><button type="button" class="btn btn_default btn_sm"><span>옵션 / 수량 변경</span></button></p>
+											<div class="util">
+                                                                <span>
+                                                                    <button type="button" class="btn_favorite"><span><i class="ico ico_like2"></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>
+											</div>
+										</div>
+									</div>
+								</div>
+								<!-- //주문상품 -->
+								<!-- 주문상품 -->
+								<div class="goods_info">
+									<div class="order_desc">
+										<div class="form_box">
+											<div class="form_field">
+												<input id="od_item_22" type="checkbox"><label for="od_item_22"><span class="sr-only">상품선택</span></label>
+											</div>
+										</div>
+										<div class="goods_box">
+											<div class="gd_item">
+												<a href="">
+                                                                    <span class="thumb">
+                                                                        <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
+                                                                    </span>
+													<p>
+														<span class="brand">Mollimelli 몰리멜리</span>
+													</p>
+													<p>
+														<span class="name">남성 오버 소매배색 컬러가디건 (n205ap9829p)</span>
+													</p>
 												</a>
-												<div class="li_moresale notApplyTmtbNm">
-													<ul>
-														<li th:if="${cart.qtyTmtbSq > 0 and cart.applyQtySectionYn == 'N'}" th:inline="text">[[${cart.qtyTmtbNm}]]<a href=''>대상 상품 보기</a></li>
-														<li th:if="${cart.amtTmtbSq > 0 and cart.applyAmtSectionYn == 'N'}" th:inline="text">[[${cart.amtTmtbNm}]]<a href=''>대상 상품 보기</a></li>
-													</ul>
+											</div>
+											<div class="gd_opt">
+												<div class="option_wrap">
+													<span class="title sr-only">주문 옵션</span>
+													<span class="option">BLACK&nbsp;/&nbsp;XXL</span>
 												</div>
 											</div>
-											<!-- 주문불가시 안내추가 -->
-											<div class="info_unable" th:if="${cart.soldoutYn.equals('Y')}">
-												해당상품은 구매가 불가능한 상품입니다. / 상품이 품절되었습니다.
+											<div class="gd_calc">
+												<p>
+													<span class="count">수량&nbsp;<em>1</em>개</span>
+												</p>
 											</div>
-											<!-- //주문불가시 안내추가 -->
 										</div>
-										<div class="info_calc">
-											<p class="price" th:if="${cart.tmtbDcAmt < cart.currPrice}">
-												<span class="selling_price" th:text="|${#numbers.formatInteger(cart.tmtbDcAmt, 1, 'COMMA')} 원|"></span>
-												<del th:text="|${#numbers.formatInteger(cart.currPrice, 1, 'COMMA')} 원|"></del>
-											</p>
-											<p class="price" th:if="${cart.tmtbDcAmt == cart.currPrice}">
-												<span class="selling_price" th:text="|${#numbers.formatInteger(cart.currPrice, 1, 'COMMA')} 원|"></span>
+										<div class="calc_box">
+											<p>
+												<span class="price_org"><em>39,990</em>원</span>
 											</p>
-											<p class="point"><span th:text="${#numbers.formatInteger(cart.savePntAmt, 1, 'COMMA')}"></span>p 적립예정</p>
 											<p>
-												<button th:if="${cart.soldoutYn.equals('Y')}" type="button" class="btn btn_sm" disabled><span>구매불가</span></button>
-												<button th:if="${cart.soldoutYn.equals('N')}" type="button" class="btn btn_primary btn_sm" th:onclick="|submitNoMember(${cart.cartSq})|"><span>즉시구매</span></button>
+												<span class="price_sale"><em>15,120</em>원</span>
+											<p>
+												<span class="point"><em>999,999</em><stong>P</stong>&nbsp;적립예정</span>
 											</p>
-											<p class="util">
-										<span>
-											<button type="button" class="btn_favorite" th:classappend="${cart.wishCnt > 0} ? active" onclick="cfnPutWishList(this)" th:goodsCd="${cart.goodsCd}" th:ithrCd="${cart.ithrCd}" th:contentsLoc="${cart.contentsLoc}">
-												<span>
-													<i class="ico ico_like2"></i>
-													<em class="sr-only">관심상품 추가</em>
-												</span>
-											</button>
-										</span>
+										</div>
+										<div class="button_box">
+											<p><button type="button" class="btn btn_primary btn_sm"><span>바로 구매</span></button></p>
+											<p><button type="button" class="btn btn_default btn_sm"><span>옵션 / 수량 변경</span></button></p>
+											<div class="util">
+                                                                <span>
+                                                                    <button type="button" class="btn_favorite"><span><i class="ico ico_like2"></i><em class="sr-only">관심상품 추가</em></span></button>
+                                                                </span>
 												<span>
-											<button type="button" class="btn_delete" th:onclick="|deleteCart(${cart.cartSq})|"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
-										</span>
-											</p>
+                                                                    <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
+                                                                </span>
+											</div>
 										</div>
 									</div>
-									<!-- //주문가능 상품 -->
-								</td>
-								<td class="merge_row delvFeeArea" th:classappend="|delv_${cart.delvFeeCd}|" th:if="${cart.firstCompYn == 'Y'}" th:rowspan="${wmsCartList.size()}"> <!-- 같은 데이터 노출시 동일 영역끼리 병합 : 클래스명 merge_row 추가 -->
-									<div class="info_dlvr">
-										<span class="dlvr_fee" th:if="${cart.delvFee == 0}">배송비 무료</span>
-										<span class="dlvr_fee" th:if="${cart.delvFee > 0}" th:text="|배송비 ${#numbers.formatInteger(cart.delvFee, 1, 'COMMA')} 원|"></span>
-										<a href="#" target="_blank" th:if="${cart.delvFee > 0}">배송비 SAVE 상품 보기</a>
-									</div>
-								</td>
-							</tr>
-						</th:block>
-						</tbody>
-					</table>
-				</div>
-				<div class="btn_area">
-					<button type="button" class="btn btn_default" onclick="deleteCart('WMS_SELECT')"><span>선택 삭제</span></button>
-					<button type="button" class="btn btn_default" onclick="deleteCart('WMS_ALL')"><span>전체 삭제</span></button>
+								</div>
+								<!-- //주문상품 -->
+							</div>
+							<div class="goods_foot"> <!-- 일반배송 테이블에만 .goods_foot -->
+								<div class="order_delivery">
+									<span class="dlvr_fee">배송비 무료</span>
+								</div>
+							</div>
+						</div>
+					</div>
 				</div>
-			</div>
-			<!-- //총알배송 -->
-
-			<!-- 업체직배송 -->
-			<div class="part_deliver delvList" th:if="${delvCartList != null and delvCartList.size() > 0}">
-				<h3 class="subH2 mb20">
-					업체직배송
-				</h3>
-				<div class="tbl type2">
-					<table>
-						<colgroup>
-							<col width="900">
-							<col width="*">
-						</colgroup>
-						<tbody>
-						<th:block th:each="cart, status : ${delvCartList}">
-							<tr class="cartInfo delvCartInfo">
-								<input type="hidden" name="applyQtySectionYn" th:value="${cart.applyQtySectionYn}" />
-								<input type="hidden" name="applyAmtSectionYn" th:value="${cart.applyAmtSectionYn}" />
-								<input type="hidden" name="qtyTmtbSq" th:value="${cart.qtyTmtbSq}" />
-								<input type="hidden" name="qtyTmtbNm" th:value="${cart.qtyTmtbNm}" />
-								<input type="hidden" name="amtTmtbSq" th:value="${cart.amtTmtbSq}" />
-								<input type="hidden" name="amtTmtbNm" th:value="${cart.amtTmtbNm}" />
-								<input type="hidden" name="currPrice" th:value="${cart.currPrice}" />
-								<input type="hidden" name="soldoutYn" th:value="${cart.soldoutYn}" />
-								<input type="hidden" name="tmtbDcAmt" th:value="${cart.tmtbDcAmt}" />
-								<input type="hidden" name="cartSq" th:value="${cart.cartSq}" />
-
-								<td>
-									<div class="info_item" th:classappend="${cart.soldoutYn.equals('Y')} ? unable">
+				<div class="sec_part">
+					<h3 class="subH2">업체직배송</h3>
+					<div class="area_part">
+						<div class="part_goods">
+							<div class="goods_cont">
+								<!-- 주문상품 -->
+								<div class="goods_info">
+									<div class="order_desc">
 										<div class="form_box">
-											<p class="form_field">
-												<input th:id="|od_item_${cart.cartSq}|" name="cartSqArr" type="checkbox" th:value="${cart.cartSq}" th:checked="${cart.soldoutYn.equals('N')}" th:disabled="${cart.soldoutYn.equals('Y')}"/>
-												<label th:for="|od_item_${cart.cartSq}|">
-													<span class="sr-only">상품선택</span>
-												</label>
-											</p>
-										</div>
-										<div class="thumb_box">
-											<a href="">
-												<img th:src="${IMG_PATH} + '/' + ${cart.sysImgNm}" src="/" width="100%" alt="">
-											</a>
+											<div class="form_field">
+												<input id="od_item_31" type="checkbox"><label for="od_item_31"><span class="sr-only">상품선택</span></label>
+											</div>
 										</div>
-										<div class="info_box">
-											<p class="od_name">
+										<div class="goods_box">
+											<div class="gd_item">
 												<a href="">
-													<span class="brand" th:text="|${cart.brandEnm} ${cart.brandKnm}|"></span>
-													<span class="name" th:text="${cart.goodsNm}"></span>
+                                                                    <span class="thumb">
+                                                                        <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
+                                                                    </span>
+													<p>
+														<span class="brand">Mollimelli 몰리멜리</span>
+													</p>
+													<p>
+														<span class="name">남성 오버 소매배색 싸이로 리얼 컬러 블록 세미오버핏 이중지 심플 기본 와이넥 원단추 캐시미어 굵은 꼬임 10종 컬러가디건 (n205ap9829p)</span>
+													</p>
 												</a>
+											</div>
+											<div class="gd_opt">
+												<div class="option_wrap">
+													<span class="title sr-only">주문 옵션</span>
+													<span class="option">슬림핏 마이크로 체크 네이비컬러 세미오버핏 이중 심플 기본 와이넥 원단추 캐시미어 굵은 스탠드카라 베이직 셋업수트 자켓&nbsp;/&nbsp;BLACK&nbsp;/&nbsp;XXL</span>
+												</div>
+											</div>
+											<div class="gd_calc">
+												<p>
+													<span class="count">수량&nbsp;<em>1</em>개</span>
+												</p>
+											</div>
+											<div class="gd_exinfo">
+												<p><a href="" class="btn_moresale"><span class="tag primary">SALE</span>다다익선 상품보기</a></p>
+												<p>2021.03.03 배송예정</p>
+											</div>
+										</div>
+										<div class="calc_box">
+											<p>
+												<span class="price_org"><em>39,990</em>원</span>
 											</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>
-											</p>
-											<p class="od_opt">
-												<span class="count">수량:<em th:text="${cart.goodsQty}"></em>개</span>
-											</p>
-											<p class="od_modify">
-												<button type="button" class="btn_opt_pop" th:onclick="|changeCartOptCd(${cart.cartSq})|"><span>옵션/수량변경</span></button>
+											<p>
+												<span class="price_sale"><em>15,120</em>원</span>
+											<p>
+												<span class="point"><em>999,999</em><stong>P</stong>&nbsp;적립예정</span>
 											</p>
-											<!-- 다다익선 적용 -->
-											<div class="od_moresale applyTmtb" th:if="${(cart.qtyTmtbSq > 0 and cart.applyQtySectionYn == 'Y') or (cart.amtTmtbSq > 0 and cart.applyAmtSectionYn == 'Y')}">
-												<a href="" class="btn_moresale">
-													<i class="ico ico_saletag"></i><span>다다익선 할인적용!</span>
+										</div>
+										<div class="button_box">
+											<p><button type="button" class="btn btn_primary btn_sm"><span>바로 구매</span></button></p>
+											<p><button type="button" class="btn btn_default btn_sm"><span>옵션 / 수량 변경</span></button></p>
+											<div class="util">
+                                                                <span>
+                                                                    <button type="button" class="btn_favorite"><span><i class="ico ico_like2"></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>
+											</div>
+										</div>
+									</div>
+								</div>
+								<!-- //주문상품 -->
+								<!-- 주문상품 -->
+								<div class="goods_info">
+									<div class="order_desc">
+										<div class="form_box">
+											<div class="form_field">
+												<input id="od_item_32" type="checkbox"><label for="od_item_32"><span class="sr-only">상품선택</span></label>
+											</div>
+										</div>
+										<div class="goods_box">
+											<div class="gd_item">
+												<a href="">
+                                                                    <span class="thumb">
+                                                                        <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
+                                                                    </span>
+													<p>
+														<span class="brand">Mollimelli 몰리멜리</span>
+													</p>
+													<p>
+														<span class="name">남성 오버 소매배색 컬러가디건 (n205ap9829p)</span>
+													</p>
 												</a>
-												<div class="li_moresale applyTmtbNm">
-													<ul>
-														<li th:if="${cart.qtyTmtbSq > 0 and cart.applyQtySectionYn == 'Y'}" th:text="${cart.qtyTmtbNm}"></li>
-														<li th:if="${cart.amtTmtbSq > 0 and cart.applyAmtSectionYn == 'Y'}" th:text="${cart.amtTmtbNm}"></li>
-													</ul>
+											</div>
+											<div class="gd_opt">
+												<div class="option_wrap">
+													<span class="title sr-only">주문 옵션</span>
+													<span class="option">BLACK&nbsp;/&nbsp;XXL</span>
 												</div>
 											</div>
-											<!-- 다다익선 미적용 -->
-											<div class="od_moresale notApplyTmtb" th:if="${(cart.qtyTmtbSq > 0 and cart.applyQtySectionYn == 'N') or (cart.amtTmtbSq > 0 and cart.applyAmtSectionYn == 'N')}">
-												<a href="" class="btn_moresale">
-													<i class="ico ico_saletag"></i><span>다다익선 상품보기</span>
+											<div class="gd_calc">
+												<p>
+													<span class="count">수량&nbsp;<em>1</em>개</span>
+												</p>
+											</div>
+											<div class="gd_exinfo">
+												<p>해당 상품은 구매 불가능한 상품입니다.</p>
+											</div>
+										</div>
+										<div class="calc_box">
+											<p>
+												<span class="price_org"><em>39,990</em>원</span>
+											</p>
+											<p>
+												<span class="price_sale"><em>15,120</em>원</span>
+											<p>
+												<span class="point"><em>999,999</em><stong>P</stong>&nbsp;적립예정</span>
+											</p>
+										</div>
+										<div class="button_box">
+											<p><button type="button" class="btn btn_dark btn_sm" disabled=""><span>구매 불가</span></button></p>
+											<p><button type="button" class="btn btn_default btn_sm"><span>옵션 / 수량 변경</span></button></p>
+											<div class="util">
+                                                                <span>
+                                                                    <button type="button" class="btn_favorite"><span><i class="ico ico_like2"></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>
+											</div>
+										</div>
+									</div>
+								</div>
+								<!-- //주문상품 -->
+							</div>
+							<div class="goods_foot">
+								<div class="order_delivery">
+									<span class="dlvr_fee">배송비&nbsp;<em>3,000</em>원</span>
+									<span class="dlvr_shop"><em>TBJ</em>&nbsp;업체직배송</span>
+									<a href="#" class="btn_popup_save">배송비 SAVE 상품 보기</a>
+								</div>
+							</div>
+						</div>
+						<div class="part_goods">
+							<div class="goods_cont">
+								<!-- 주문상품 -->
+								<div class="goods_info">
+									<div class="order_desc">
+										<div class="form_box">
+											<div class="form_field">
+												<input id="od_item_33" type="checkbox"><label for="od_item_33"><span class="sr-only">상품선택</span></label>
+											</div>
+										</div>
+										<div class="goods_box">
+											<div class="gd_item">
+												<a href="">
+                                                                    <span class="thumb">
+                                                                        <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
+                                                                    </span>
+													<p>
+														<span class="brand">Mollimelli 몰리멜리</span>
+													</p>
+													<p>
+														<span class="name">남성 오버 소매배색 싸이로 리얼 컬러 블록 세미오버핏 이중지 심플 기본 와이넥 원단추 캐시미어 굵은 꼬임 10종 컬러가디건 (n205ap9829p)</span>
+													</p>
 												</a>
-												<div class="li_moresale notApplyTmtbNm">
-													<ul>
-														<li th:if="${cart.qtyTmtbSq > 0 and cart.applyQtySectionYn == 'N'}" th:text="${cart.qtyTmtbNm}"><a href="">대상 상품 보기</a></li>
-														<li th:if="${cart.amtTmtbSq > 0 and cart.applyAmtSectionYn == 'N'}" th:text="${cart.amtTmtbNm}"><a href="">대상 상품 보기</a></li>
-													</ul>
+											</div>
+											<div class="gd_opt">
+												<div class="option_wrap">
+													<span class="title sr-only">주문 옵션</span>
+													<span class="option">슬림핏 마이크로 체크 네이비컬러 세미오버핏 이중 심플 기본 와이넥 원단추 캐시미어 굵은 스탠드카라 베이직 셋업수트 자켓&nbsp;/&nbsp;BLACK&nbsp;/&nbsp;XXL</span>
 												</div>
 											</div>
-											<!-- 주문불가시 안내추가 -->
-											<div class="info_unable" th:if="${cart.soldoutYn.equals('Y')}">
-												해당상품은 구매가 불가능한 상품입니다. / 상품이 품절되었습니다.
+											<div class="gd_calc">
+												<p>
+													<span class="count">수량&nbsp;<em>1</em>개</span>
+												</p>
+											</div>
+											<div class="gd_exinfo">
+												<p><a href="" class="btn_moresale"><span class="tag primary">SALE</span>다다익선 상품보기</a></p>
 											</div>
-											<!-- //주문불가시 안내추가 -->
 										</div>
-										<div class="info_calc">
-											<p class="price" th:if="${cart.tmtbDcAmt < cart.currPrice}">
-												<span class="selling_price" th:text="|${#numbers.formatInteger(cart.tmtbDcAmt, 1, 'COMMA')} 원|"></span>
-												<del th:text="|${#numbers.formatInteger(cart.currPrice, 1, 'COMMA')} 원|"></del>
-											</p>
-											<p class="price" th:if="${cart.tmtbDcAmt == cart.currPrice}">
-												<span class="selling_price" th:text="|${#numbers.formatInteger(cart.currPrice, 1, 'COMMA')} 원|"></span>
+										<div class="calc_box">
+											<p>
+												<span class="price_org"><em>39,990</em>원</span>
 											</p>
-											<p class="point"><span th:text="${#numbers.formatInteger(cart.savePntAmt, 1, 'COMMA')}"></span>p 적립예정</p>
 											<p>
-												<button th:if="${cart.soldoutYn.equals('Y')}" type="button" class="btn btn_sm" disabled><span>구매불가</span></button>
-												<button th:if="${cart.soldoutYn.equals('N')}" type="button" class="btn btn_primary btn_sm" th:onclick="|submitNoMember(${cart.cartSq})|"><span>즉시구매</span></button>
+												<span class="price_sale"><em>15,120</em>원</span>
+											<p>
+												<span class="point"><em>999,999</em><stong>P</stong>&nbsp;적립예정</span>
 											</p>
-											<p class="util">
-										<span>
-											<button type="button" class="btn_favorite" th:classappend="${cart.wishCnt > 0} ? active" onclick="cfnPutWishList(this)" th:goodsCd="${cart.goodsCd}" th:ithrCd="${cart.ithrCd}" th:contentsLoc="${cart.contentsLoc}"><span><i class="ico ico_like2"></i><em class="sr-only">관심상품 추가</em></span></button>
-										</span>
+										</div>
+										<div class="button_box">
+											<p><button type="button" class="btn btn_primary btn_sm"><span>바로 구매</span></button></p>
+											<p><button type="button" class="btn btn_default btn_sm"><span>옵션 / 수량 변경</span></button></p>
+											<div class="util">
+                                                                <span>
+                                                                    <button type="button" class="btn_favorite"><span><i class="ico ico_like2"></i><em class="sr-only">관심상품 추가</em></span></button>
+                                                                </span>
 												<span>
-											<button type="button" class="btn_delete" th:onclick="|deleteCart(${cart.cartSq})|"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
-										</span>
-											</p>
+                                                                    <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
+                                                                </span>
+											</div>
 										</div>
 									</div>
-								</td>
-								<td class="merge_row delvFeeArea" th:classappend="|delv_${cart.delvFeeCd}|" th:if="${cart.firstCompYn == 'Y'}" th:rowspan="${cart.compCnt}"> <!-- 같은 데이터 노출시 동일 영역끼리 병합 : 클래스명 merge_row 추가 -->
-									<div class="info_dlvr">
-										<span class="dlvr_fee" th:if="${cart.delvFee == 0}">배송비 무료</span>
-										<span class="dlvr_fee" th:if="${cart.delvFee > 0}" th:text="|배송비 ${#numbers.formatInteger(cart.delvFee, 1, 'COMMA')} 원|"></span>
-										<span class="dlvr_shop" th:text="|${cart.supplyCompNm} 업체직배송|"></span>
-										<a href="#" target="_blank" th:if="${cart.delvFee > 0}">배송비 SAVE 상품 보기</a>
-									</div>
-								</td>
-							</tr>
-						</th:block>
-						</tbody>
-					</table>
-				</div>
-				<div class="btn_area">
-					<button type="button" class="btn btn_default" onclick="deleteCart('DELV_SELECT')"><span>선택 삭제</span></button>
-					<button type="button" class="btn btn_default" onclick="deleteCart('DELV_ALL')"><span>전체 삭제</span></button>
+								</div>
+								<!-- //주문상품 -->
+							</div>
+							<div class="goods_foot">
+								<div class="order_delivery">
+									<span class="dlvr_fee">배송비&nbsp;무료</span>
+								</div>
+							</div>
+						</div>
+					</div>
 				</div>
-			</div>
-			<!-- //업체직배송 -->
+			</form>
 		</div>
 	</div>
 	<div class="od_side">
@@ -313,33 +570,33 @@
 			<div class="tit_box">
 				<h3>결제 정보</h3>
 				<span>
-				<em class="number" th:text="${order.totCartCnt}"></em>개의 상품
-			</span>
+                                    <em class="number">14</em>개의 상품
+                                </span>
 			</div>
 			<div class="od_amount_box">
 				<dl>
 					<div>
 						<dt>상품금액</dt>
-						<dd><em class="sumCurrPrice" th:text="${#numbers.formatInteger(order.sumOrdAmt, 1, 'COMMA')}"></em> 원</dd>
+						<dd><em>1,746,500</em>원</dd>
 					</div>
 					<div>
 						<dt>배송비</dt>
-						<dd><em class="totDelvFee" th:text="${#numbers.formatInteger(order.totDelvFee, 1, 'COMMA')}"></em> 원</dd>
+						<dd><em>0</em>원</dd>
 					</div>
 					<div>
 						<dt>할인금액</dt>
-						<dd><span class="disc_amount"><em class="totDcAmt" id="totDcAmt" th:text="${#numbers.formatInteger(order.totDcAmt, 1, 'COMMA')}"></em> 원</span></dd>
+						<dd><span class="disc_amount"><em>-46,500</em>원</span></dd>
 					</div>
 				</dl>
 			</div>
 			<div class="totalprice_box">
 				<dl>
 					<dt>총 결제 예정 금액</dt>
-					<dd data-weight="price" data-font="lato"><span class="sumRealPayAmt" id="sumRealPayAmt" th:text="${#numbers.formatInteger(order.sumRealPayAmt + order.totDelvFee, 1, 'COMMA')}"></span> 원</dd>
+					<dd><span>1,700,000</span>원</dd>
 				</dl>
 			</div>
 			<div class="btn_box">
-				<button class="btn btn_primary btn_block btn_md"><span>주문하기</span></button>
+				<button class="btn btn_primary btn_block btn_md" onclick="fnSubmitNoMember('all')"><span>구매하기</span></button>
 			</div>
 		</div>
 		<div class="area_salecoupon">
@@ -347,44 +604,34 @@
 			<div class="form_field">
 				<div class="input_wrap form_full">
 					<label class="input_label sr-only">할인코드입력</label>
-					<input type="text" id="serialCpnNm" class="form_control" placeholder="할인코드를 입력해주세요.">
+					<input type="text" class="form_control" placeholder="할인코드를 입력해주세요.">
 				</div>
-				<button type="button" class="btn btn_dark btn_default" onclick="serialCpnApply()"><span>적용</span></button>
+				<button type="button" class="btn btn_dark btn_sm"><span>적용</span></button>
 			</div>
 			<div class="coupon_box">
 				<div class="coupon">
 					<div>
-						<p class="cp_name"></p>
+						<p class="cp_name">
+							TBJ 시즌오프 20% 할인쿠폰
+						</p>
 						<p class="cp_cont">
-							<!--<span><em>12,399,900</em>원</span>
-							<span><em>40%</em></span>-->
-							<span class="cp_dc_val"></span>
+							<span><em>12,399,900</em>원</span>
+							<span><em>40</em>%</span>
 						</p>
 						<p class="cp_condition">
-							<!--500,000원 이상 구매 시 최대 50,000원 할인
-							<span><em class="tag">99장 보유</em></span>-->
+							500,000원 이상 구매 시 최대 50,000원 할인
+							<span><em class="tag primary_line">99장 보유</em></span>
 						</p>
 					</div>
 					<p class="cp_date">
-						<span class="availStdt"></span>&nbsp;~&nbsp;<span class="availEddt"></span>
+						<span>2021.01.01</span>&nbsp;~&nbsp;<span>2021.12.30</span>
 					</p>
-					<button type="button" class="btn_close_code" onClick="cancelCartCpn()">
-					<span>
-						<i class="ico ico_close1"></i>
-						<em class="sr-only">닫기</em>
-					</span>
-					</button>
-				</div>
-				<div class="info_coupon">
-					<button type="button" id="btn_cpinfo_pop">
-						<span>쿠폰 사용안내</span>
-					</button>
 				</div>
+				<button type="button" class="btn_underline" id="btn_couponInfo_pop">
+					<span>사용안내</span>
+				</button>
 			</div>
 		</div>
-		<div class="area_saleitem">
-
-		</div>
 	</div>
 	<div class="clear"></div>
 	<!-- // CONT-BODY -->
@@ -413,10 +660,7 @@
 	}
 
 	$(document).ready(function() {
-		/*
-		alert("a");
-		
-		let compsList = [];
+		/*let compsList = [];
 		let temp 			= new Object;
 		temp.goodsCd 		= "10770353";
 		temp.optCd 			= "9383682-1";
@@ -428,10 +672,7 @@
 		temp.contentsLoc 	= "G028_YYY";
 		temp.planDtlSq 		= "123";
 		compsList.push(temp);
-		cfnAddCart(compsList);
-		
-		alert("b");
-		*/
+		cfnAddCart(compsList);*/
 		
 		
 		
@@ -990,7 +1231,7 @@
 	}
 
 	//옵션변경 팝업열기
-	function changeCartOptCd(cartSq) {
+	function fnChangeCartOptCd(cartSq) {
 		$.ajax( {
 			type: "POST",
 			url : '/cart/goods/info',
@@ -1004,7 +1245,14 @@
 		});
 	}
 
-	function submitNoMember(cartSq) {
+	// 상품상세 페이지 이동 처리
+	var fnGoToGoodsDetail = function(param) {
+		let goodsCd = $(param).attr('goodsCd');
+		cfnGoToPage(_PAGE_GOODS_DETAIL + goodsCd);
+	}
+
+	// 주문하기
+	function fnSubmitNoMember(cartSq) {
 		if(cartSq == "all") {
 			$("#cartListForm").submit();
 		} else {
@@ -1015,53 +1263,4 @@
 		}
 	}
 </script>
-
-
-
-
-
-<form id="order_info" name="order_info" method="post" action="/order/pay/result/response" ></form>
-<input type="button" id="buyBtn" value="KCP TEST" style="width:100px;height:200px;" />
-<script type="text/javascript">
-	$(document).on("click", "#buyBtn", function() {
-		let orderData = {
-			  pgGb		: "KCP"
-			, payMeans	: "G014_10"
-			, ordNo		: "1"
-			, goodsNm	: "상품 테스트"
-			, payAmt	: "1233"
-			, ordNm		: "이태영"
-			, ordEmail	: "xodud1202@naver.com"
-			, ordTelno	: "02-0000-0000"
-			, ordPhnno	: "010-7111-4489"
-		};
-
-		let jsonData = JSON.stringify(orderData);
-
-		$.ajax( {
-			type		: "POST",
-			url			: '/order/create/preOrder',
-			data		: jsonData,
-			dataType	: 'html',
-			beforeSend : function(xhr, settings) {
-				xhr.setRequestHeader("AJAX"			, "true");
-				xhr.setRequestHeader('Accept'		, 'application/json');
-				xhr.setRequestHeader('Content-Type'	, 'application/json');
-				gagajf.showProgressbar(true);
-			},
-			error : function(e) {
-				alert(3);
-			},
-			success 	: function(result) {
-				// 결재정보로드
-				$("#order_info").html(result);
-				//kcp_AJAX();
-				jsf__pay(document.order_info);
-				//fnKakaoPaymentReady();
-				//fnNaverPaymentReady();
-			}
-		});
-	});
-</script>
-
 </html>

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

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

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

@@ -25,239 +25,237 @@
     <script type="text/javascript" th:src="${@environment.getProperty('pg.kcp.js.url')}" src=""></script>
     <script type="text/javascript" src="/ux/pc/js/payment.js"></script>
 
-    <!--  container -->
-    <div id="container" class="container od">
-        <div class="wrap">
-            <div class="content shopping_bag"> <!-- 페이지특정 클래스 = shop_bag -->
-                <div class="cont_head">
-                    <h2>쇼핑백</h2>
-                    <div class="oder_steps">
-                        <ul>
-                        <li class="on">01 쇼핑백</li>
-                        <li>02 주문/결제</li>
-                        <li>03 주문완료</li>
-                    </ul>
-                </div>
-            </div>
-            <div id="cartAjaxList" class="cont_body">
+	<!--  container -->
+	<div id="container" class="container od">
+		<div class="wrap">
+			<div class="content shopping_bag"> <!-- 페이지특정 클래스 = shop_bag -->
+				<div class="cont_head">
+					<h2>쇼핑백</h2>
+					<div class="oder_steps">
+						<ul>
+							<li class="on">01 쇼핑백</li>
+							<li>02 주문/결제</li>
+							<li>03 주문완료</li>
+						</ul>
+					</div>
+				</div>
+				<div id="cartAjaxList" class="cont_body">
 
-            </div>
-        </div>
-        <div class="content shopping_bag mt100">
-            <div class="cont_head">
-                <h4 class="subH1 t_c mb40">추천상품</h4>
-            </div>
-            <div class="cont_body">
-                <div class="od_recommend">
-                    <div class="swiper-container">
-                        <div class="swiper-wrapper">
-                            <div class="swiper-slide">
-                                <div class="item_prod">
-                                    <div class="item_state">
-                                        <a href="#none" class="itemLink">
-                                            <div class="itemPic">
-                                                <img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod1.jpg">
-                                                <button type="button" class="itemLike">관심상품 추가</button>
-                                            </div>
-                                            <p class="itemBrand">BRAND NAME1</p>
-                                            <div class=" itemName">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
-                                            <p class="itemPrice">80,100
-                                                <span class="itemPrice_original">89,000</span>
-                                                <span class=" itemPercent">10%</span>
-                                            </p>
-                                            <div class="itemcolorchip">
-                                                <span class="chip_color35" value="ABM">BEIGE</span>
-                                                <span class="chip_color54" value="BDS">BLACK</span>
-                                                <span class="chip_color40" value="YBR">WHITE</span>
-                                            </div>
-                                            <div class="itemComment">#주문 폭주 상품</div>
-                                        </a>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="swiper-slide">
-                                <div class="item_prod">
-                                    <div class="item_state">
-                                        <a href="#none" class="itemLink">
-                                            <div class="itemPic">
-                                                <img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod1.jpg">
-                                                <button type="button" class="itemLike">관심상품 추가</button>
-                                            </div>
-                                            <p class="itemBrand">BRAND NAME2</p>
-                                            <div class=" itemName">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
-                                            <p class="itemPrice">80,100
-                                                <span class="itemPrice_original">89,000</span>
-                                                <span class=" itemPercent">10%</span>
-                                            </p>
-                                            <div class="itemcolorchip">
-                                                <span class="chip_color35" value="ABM">BEIGE</span>
-                                                <span class="chip_color54" value="BDS">BLACK</span>
-                                                <span class="chip_color40" value="YBR">WHITE</span>
-                                            </div>
-                                            <div class="itemComment">#주문 폭주 상품</div>
-                                        </a>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="swiper-slide">
-                                <div class="item_prod">
-                                    <div class="item_state">
-                                        <a href="#none" class="itemLink">
-                                            <div class="itemPic">
-                                                <img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod1.jpg">
-                                                <button type="button" class="itemLike">관심상품 추가</button>
-                                            </div>
-                                            <p class="itemBrand">BRAND NAME3</p>
-                                            <div class=" itemName">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
-                                            <p class="itemPrice">80,100
-                                                <span class="itemPrice_original">89,000</span>
-                                                <span class=" itemPercent">10%</span>
-                                            </p>
-                                            <div class="itemcolorchip">
-                                                <span class="chip_color35" value="ABM">BEIGE</span>
-                                                <span class="chip_color54" value="BDS">BLACK</span>
-                                                <span class="chip_color40" value="YBR">WHITE</span>
-                                            </div>
-                                            <div class="itemComment">#주문 폭주 상품</div>
-                                        </a>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="swiper-slide">
-                                <div class="item_prod">
-                                    <div class="item_state">
-                                        <a href="#none" class="itemLink">
-                                            <div class="itemPic">
-                                                <img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod1.jpg">
-                                                <button type="button" class="itemLike">관심상품 추가</button>
-                                            </div>
-                                            <p class="itemBrand">BRAND NAME4</p>
-                                            <div class=" itemName">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
-                                            <p class="itemPrice">80,100
-                                                <span class="itemPrice_original">89,000</span>
-                                                <span class=" itemPercent">10%</span>
-                                            </p>
-                                            <div class="itemcolorchip">
-                                                <span class="chip_color35" value="ABM">BEIGE</span>
-                                                <span class="chip_color54" value="BDS">BLACK</span>
-                                                <span class="chip_color40" value="YBR">WHITE</span>
-                                            </div>
-                                            <div class="itemComment">#주문 폭주 상품</div>
-                                        </a>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="swiper-slide">
-                                <div class="item_prod">
-                                    <div class="item_state">
-                                        <a href="#none" class="itemLink">
-                                            <div class="itemPic">
-                                                <img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod1.jpg">
-                                                <button type="button" class="itemLike">관심상품 추가</button>
-                                            </div>
-                                            <p class="itemBrand">BRAND NAME5</p>
-                                            <div class=" itemName">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
-                                            <p class="itemPrice">80,100
-                                                <span class="itemPrice_original">89,000</span>
-                                                <span class=" itemPercent">10%</span>
-                                            </p>
-                                            <div class="itemcolorchip">
-                                                <span class="chip_color35" value="ABM">BEIGE</span>
-                                                <span class="chip_color54" value="BDS">BLACK</span>
-                                                <span class="chip_color40" value="YBR">WHITE</span>
-                                            </div>
-                                            <div class="itemComment">#주문 폭주 상품</div>
-                                        </a>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="swiper-slide">
-                                <div class="item_prod">
-                                    <div class="item_state">
-                                        <a href="#none" class="itemLink">
-                                            <div class="itemPic">
-                                                <img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod1.jpg">
-                                                <button type="button" class="itemLike">관심상품 추가</button>
-                                            </div>
-                                            <p class="itemBrand">BRAND NAME6</p>
+				</div>
+			</div>
+			<div class="content od_recommend">
+				<div class="cont_head">
+					<h4 class="subH1 t_c mb40">추천상품</h4>
+				</div>
+				<div class="cont_body">
+					<div class="swiper-container">
+						<div class="swiper-wrapper">
+							<div class="swiper-slide">
+								<div class="item_prod">
+									<div class="item_state">
+										<button type="button" class="itemLike">관심상품 추가</button>
+										<a href="#none" class="itemLink">
+											<div class="itemPic">
+												<img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod1.jpg">
+											</div>
+											<p class="itemBrand">BRAND NAME1</p>
+											<div class=" itemName">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
+											<p class="itemPrice">80,100
+												<span class="itemPrice_original">89,000</span>
+												<span class=" itemPercent">10%</span>
+											</p>
+											<div class="itemcolorchip">
+												<span class="chip_color35" value="ABM">BEIGE</span>
+												<span class="chip_color54" value="BDS">BLACK</span>
+												<span class="chip_color40" value="YBR">WHITE</span>
+											</div>
+											<div class="itemComment">#주문 폭주 상품</div>
+										</a>
+									</div>
+								</div>
+							</div>
+							<div class="swiper-slide">
+								<div class="item_prod">
+									<div class="item_state">
+										<button type="button" class="itemLike">관심상품 추가</button>
+										<a href="#none" class="itemLink">
+											<div class="itemPic">
+												<img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod1.jpg">
+											</div>
+											<p class="itemBrand">BRAND NAME2</p>
+											<div class=" itemName">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
+											<p class="itemPrice">80,100
+												<span class="itemPrice_original">89,000</span>
+												<span class=" itemPercent">10%</span>
+											</p>
+											<div class="itemcolorchip">
+												<span class="chip_color35" value="ABM">BEIGE</span>
+												<span class="chip_color54" value="BDS">BLACK</span>
+												<span class="chip_color40" value="YBR">WHITE</span>
+											</div>
+											<div class="itemComment">#주문 폭주 상품</div>
+										</a>
+									</div>
+								</div>
+							</div>
+							<div class="swiper-slide">
+								<div class="item_prod">
+									<div class="item_state">
+										<button type="button" class="itemLike">관심상품 추가</button>
+										<a href="#none" class="itemLink">
+											<div class="itemPic">
+												<img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod1.jpg">
+											</div>
+											<p class="itemBrand">BRAND NAME3</p>
+											<div class=" itemName">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
+											<p class="itemPrice">80,100
+												<span class="itemPrice_original">89,000</span>
+												<span class=" itemPercent">10%</span>
+											</p>
+											<div class="itemcolorchip">
+												<span class="chip_color35" value="ABM">BEIGE</span>
+												<span class="chip_color54" value="BDS">BLACK</span>
+												<span class="chip_color40" value="YBR">WHITE</span>
+											</div>
+											<div class="itemComment">#주문 폭주 상품</div>
+										</a>
+									</div>
+								</div>
+							</div>
+							<div class="swiper-slide">
+								<div class="item_prod">
+									<div class="item_state">
+										<button type="button" class="itemLike">관심상품 추가</button>
+										<a href="#none" class="itemLink">
+											<div class="itemPic">
+												<img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod1.jpg">
+											</div>
+											<p class="itemBrand">BRAND NAME4</p>
+											<div class=" itemName">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
+											<p class="itemPrice">80,100
+												<span class="itemPrice_original">89,000</span>
+												<span class=" itemPercent">10%</span>
+											</p>
+											<div class="itemcolorchip">
+												<span class="chip_color35" value="ABM">BEIGE</span>
+												<span class="chip_color54" value="BDS">BLACK</span>
+												<span class="chip_color40" value="YBR">WHITE</span>
+											</div>
+											<div class="itemComment">#주문 폭주 상품</div>
+										</a>
+									</div>
+								</div>
+							</div>
+							<div class="swiper-slide">
+								<div class="item_prod">
+									<div class="item_state">
+										<button type="button" class="itemLike">관심상품 추가</button>
+										<a href="#none" class="itemLink">
+											<div class="itemPic">
+												<img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod1.jpg">
+											</div>
+											<p class="itemBrand">BRAND NAME5</p>
+											<div class=" itemName">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
+											<p class="itemPrice">80,100
+												<span class="itemPrice_original">89,000</span>
+												<span class=" itemPercent">10%</span>
+											</p>
+											<div class="itemcolorchip">
+												<span class="chip_color35" value="ABM">BEIGE</span>
+												<span class="chip_color54" value="BDS">BLACK</span>
+												<span class="chip_color40" value="YBR">WHITE</span>
+											</div>
+											<div class="itemComment">#주문 폭주 상품</div>
+										</a>
+									</div>
+								</div>
+							</div>
+							<div class="swiper-slide">
+								<div class="item_prod">
+									<div class="item_state">
+										<button type="button" class="itemLike">관심상품 추가</button>
+										<a href="#none" class="itemLink">
+											<div class="itemPic">
+												<img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod1.jpg">
+											</div>
+											<p class="itemBrand">BRAND NAME6</p>
 
-                                            <div class=" itemName">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
-                                            <p class="itemPrice">80,100
-                                                <span class="itemPrice_original">89,000</span>
-                                                <span class=" itemPercent">10%</span>
-                                            </p>
-                                            <div class="itemcolorchip">
-                                                <span class="chip_color35" value="ABM">BEIGE</span>
-                                                <span class="chip_color54" value="BDS">BLACK</span>
-                                                <span class="chip_color40" value="YBR">WHITE</span>
-                                            </div>
-                                            <div class="itemComment">#주문 폭주 상품</div>
-                                        </a>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="swiper-slide">
-                                <div class="item_prod">
-                                    <div class="item_state">
-                                        <a href="#none" class="itemLink">
-                                            <div class="itemPic">
-                                                <img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod1.jpg">
-                                                <button type="button" class="itemLike">관심상품 추가</button>
-                                            </div>
-                                            <p class="itemBrand">BRAND NAME7</p>
+											<div class=" itemName">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
+											<p class="itemPrice">80,100
+												<span class="itemPrice_original">89,000</span>
+												<span class=" itemPercent">10%</span>
+											</p>
+											<div class="itemcolorchip">
+												<span class="chip_color35" value="ABM">BEIGE</span>
+												<span class="chip_color54" value="BDS">BLACK</span>
+												<span class="chip_color40" value="YBR">WHITE</span>
+											</div>
+											<div class="itemComment">#주문 폭주 상품</div>
+										</a>
+									</div>
+								</div>
+							</div>
+							<div class="swiper-slide">
+								<div class="item_prod">
+									<div class="item_state">
+										<button type="button" class="itemLike">관심상품 추가</button>
+										<a href="#none" class="itemLink">
+											<div class="itemPic">
+												<img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod1.jpg">
+											</div>
+											<p class="itemBrand">BRAND NAME7</p>
 
-                                            <div class=" itemName">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
-                                            <p class="itemPrice">80,100
-                                                <span class="itemPrice_original">89,000</span>
-                                                <span class=" itemPercent">10%</span>
-                                            </p>
-                                            <div class="itemcolorchip">
-                                                <span class="chip_color35" value="ABM">BEIGE</span>
-                                                <span class="chip_color54" value="BDS">BLACK</span>
-                                                <span class="chip_color40" value="YBR">WHITE</span>
-                                            </div>
-                                            <div class="itemComment">#주문 폭주 상품</div>
-                                        </a>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="swiper-slide">
-                                <div class="item_prod">
-                                    <div class="item_state">
-                                        <a href="#none" class="itemLink">
-                                            <div class="itemPic">
-                                                <img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod1.jpg">
-                                                <button type="button" class="itemLike">관심상품 추가</button>
-                                            </div>
-                                            <p class="itemBrand">BRAND NAME8</p>
-                                            <div class=" itemName">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
-                                            <p class="itemPrice">80,100
-                                                <span class="itemPrice_original">89,000</span>
-                                                <span class=" itemPercent">10%</span>
-                                            </p>
-                                            <div class="itemcolorchip">
-                                                <span class="chip_color35" value="ABM">BEIGE</span>
-                                                <span class="chip_color54" value="BDS">BLACK</span>
-                                                <span class="chip_color40" value="YBR">WHITE</span>
-                                            </div>
-                                            <div class="itemComment">#주문 폭주 상품</div>
-                                        </a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <!-- Add Pagination -->
-                        <div class="swiper-pagination"></div>
-                    </div>
-                    <!-- Add Arrows -->
-                    <div class="swiper-button-next"></div>
-                    <div class="swiper-button-prev"></div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<!-- // container -->
+											<div class=" itemName">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
+											<p class="itemPrice">80,100
+												<span class="itemPrice_original">89,000</span>
+												<span class=" itemPercent">10%</span>
+											</p>
+											<div class="itemcolorchip">
+												<span class="chip_color35" value="ABM">BEIGE</span>
+												<span class="chip_color54" value="BDS">BLACK</span>
+												<span class="chip_color40" value="YBR">WHITE</span>
+											</div>
+											<div class="itemComment">#주문 폭주 상품</div>
+										</a>
+									</div>
+								</div>
+							</div>
+							<div class="swiper-slide">
+								<div class="item_prod">
+									<div class="item_state">
+										<button type="button" class="itemLike">관심상품 추가</button>
+										<a href="#none" class="itemLink">
+											<div class="itemPic">
+												<img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod1.jpg">
+											</div>
+											<p class="itemBrand">BRAND NAME8</p>
+											<div class=" itemName">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
+											<p class="itemPrice">80,100
+												<span class="itemPrice_original">89,000</span>
+												<span class=" itemPercent">10%</span>
+											</p>
+											<div class="itemcolorchip">
+												<span class="chip_color35" value="ABM">BEIGE</span>
+												<span class="chip_color54" value="BDS">BLACK</span>
+												<span class="chip_color40" value="YBR">WHITE</span>
+											</div>
+											<div class="itemComment">#주문 폭주 상품</div>
+										</a>
+									</div>
+								</div>
+							</div>
+						</div>
+						<!-- Add Pagination -->
+						<div class="swiper-pagination"></div>
+					</div>
+					<!-- Add Arrows -->
+					<div class="swiper-button-next"></div>
+					<div class="swiper-button-prev"></div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<!-- // container -->
 
 <!-- 쿠폰사용안내 팝업 -->
 <div class="modal fade od_pop cpinfo_pop" id="cpinfoPop" tabindex="-1" role="dialog" aria-labelledby="cpinfoLabel" aria-hidden="true">

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

@@ -0,0 +1,345 @@
+<!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  : cartListFormWeb
+ * @desc    : 장바구니
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2020 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.02.02   xodud1202   최초 작성
+ *******************************************************************************
+ -->
+<body>
+
+<th:block layout:fragment="content">
+
+    <!-- payment.js -->
+    <script type="text/javascript" th:src="${@environment.getProperty('pg.kcp.js.url')}" src=""></script>
+    <script type="text/javascript" src="/ux/pc/js/payment.js"></script>
+
+    <!--  container -->
+    <div id="container" class="container od">
+        <div class="wrap">
+            <div class="content shopping_bag"> <!-- 페이지특정 클래스 = shop_bag -->
+                <div class="cont_head">
+                    <h2>쇼핑백</h2>
+                    <div class="oder_steps">
+                        <ul>
+                        <li class="on">01 쇼핑백</li>
+                        <li>02 주문/결제</li>
+                        <li>03 주문완료</li>
+                    </ul>
+                </div>
+            </div>
+            <div id="cartAjaxList" class="cont_body">
+
+            </div>
+        </div>
+        <div class="content shopping_bag mt100">
+            <div class="cont_head">
+                <h4 class="subH1 t_c mb40">추천상품</h4>
+            </div>
+            <div class="cont_body">
+                <div class="od_recommend">
+                    <div class="swiper-container">
+                        <div class="swiper-wrapper">
+                            <div class="swiper-slide">
+                                <div class="item_prod">
+                                    <div class="item_state">
+                                        <a href="#none" class="itemLink">
+                                            <div class="itemPic">
+                                                <img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod1.jpg">
+                                                <button type="button" class="itemLike">관심상품 추가</button>
+                                            </div>
+                                            <p class="itemBrand">BRAND NAME1</p>
+                                            <div class=" itemName">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
+                                            <p class="itemPrice">80,100
+                                                <span class="itemPrice_original">89,000</span>
+                                                <span class=" itemPercent">10%</span>
+                                            </p>
+                                            <div class="itemcolorchip">
+                                                <span class="chip_color35" value="ABM">BEIGE</span>
+                                                <span class="chip_color54" value="BDS">BLACK</span>
+                                                <span class="chip_color40" value="YBR">WHITE</span>
+                                            </div>
+                                            <div class="itemComment">#주문 폭주 상품</div>
+                                        </a>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="swiper-slide">
+                                <div class="item_prod">
+                                    <div class="item_state">
+                                        <a href="#none" class="itemLink">
+                                            <div class="itemPic">
+                                                <img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod1.jpg">
+                                                <button type="button" class="itemLike">관심상품 추가</button>
+                                            </div>
+                                            <p class="itemBrand">BRAND NAME2</p>
+                                            <div class=" itemName">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
+                                            <p class="itemPrice">80,100
+                                                <span class="itemPrice_original">89,000</span>
+                                                <span class=" itemPercent">10%</span>
+                                            </p>
+                                            <div class="itemcolorchip">
+                                                <span class="chip_color35" value="ABM">BEIGE</span>
+                                                <span class="chip_color54" value="BDS">BLACK</span>
+                                                <span class="chip_color40" value="YBR">WHITE</span>
+                                            </div>
+                                            <div class="itemComment">#주문 폭주 상품</div>
+                                        </a>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="swiper-slide">
+                                <div class="item_prod">
+                                    <div class="item_state">
+                                        <a href="#none" class="itemLink">
+                                            <div class="itemPic">
+                                                <img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod1.jpg">
+                                                <button type="button" class="itemLike">관심상품 추가</button>
+                                            </div>
+                                            <p class="itemBrand">BRAND NAME3</p>
+                                            <div class=" itemName">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
+                                            <p class="itemPrice">80,100
+                                                <span class="itemPrice_original">89,000</span>
+                                                <span class=" itemPercent">10%</span>
+                                            </p>
+                                            <div class="itemcolorchip">
+                                                <span class="chip_color35" value="ABM">BEIGE</span>
+                                                <span class="chip_color54" value="BDS">BLACK</span>
+                                                <span class="chip_color40" value="YBR">WHITE</span>
+                                            </div>
+                                            <div class="itemComment">#주문 폭주 상품</div>
+                                        </a>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="swiper-slide">
+                                <div class="item_prod">
+                                    <div class="item_state">
+                                        <a href="#none" class="itemLink">
+                                            <div class="itemPic">
+                                                <img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod1.jpg">
+                                                <button type="button" class="itemLike">관심상품 추가</button>
+                                            </div>
+                                            <p class="itemBrand">BRAND NAME4</p>
+                                            <div class=" itemName">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
+                                            <p class="itemPrice">80,100
+                                                <span class="itemPrice_original">89,000</span>
+                                                <span class=" itemPercent">10%</span>
+                                            </p>
+                                            <div class="itemcolorchip">
+                                                <span class="chip_color35" value="ABM">BEIGE</span>
+                                                <span class="chip_color54" value="BDS">BLACK</span>
+                                                <span class="chip_color40" value="YBR">WHITE</span>
+                                            </div>
+                                            <div class="itemComment">#주문 폭주 상품</div>
+                                        </a>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="swiper-slide">
+                                <div class="item_prod">
+                                    <div class="item_state">
+                                        <a href="#none" class="itemLink">
+                                            <div class="itemPic">
+                                                <img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod1.jpg">
+                                                <button type="button" class="itemLike">관심상품 추가</button>
+                                            </div>
+                                            <p class="itemBrand">BRAND NAME5</p>
+                                            <div class=" itemName">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
+                                            <p class="itemPrice">80,100
+                                                <span class="itemPrice_original">89,000</span>
+                                                <span class=" itemPercent">10%</span>
+                                            </p>
+                                            <div class="itemcolorchip">
+                                                <span class="chip_color35" value="ABM">BEIGE</span>
+                                                <span class="chip_color54" value="BDS">BLACK</span>
+                                                <span class="chip_color40" value="YBR">WHITE</span>
+                                            </div>
+                                            <div class="itemComment">#주문 폭주 상품</div>
+                                        </a>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="swiper-slide">
+                                <div class="item_prod">
+                                    <div class="item_state">
+                                        <a href="#none" class="itemLink">
+                                            <div class="itemPic">
+                                                <img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod1.jpg">
+                                                <button type="button" class="itemLike">관심상품 추가</button>
+                                            </div>
+                                            <p class="itemBrand">BRAND NAME6</p>
+
+                                            <div class=" itemName">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
+                                            <p class="itemPrice">80,100
+                                                <span class="itemPrice_original">89,000</span>
+                                                <span class=" itemPercent">10%</span>
+                                            </p>
+                                            <div class="itemcolorchip">
+                                                <span class="chip_color35" value="ABM">BEIGE</span>
+                                                <span class="chip_color54" value="BDS">BLACK</span>
+                                                <span class="chip_color40" value="YBR">WHITE</span>
+                                            </div>
+                                            <div class="itemComment">#주문 폭주 상품</div>
+                                        </a>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="swiper-slide">
+                                <div class="item_prod">
+                                    <div class="item_state">
+                                        <a href="#none" class="itemLink">
+                                            <div class="itemPic">
+                                                <img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod1.jpg">
+                                                <button type="button" class="itemLike">관심상품 추가</button>
+                                            </div>
+                                            <p class="itemBrand">BRAND NAME7</p>
+
+                                            <div class=" itemName">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
+                                            <p class="itemPrice">80,100
+                                                <span class="itemPrice_original">89,000</span>
+                                                <span class=" itemPercent">10%</span>
+                                            </p>
+                                            <div class="itemcolorchip">
+                                                <span class="chip_color35" value="ABM">BEIGE</span>
+                                                <span class="chip_color54" value="BDS">BLACK</span>
+                                                <span class="chip_color40" value="YBR">WHITE</span>
+                                            </div>
+                                            <div class="itemComment">#주문 폭주 상품</div>
+                                        </a>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="swiper-slide">
+                                <div class="item_prod">
+                                    <div class="item_state">
+                                        <a href="#none" class="itemLink">
+                                            <div class="itemPic">
+                                                <img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod1.jpg">
+                                                <button type="button" class="itemLike">관심상품 추가</button>
+                                            </div>
+                                            <p class="itemBrand">BRAND NAME8</p>
+                                            <div class=" itemName">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
+                                            <p class="itemPrice">80,100
+                                                <span class="itemPrice_original">89,000</span>
+                                                <span class=" itemPercent">10%</span>
+                                            </p>
+                                            <div class="itemcolorchip">
+                                                <span class="chip_color35" value="ABM">BEIGE</span>
+                                                <span class="chip_color54" value="BDS">BLACK</span>
+                                                <span class="chip_color40" value="YBR">WHITE</span>
+                                            </div>
+                                            <div class="itemComment">#주문 폭주 상품</div>
+                                        </a>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <!-- Add Pagination -->
+                        <div class="swiper-pagination"></div>
+                    </div>
+                    <!-- Add Arrows -->
+                    <div class="swiper-button-next"></div>
+                    <div class="swiper-button-prev"></div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- // container -->
+
+<!-- 쿠폰사용안내 팝업 -->
+<div class="modal fade od_pop cpinfo_pop" id="cpinfoPop" tabindex="-1" role="dialog" aria-labelledby="cpinfoLabel" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="cpinfoLabel">쿠폰사용안내</h5>
+            </div>
+            <div class="modal-body">
+                <div class="pop_cont">
+                    쿠폰사용안내 내용입니다.
+                </div>
+            </div>
+            <div class="modal-footer"></div>
+        </div>
+    </div>
+</div>
+<!-- //쿠폰사용안내 팝업 -->
+
+<script src="/ux/pc/js/swiper.min.js"></script>
+<link rel="stylesheet" type="text/css" href="/ux/pc/css/swiper.min.css" />
+
+<script type="text/javascript">
+    $(document).ready(function() {
+        // 장바구니 상품 정보 select
+        getCartList();
+    });
+
+    function getCartList() {
+        // 장바구니 정보 조회
+        $.ajax( {
+            type: "POST",
+            url : '/cart/goods/list',
+            dataType : 'html',
+            success : function(result) {
+                if (result != null) {
+                    $("#cartAjaxList").html(result);
+                }
+            }
+        });
+    }
+
+    //상품옵션변경 팝업 > 수량조절
+    $(document).on('click','.opt_modify_pop .number_count .minus',function(e){
+        var $input = $(this).parent().find('input');
+        var count = parseInt($input.val()) - 1;
+        count = count < 1 ? 1 : count;
+        $input.val(count);
+        $input.change();
+        return false;
+    }).on('click','.opt_modify_pop .number_count .plus',function(e){
+        var $input = $(this).parent().find('input');
+        $input.val(parseInt($input.val()) + 1);
+        $input.change();
+        return false;
+    });
+
+    //상품옵션변경 팝업 > 컬러선택 표기
+    $(document).on('click','.opt_modify_pop .opt_color ul li a',function(e){
+        $(this).parents('.opt_color').find('li a').removeClass('on');
+        $(this).addClass('on');
+        var optColor = $(this).find("img").attr('alt');
+        $(this).parent().parent().parent().find(".color").text(optColor);
+        return false;
+    });
+
+    $(function(){
+        //추천상품 슬라이드
+        var rcmdItemSwiper = new Swiper('.od_recommend .swiper-container', {
+            slidesPerView: 5,
+            spaceBetween: 0,
+            navigation: {
+                nextEl: '.od_recommend .swiper-button-next',
+                prevEl: '.od_recommend .swiper-button-prev',
+            },
+            pagination: {
+                el: '.od_recommend .swiper-pagination',
+                clickable: true,
+            },
+        });
+    });
+</script>
+</th:block>
+</body>
+</html>

src/main/webapp/WEB-INF/views/web/common/fragments/FooterWeb.html

@@ -724,8 +724,8 @@
 					<h3>스타일24 카테고리</h3>
 				</div>
 				<div class="quick_body">
-					<ul class="quick_cate_wrap">
-						<li><a href="javascript:;"><span>홈</span></a></li>
+					<ul class="quick_cate_wrap" id="ulQuickMenuCate">
+						<!-- <li><a href="javascript:;"><span>홈</span></a></li>
 						<li class="has_children">
 							<a href="javascript:;"><span>여성</span></a>
 							<ul class="quick_depth">
@@ -738,7 +738,7 @@
 								<li><a href="javascript:;"><span>트레이닝/스포츠</span></a></li>
 								<li><a href="javascript:;"><span>여성잡화</span></a></li>
 								<li><a href="javascript:;"><span>언더웨어</span></a></li>
-							</ul>   
+							</ul>
 						</li>
 						<li class="has_children">
 							<a href="javascript:;"><span>남성</span></a>
@@ -815,12 +815,13 @@
 							</ul>
 						</li>
 						<li><a href="/"><span>룩북</span></a></li>
-						<li><a href="/"><span>이벤트/혜택</span></a></li>
+						<li><a href="/"><span>이벤트/혜택</span></a></li> -->
 					</ul>
 					<div class="quick_cate_txt">
-						<a href="javascript:;">로그인</a>
-						<a href="javascript:;">회원가입</a>
-						<a href="javascript:;">마이페이지</a>
+						<a th:if="${sessionInfo == null}" href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_LOGIN);">로그인</a>
+						<a th:if="${sessionInfo != null}" href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_LOGOUT);">로그아웃</a>
+						<a th:if="${sessionInfo == null}" href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_CUSTOMER_JOIN_TYPE);">회원가입</a>
+						<a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MYPAGE);">마이페이지</a>
 					</div>
 				</div>
 			</div>
@@ -875,9 +876,58 @@
 				}
 		});
 	}
-		
-	/* familysite */
+	
+	// 퀵메뉴카테고리
+	let fnGetQuickMenuCategory = function(cate1) {
+		let tag = '';
+		if (cate1 != null) {
+			tag += '<li class="has_children">\n';
+			tag += '	<a href="javascript:;"><span>' + cate1.cate1Nm + '</span></a>\n';
+			if (cate1.leafYn == 'N' && cate1.cate2List.length > 0) {
+				tag += '	<ul class="quick_depth">\n';
+				tag += '		<li><a href="javascript:void(0);" onclick="cfnGoToCategoryMain(\'' + cate1.cateGb + '\',\'' + cate1.cate1No + '\');"><span>메인</span></a>\n';
+				tag += '		<li><a href="javascript:void(0);" onclick="cfnGoToItemMain(\'' + cate1.cateGb + '\',\'' + cate1.cate1No + '\');"><span>전체</span></a>\n';
+				$.each(cate1.cate2List, function(idx2, cate2) {
+					tag += '		<li><a href="javascript:void(0);" onclick="cfnGoToItemMain(\'' + cate2.cateGb + '\',\'' + cate2.cate1No + '\',\'' + cate2.cate2No + '\');"><span>' + cate2.cate2Nm + '</span></a>\n';
+				});
+				tag += '	</ul>\n';
+			}
+			tag += '</li>\n';
+		}
+		return tag;
+	}
+	
+	// 퀵메뉴탭 생성
+	let fnCreateQuickMenuTab = function() {
+		$.getJSON('/display/gnb/tab/list'
+			, function(result, status) {
+				if (status == 'success') {
+					if (result.length > 0) {
+						$('#ulQuickMenuCate').html('');
+						$('#ulQuickMenuCate').append('<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MAIN);"><span>홈</span></a></li>\n');
+						
+						let allCate = [[${allCateList}]];
+						$.each(result, function(idx, item) {
+							if (item.contentsType == 'C' || item.contentsType == 'O') { // 컨텐츠유형:카테고리, 아울렛
+								$.each(allCate, function(allCateIdx, allCateItem) {
+									if (item.cate1No == allCateItem.cate1No) {
+										$('#ulQuickMenuCate').append(fnGetQuickMenuCategory(allCateItem));
+									}
+								});
+							} else if (item.contentsType == 'L') { // 컨텐츠유형:링크
+								$('#ulQuickMenuCate').append('<li><a href="' + item.linkUrl + '"><span>' + item.gtabNm + '</span></a></li>');
+							}
+						});
+					}
+				}
+			});
+	}
+	
 	$(document).ready( function() {
+		// 퀵메뉴탭 조회
+		fnCreateQuickMenuTab();
+		
+		// 패미리사이트 조회
 		fnGetFamilySite();
 		
 		// Family Site

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

@@ -169,46 +169,46 @@
 	<script th:inline="javascript">
 		/*<![CDATA[*/
 		// 전체카테고리 조회
-		let allCate;
-		let fnGetAllCategory = function() {
-			$.getJSON('/display/all/cate/list'
-				, function(result, status) {
-					if (status == 'success') {
-						allCate = result;
+// 		let allCate;
+// 		let fnGetAllCategory = function() {
+// 			$.getJSON('/display/all/cate/list'
+// 				, function(result, status) {
+// 					if (status == 'success') {
+// 						allCate = result;
 						
-						// GNB탭 > 브랜드 생성
-						fnCreateGnbBrandGroup();
-					}
-			});
-		}
+// 						// GNB탭 > 브랜드 생성
+// 						fnCreateGnbBrandGroup();
+// 					}
+// 			});
+// 		}
 		
 		// GNB탭 > 카테고리
 		let fnGetGnbCategory = function(cate1) {
 			let tag = '';
 			if (cate1 != null) {
 				tag += '<li class="has_depth">\n'; //depth_menu 있을 시 has_depth 클래스 추가
-				tag += '	<a href="javascript:void(0);" onclick="cfnGoToCategory(' + cate1.cate1Nm + ');">' + cate1.cate1Nm + '</a>\n';
+				tag += '	<a href="javascript:void(0);" onclick="cfnGoToCategoryMain(\'' + cate1.cate1Gb + '\',\'' + cate1.cate1No + '\');">' + cate1.cate1Nm + '</a>\n';
 				tag += '	<div class="depth_menu category">\n';
 				tag += '		<div class="head_category">\n';
 				tag += '			<div class="tit">\n';
 				tag += '				<p>' + cate1.cate1Nm + '</p>\n';
-				tag += '				<a href="javascript:void(0);" onclick="cfnGoToCategory(' + cate1.cate1No + ');" class="more">전체보기</a>\n';
+				tag += '				<a href="javascript:void(0);" onclick="cfnGoToItemMain(\'' + cate1.cate1Gb + '\',\'' + cate1.cate1No + '\');" class="more">전체보기</a>\n';
 				tag += '			</div>\n';
 				if (cate1.leafYn == 'N' && cate1.cate2List.length > 0) {
 					tag += '			<div class="menu">\n';
 					tag += '				<ul class="maintabs">\n';
 					$.each(cate1.cate2List, function(idx2, cate2) {
 						tag += '					<li>\n';
-						tag += '						<a href="javascript:void(0);" onclick="cfnGoToCategoryMain(\'' + cate2.cateGb + '\',\'' + cate2.cate1No + '\',\'' + cate2.cate2No + '\');">' + cate2.cate2Nm + '</a>\n';
-						if (cate2.leafYn == 'N' && cate2.cate3List.length > 0) {
+						tag += '						<a href="javascript:void(0);" onclick="cfnGoToItemMain(\'' + cate2.cateGb + '\',\'' + cate2.cate1No + '\',\'' + cate2.cate2No + '\');">' + cate2.cate2Nm + '</a>\n';
+						if (cate2.leafYn == 'N' && cate2.cate3List != null && cate2.cate3List.length > 0) {
 							tag += '						<ul class="box_depth2">\n';
 							$.each(cate2.cate3List, function(idx3, cate3) {
 								tag += '							<li>\n';
-								tag += '								<a href="javascript:void(0);" onclick="cfnGoToCategoryMain(\'' + cate3.cateGb + '\',\'' + cate3.cate1No + '\',\'' + cate3.cate2No + '\',\'' + cate3.cate3No + '\');">' + cate3.cate3Nm + '</a>\n';
-								if (cate3.leafYn == 'N' && cate3.cate4List.length > 0) {
+								tag += '								<a href="javascript:void(0);" onclick="cfnGoToItemMain(\'' + cate3.cateGb + '\',\'' + cate3.cate1No + '\',\'' + cate3.cate2No + '\',\'' + cate3.cate3No + '\');">' + cate3.cate3Nm + '</a>\n';
+								if (cate3.leafYn == 'N' && cate3.cate4List != null && cate3.cate4List.length > 0) {
 									tag += '								<ul class="box_depth3">\n';
 									$.each(cate3.cate4List, function(idx4, cate4) {
-										tag += '									<li><a href="javascript:void(0);" onclick="cfnGoToCategoryMain(\'' + cate4.cateGb + '\',\'' + cate4.cate1No + '\',\'' + cate4.cate2No + '\',\'' + cate4.cate3No + '\',\'' + cate4.cate4No + '\');">' + cate4.cate4Nm + '</a></li>\n';
+										tag += '									<li><a href="javascript:void(0);" onclick="cfnGoToItemMain(\'' + cate4.cateGb + '\',\'' + cate4.cate1No + '\',\'' + cate4.cate2No + '\',\'' + cate4.cate3No + '\',\'' + cate4.cate4No + '\');">' + cate4.cate4Nm + '</a></li>\n';
 									});
 									tag += '								</ul>\n';
 								}
@@ -264,9 +264,9 @@
 						if (result.length > 0) {
 							$('#divGnbTab').html('');
 							$('#ulGnbTab').html('');
+							
+							let allCate = [[${allCateList}]];
 							$.each(result, function(idx, item) {
-								//console.log(item);
-								
 								if (item.contentsType == 'C' || item.contentsType == 'O') { // 컨텐츠유형:카테고리, 아울렛
 									$.each(allCate, function(allCateIdx, allCateItem) {
 										if (item.cate1No == allCateItem.cate1No) {
@@ -390,8 +390,11 @@
 				},
 			});
 
-			// 전체 카테고리 조회
-			fnGetAllCategory();
+// 			// 전체 카테고리 조회
+// 			fnGetAllCategory();
+			
+			// GNB탭 > 브랜드 생성
+			fnCreateGnbBrandGroup();
 		});
 		/*]]>*/
 	</script>

src/main/webapp/WEB-INF/views/web/common/fragments/HeadWeb.html

@@ -8,16 +8,16 @@
 <!-- 	<meta http-equiv="cache-control" content="no-cache"/> -->
 <!-- 	<meta http-equiv="expires" content="0"/> -->
 <!-- 	<meta http-equiv="pragma" content="no-cache"/> -->
-	<meta name="Title" th:content="${metaBrowserTitle}" content="한세공식몰 스타일24"/>
-	<meta name="description" th:content="${metaOgDesc}" content="한세공식몰,TBJ,FRJ,NBA,NBA KIDS,LPGA,PGATOUR,컬리수,모이몰른,MOIMOLN,리카앤,리바이스키즈,ANDEW,BUCKAROO,나이키키즈"/>
-	<meta name="keywords" th:content="${metaKeywords}" content="한세공식몰,TBJ,FRJ,NBA,NBA KIDS,LPGA,PGATOUR,컬리수,모이몰른,MOIMOLN,리카앤,리바이스키즈,ANDEW,BUCKAROO,나이키키즈"/>
+	<meta name="Title" th:content="${metaInfo.browserTitle}" content="한세공식몰 스타일24"/>
+	<meta name="description" th:content="${metaInfo.ogDesc}" content="한세공식몰,TBJ,FRJ,NBA,NBA KIDS,LPGA,PGATOUR,컬리수,모이몰른,MOIMOLN,리카앤,리바이스키즈,ANDEW,BUCKAROO,나이키키즈"/>
+	<meta name="keywords" th:content="${metaInfo.keywords}" content="한세공식몰,TBJ,FRJ,NBA,NBA KIDS,LPGA,PGATOUR,컬리수,모이몰른,MOIMOLN,리카앤,리바이스키즈,ANDEW,BUCKAROO,나이키키즈"/>
 	<meta property="og:type" content="website"/>
-	<meta property="og:image" th:content="${metaOgImage}" content="/image/web/common/og_style24.png"/>
+	<meta property="og:image" th:content="${metaInfo.ogImage}" content="/image/web/common/og_style24.png"/>
 	<meta property="og:url" th:content="${@environment.getProperty('domain.front')}" content="http://www.style24.com"/>
-	<meta property="og:title" th:content="${metaBrowserTitle}" content="스타일24"/>
-	<meta property="og:description" th:content="${metaOgDesc}" content="한세공식몰,TBJ,FRJ,NBA,NBA KIDS,LPGA,PGATOUR,컬리수,모이몰른,MOIMOLN,리카앤,리바이스키즈,ANDEW,BUCKAROO,나이키키즈"/>
+	<meta property="og:title" th:content="${metaInfo.browserTitle}" content="스타일24"/>
+	<meta property="og:description" th:content="${metaInfo.ogDesc}" content="한세공식몰,TBJ,FRJ,NBA,NBA KIDS,LPGA,PGATOUR,컬리수,모이몰른,MOIMOLN,리카앤,리바이스키즈,ANDEW,BUCKAROO,나이키키즈"/>
 	<meta property="og:locale" content="ko_KR"/>
-	<meta property="og:site_name" th:content="${metaBrowserTitle}" content="한세공식몰 스타일24"/>
+	<meta property="og:site_name" th:content="${metaInfo.browserTitle}" content="한세공식몰 스타일24"/>
 	
 	<!-- 추천솔루션 meta -->
 	<meta property="eg:cuid" content="" />

src/main/webapp/WEB-INF/views/web/goods/GoodsCouponFormWeb.html

@@ -43,7 +43,7 @@
 							<button type="button" class="btn btn_dark btn_block btn_coupon_down"   disabled="disabled"><span>받기완료</span></button>
 							</th:block>
 							<th:block th:unless="${goodsCoupon.custPubLimitQty > 0 and goodsCoupon.custPubLimitQty <= goodsCoupon.custCouponCnt}">
-							<button type="button" class="btn btn_dark btn_block btn_coupon_down" th:attr="cpnId=${goodsCoupon.cpnId}" th:id="${'coupon_'+goodsCoupon.cpnId}" onclick="jfGoodsCouponDown(this);"><span>쿠폰받기</span></button>
+							<button type="button" class="btn btn_dark btn_block btn_coupon_down" th:attr="cpnId=${goodsCoupon.cpnId}" th:id="${'coupon_'+goodsCoupon.cpnId}" onclick="fnGoodsCouponDown(this);"><span>쿠폰받기</span></button>
 							</th:block>
 						</div>
 					</li>
@@ -52,7 +52,7 @@
 		</form>	
 		</div>
 		<div class="modal-footer">
-			<button type="button" class="btn btn_primary btn_all_cpdown" onclick="jfGoodsCouponDownAll();"><span>쿠폰 모두 받기</span></button>
+			<button type="button" class="btn btn_primary btn_all_cpdown" onclick="fnGoodsCouponDownAll();"><span>쿠폰 모두 받기</span></button>
 		</div>
 	</div>
 </div>
@@ -61,18 +61,18 @@
 /*<![CDATA[*/
 
 	// 쿠폰 다운로드
-	var jfGoodsCouponDown = function(obj){
+	var fnGoodsCouponDown = function(obj){
 	
 		if (!cfCheckLogin()) {
 			cfnGoToPage(_PAGE_LOGIN);
 			return false;
 		}
 		
-		var $obj = $(obj);
-		var cpnId = $obj.attr('cpnId');
-		var goodsCd = $('#goodsCouponForm input[name=goodsCd]').val();
+		let $obj = $(obj);
+		let cpnId = $obj.attr('cpnId');
+		let goodsCd = $('#goodsCouponForm input[name=goodsCd]').val();
 		
-		 gagajf.ajaxJsonSubmit(_PAGE_GOODS_CPN_DOWNLOAD, JSON.stringify({goodsCd: goodsCd, cpnId: cpnId}), jfGoodsCouponCallBack);
+		 gagajf.ajaxJsonSubmit(_PAGE_GOODS_CPN_DOWNLOAD, JSON.stringify({goodsCd: goodsCd, cpnId: cpnId}), fnGoodsCouponCallBack);
 		 
 	//쿠폰이 발급되었습니다
 	//죄송합니다. 쿠폰이 모두 소진되었습니다
@@ -80,11 +80,11 @@
 	}
 	
 	// 쿠폰다운로드 콜백
-	var jfGoodsCouponCallBack = function(result){
+	var fnGoodsCouponCallBack = function(result){
 		if (result.status == "200"){
-			var cpnId = result.params.cpnId;
+			let cpnId = result.params.cpnId;
 			if (result.goodsCouponList == null) return;
-			var list = result.goodsCouponList;
+			let list = result.goodsCouponList;
 
 			list.forEach(function(coupon){
 				if (coupon.cpnId == cpnId){
@@ -108,10 +108,10 @@
 	
 	
 	// 쿠폰 전체 다운로드
-	var jfGoodsCouponDownAll = function(){
+	var fnGoodsCouponDownAll = function(){
 		//00개 쿠폰이 발급되었습니다.
-		var couponDownAbleYn = "N";
-		var arrCpnId = [];
+		let couponDownAbleYn = "N";
+		let arrCpnId = [];
 		$('.btn_coupon_down').each(function(){
 			if (!$(this).attr('disabled')){
 				couponDownAbleYn = "Y";
@@ -123,21 +123,21 @@
 			mcxDialog.alert("다운 받을 쿠폰이 없습니다.");
 			return false;
 		}
-		var goodsCd = $('#goodsCouponForm input[name=goodsCd]').val();
-		gagajf.ajaxJsonSubmit(_PAGE_GOODS_CPN_DOWNLOAD, JSON.stringify({goodsCd: goodsCd, arrCpnId: arrCpnId}), jfGoodsCouponDownAllBack);
+		let goodsCd = $('#goodsCouponForm input[name=goodsCd]').val();
+		gagajf.ajaxJsonSubmit(_PAGE_GOODS_CPN_DOWNLOAD, JSON.stringify({goodsCd: goodsCd, arrCpnId: arrCpnId}), fnGoodsCouponDownAllBack);
 		
 	}
 	
 	// 쿠폰 전체 다운로드 콜백
-	var jfGoodsCouponDownAllBack = function(result){
+	var fnGoodsCouponDownAllBack = function(result){
 		if (result.status == "200"){
 			if (result.goodsCouponList == null) return;
-			var list = result.goodsCouponList;
+			let list = result.goodsCouponList;
 
 			list.forEach(function(coupon){
 				$('.btn_coupon_down').each(function(){
 					if (!$(this).attr('disabled')){
-						var cpnId = $(this).attr('cpnId');
+						let cpnId = $(this).attr('cpnId');
 						if (coupon.cpnId == cpnId){
 							if (Number(coupon.custPubLimitQty) > 0){
 								if (Number(coupon.custPubLimitQty) <= Number(coupon.custCouponCnt)){
@@ -161,7 +161,7 @@
 	
 	
 	var jfCouponCheck = function(){
-		var couponDownAbleYn = "N";
+		let couponDownAbleYn = "N";
 		$('.btn_coupon_down').each(function(){
 			if (!$(this).attr('disabled')){
 				couponDownAbleYn = "Y";

src/main/webapp/WEB-INF/views/web/goods/GoodsDeliveryFormWeb.html

@@ -75,7 +75,7 @@
 									배송업체
 								</th>
 								<td>
-									<th:block th:text="${deliveryInfo.shipCompNm}" ></th:block>
+									<th:block th:if="${deliveryInfo != null}" th:text="${deliveryInfo.shipCompNm}" ></th:block>
 								</td>
 							</tr>
 							<tr>
@@ -106,7 +106,7 @@
 									반품/교환 배송업체
 								</th>
 								<td>
-									<th:block th:text="${deliveryInfo.shipCompNm}" ></th:block>
+									<th:block  th:if="${deliveryInfo != null}" th:text="${deliveryInfo.shipCompNm}" ></th:block>
 								</td>
 							</tr>
 							<tr>
@@ -114,7 +114,7 @@
 									반품배송비
 								</th>
 								<td>
-									<th:block th:text="${#numbers.formatInteger(deliveryInfo.rtnDelvFee, 0,'COMMA')}" ></th:block>원(최소 배송비가 무료인 경우 왕복 배송비 <th:block th:text="${#numbers.formatInteger((deliveryInfo.rtnDelvFee+deliveryInfo.delvFee), 0,'COMMA')}" ></th:block>원 부과)
+									<th:block  th:if="${deliveryInfo != null and deliveryInfo.delvFeeCd != null}" th:text="${#numbers.formatInteger(deliveryInfo.rtnDelvFee, 0,'COMMA')}" ></th:block>원(최소 배송비가 무료인 경우 왕복 배송비 <th:block th:if="${deliveryInfo != null and deliveryInfo.delvFeeCd != null}" th:text="${#numbers.formatInteger((deliveryInfo.rtnDelvFee+deliveryInfo.delvFee), 0,'COMMA')}" ></th:block>원 부과)
 								</td>
 							</tr>
 							<tr>
@@ -122,7 +122,7 @@
 									교환배송비
 								</th>
 								<td>
-									<th:block th:text="${#numbers.formatInteger((deliveryInfo.rtnDelvFee+deliveryInfo.delvFee), 0,'COMMA')}" ></th:block>원
+									<th:block  th:if="${deliveryInfo != null and deliveryInfo.delvFeeCd != null}" th:text="${#numbers.formatInteger((deliveryInfo.rtnDelvFee+deliveryInfo.delvFee), 0,'COMMA')}" ></th:block>원
 								</td>
 							</tr>
 							<tr>
@@ -130,7 +130,7 @@
 									반품/교환 주소
 								</th>
 								<td>
-									<th:block th:text="${deliveryInfo.rtnLocZipcode +' '+ deliveryInfo.rtnLocBaseAddr +' '+ deliveryInfo.rtnLocDtlAddr }"></th:block>
+									<th:block th:if="${deliveryInfo != null and deliveryInfo.delvFeeCd != null}" th:text="${deliveryInfo.rtnLocZipcode +' '+ deliveryInfo.rtnLocBaseAddr +' '+ deliveryInfo.rtnLocDtlAddr }"></th:block>
 								</td>
 							</tr>
 							<tr>
@@ -166,11 +166,11 @@
 									신발, 그릇류의 박스포장을 포함, 상품이 판매할 수 없게 훼손 된 경우(신발박스 등의 파손, 박스포장 위 송장 부착, 박스 훼손/파손/찢어짐, 택 분실 등)
 								</td>
 							</tr>
-							<tr th:if="${not #strings.isEmpty(deliveryInfo.note)}">
+							<tr th:if="${deliveryInfo != null and deliveryInfo.delvFeeCd != null}">
 								<th>
 									기타사항
 								</th>
-								<td th:utext="${#strings.unescapeJava(#strings.escapeJava(deliveryInfo.note))}">
+								<td  th:if="${not #strings.isEmpty(deliveryInfo.note)}" th:utext="${#strings.unescapeJava(#strings.escapeJava(deliveryInfo.note))}">
 									상품에 따라 반송주소/방법이 각각 다를 수 있습니다.<br>
 								</td>
 							</tr>
@@ -181,13 +181,9 @@
 		</div>	
 	</div>
 </div>
-<script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
 /*<![CDATA[*/
 	
-	
-	
 /*]]>*/
 </script>
-
  </html>

src/main/webapp/WEB-INF/views/web/goods/GoodsDetailFormWeb.html

@@ -117,7 +117,7 @@
 										<del class="org_price" th:if="${goodsInfo.listPrice > goodsInfo.currPrice}" >
 											<em th:text="${#numbers.formatInteger(goodsInfo.listPrice, 0,'COMMA')}">149,000</em>원
 										</del>
-										<span class="save_point">
+										<span class="save_point" th:if="${goodsInfo.pntAmt > 0}">
 											스타일포인트 <th:block th:text="${#numbers.formatInteger(goodsInfo.pntAmt, 0,'COMMA')}"></th:block>P 적립예정
 										</span>
 										<button type="button" id="btn_saleCoupon_pop" class="btn btn_primary btn_sm btn_coupon"  th:if="${goodsCouponList != null and !goodsCouponList.empty}" th:onclick="cfGoodsCouponInfo([[${goodsInfo.goodsCd}]])"><span>쿠폰받기</span></button>
@@ -161,7 +161,8 @@
 								</dl>
 							</div>
 							<div class="option_box">
-								<th:block th:if="${goodsInfo.selfGoodsYn =='Y' }">
+								<th:block th:if="${goodsInfo.selfGoodsYn =='Y' }"> <!-- 자사상품 -->
+								<th:block th:if="${goodsInfo.goodsType =='G056_N' }">	<!-- 일반상품 -->
 								<div class="opt_color"  th:if="${goodsOption1List != null and !goodsOption1List.empty}" >
 									<div class="opt_header">
 										<span class="title">컬러</span>
@@ -188,12 +189,50 @@
 										<div  th:each="goodsOption2, status : ${goodsOption2List}">
 											<input type="radio" name="opt"  th:id="${goodsOption2.optCd}" th:disabled="${goodsOption2.soldoutYn == 'Y' or goodsOption2.stockQty <= 0}" 
 													th:attr="addPrice=${goodsOption2.addPrice}, optCd1=${goodsOption2.optCd1}, optCd2=${goodsOption2.optCd2}, optCd=${goodsOption2.optCd}">
-											<label th:for="${goodsOption2.optCd}"><span th:text="${goodsOption2.optCd2}" th:onclick="jfViewStock(this, [[${goodsInfo.goodsCd}]],[[${goodsOption2.optCd1}]],[[${goodsOption2.optCd2}]],[[${goodsInfo.minOrdQty}]], [[${goodsInfo.maxOrdQty}]] )">100</span></label>
+											<label th:for="${goodsOption2.optCd}"><span th:text="${goodsOption2.optCd2}" th:onclick="fnViewStock(this, [[${goodsInfo.goodsCd}]],[[${goodsOption2.optCd1}]],[[${goodsOption2.optCd2}]],[[${goodsInfo.minOrdQty}]], [[${goodsInfo.maxOrdQty}]] )">100</span></label>
 										</div>
 									</div>
 								</div>
 								</th:block>
-								<th:block th:if="${goodsInfo.selfGoodsYn =='N' }">
+								<th:block th:if="${goodsInfo.goodsType =='G056_S' }">	<!-- 세트상품 -->
+								<div class="opt_select"  th:if="${goodsComposeList != null and !goodsComposeList.empty}" >
+									<th:block th:each="goodsCompose, status : ${goodsComposeList}">
+									<div class="opt_header">
+										<span class="title" th:text="${goodsCompose.compsGoodsFullNm}">옵션</span>
+										<button type="button" id="btn_infoSize_pop" class="btn_popup" th:onclick="cfGoodsSizeInfo([[${goodsCompose.compsGoodsCd}]],[[${goodsCompose.colorCd}]] )"><span>사이즈정보</span></button>
+									</div>
+									<div class="form_field">
+										<div class="select_custom item_opt1" th:classappend="${goodsCompose.compsGoodsCd}" th:if="${goodsCompose.goodsOption1List != null and !goodsCompose.goodsOption1List.empty}" >
+											<div class="combo">
+												<div class="select">선택</div>
+												<ul class="list">
+													<th:block th:each="goodsOption, status : ${goodsCompose.goodsOption1List}" >
+													<li class="selected" th:id="|selfGoodsOpt1${goodsOption.goodsCd}|" th:if=${status.first}>선택</li> 
+													<li th:onclick="fnOption2(this, [[${goodsOption.goodsCd}]],[[${goodsOption.optCd1}]])">
+														<div th:text="${goodsOption.optCd1}">상품옵션</div>
+														<div th:if="${goodsOption.addPrice > 0}" th:text="|${#numbers.formatInteger(goodsOption.addPrice, 0,'COMMA')}원|">0원</div>
+														<input type="hidden" name="opt"  th:id="${goodsOption.optCd}" th:attr="addPrice=${goodsOption.addPrice}, optCd1=${goodsOption.optCd1},optCd2=${goodsOption.optCd2}, optCd=${goodsOption.optCd}"/>
+													</li>
+													</th:block>
+												</ul>
+											</div>
+										</div>
+									</div>
+									<div class="form_field">
+										<div class="select_custom item_opt2" disabled>
+											<div class="combo">
+												<div class="select">선택</div>
+												<ul class="list">
+													<li class="selected">선택</li> 
+												</ul>
+											</div>
+										</div>
+									</div>
+									</th:block>
+								</div>
+								</th:block>
+								</th:block>
+								<th:block th:if="${goodsInfo.selfGoodsYn =='N' }"> <!--  입점상품 -->
 								<div class="opt_select" th:if="${goodsOptionList != null and !goodsOptionList.empty}">
 									<div class="opt_header">
 											<span class="title">옵션</span>
@@ -206,7 +245,7 @@
 												<ul class="list">
 													<li class="selected" id="selfNoGoodsOpt">선택</li> 
 													<th:block th:each="goodsOption, status : ${goodsOptionList}" >
-													<li th:attr="aria-disabled=${(goodsOption.soldoutYn == 'Y' or goodsOption.stockQty <= 0)? 'true':''}, data-soldout=${(goodsOption.soldoutYn == 'Y' or goodsOption.stockQty <= 0)? 'true':''}" th:onclick="jfViewStock(this, [[${goodsInfo.goodsCd}]],[[${goodsOption.optCd1}]],[[${goodsOption.optCd}]],[[${goodsInfo.minOrdQty}]], [[${goodsInfo.maxOrdQty}]] )">
+													<li th:attr="aria-disabled=${(goodsOption.soldoutYn == 'Y' or goodsOption.stockQty <= 0)? 'true':''}, data-soldout=${(goodsOption.soldoutYn == 'Y' or goodsOption.stockQty <= 0)? 'true':''}" th:onclick="fnViewStock(this, [[${goodsInfo.goodsCd}]],[[${goodsOption.optCd1}]],[[${goodsOption.optCd}]],[[${goodsInfo.minOrdQty}]], [[${goodsInfo.maxOrdQty}]] )">
 														<div th:text="${goodsOption.optNm}">상품옵션</div>
 														<div th:if="${goodsOption.addPrice > 0}" th:text="|${#numbers.formatInteger(goodsOption.addPrice, 0,'COMMA')}원|">0원</div>
 														<input type="hidden" name="opt"  th:id="${goodsOption.optCd}" th:attr="addPrice=${goodsOption.addPrice}, optCd1=${goodsOption.optCd1},optCd2=${goodsOption.optCd2}, optCd=${goodsOption.optCd}"/>
@@ -228,10 +267,10 @@
 										<span class="title">수량</span>
 									</div>
 									<div class="number_count">
-										<span class="minus" onclick="jfAdjustOrderEa(this);" adjust="-"><em class="sr-only">감소</em></a></span>
-										<input type="text" name="cea" maxlength="3" style="ime-mode:disabled" th:value="${goodsInfo.minOrdQty}" onblur="jfChangeOrderEa(this)" data-valid-type="numeric">
+										<span class="minus" onclick="fnAdjustOrderEa(this);" adjust="-"><em class="sr-only">감소</em></a></span>
+										<input type="text" name="cea" maxlength="3" style="ime-mode:disabled" th:value="${goodsInfo.minOrdQty}" onblur="fnChangeOrderEa(this)" data-valid-type="numeric">
 										<input type="hidden" name="coption" value=""   th:attr="price=${goodsInfo.currPrice}">
-										<span class="plus" onclick="jfAdjustOrderEa(this);" adjust="+"><em class="sr-only">추가</em></span>
+										<span class="plus" onclick="fnAdjustOrderEa(this);" adjust="+"><em class="sr-only">추가</em></span>
 									</div>
 								</div>
 							</div>
@@ -284,7 +323,7 @@
 										<!-- 베스트 리뷰 등록시 노출 -->
 										<div class="best_review" th:if="${bestReviewList != null and !bestReviewList.empty}">
 											<th:block th:each="bestReview, status : ${bestReviewList}" th:if="${status.first}">
-											<a href="javascript:void(0);" id="btn_pdBestReview_pop"  th:onclick="cfGoodsReviewDetail([[${goodsInfo.goodsCd}]],'Y',[[${bestReview.reviewSq}]])" >
+											<a href="javascript:void(0);" id="btn_pdBestReview_pop"  th:onclick="cfGoodsReviewDetail([[${goodsInfo.goodsCd}]],'Y', '',[[${bestReview.reviewSq}]])" >
 												<div class="pic" th:if="${bestReview.reviewAttachList != null and !bestReview.reviewAttachList.empty}">
 													<th:block th:each="reviewAttach, attachStatus : ${bestReview.reviewAttachList}" th:if="${attachStatus.first}">
 													<span class="thumb" th:classAppend="${(reviewAttach.fileGb == 'M') ? 'mov' :''}" th:style="${'background-image:url('+imgUrl+ reviewAttach.sysFileNm+');'}"></span><!-- 동영상의 썸네일일 경우 mov 클래스 추가 -->
@@ -459,8 +498,8 @@
 				</div>
 				<!-- //브랜드 노출 -->
 				<!-- 상품필수정보 노출 -->
-				<div class="required_box" th:if="${goodsNotiList != null and !goodsNotiList.empty}">
-					<div class="area_infotbl">
+				<div class="required_box" >
+					<div class="area_infotbl" th:if="${goodsInfo.goodsType == 'G056_N' and goodsNotiList != null and !goodsNotiList.empty}">
 						<span class="title">상품고시정보</span>
 						<div class="tbl type1 mt30">
 							<table>
@@ -473,6 +512,21 @@
 							</table>
 						</div>
 					</div>
+					<div class="area_infotbl" th:if="${goodsInfo.goodsType == 'G056_S' and goodsComposeList != null and !goodsComposeList.empty}">
+						<span class="title">상품고시정보</span>
+						<th:block th:each="goodsCompose, status : ${goodsComposeList}">
+						<div class="tbl type1 mt30">
+							<table>
+								<tbody>
+									<tr  th:each="goodsNoti, status : ${goodsCompose.goodsNotiList}" >
+										<th th:text="${goodsNoti.niItemNm}">스타일</th>
+										<td th:text="${goodsNoti.niContent}">F94U-MD01XA60F0</td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+						</th:block>
+					</div>
 					<div class="area_kcl" th:if="${goodsSafeNo != null}">
 						<i class="ico ico_kcl"></i>
 						<p class="tit normal" th:text="${goodsSafeNo.certDiv}">
@@ -602,7 +656,7 @@
 														</li>
 													</ul>
 												</div>
-												<button type="button" class="btn btn_block btn_md" onclick="jfAddCartLookBookGoods(this);"><span>모두 쇼핑백 담기</span></button>
+												<button type="button" class="btn btn_block btn_md" onclick="fnAddCartLookBookGoods(this);"><span>모두 쇼핑백 담기</span></button>
 											</div>
 										</div>
 									</div>
@@ -628,6 +682,19 @@
 		</div>
 		<!-- // 이 상품과 비슷한 상품 -->
 	</div>
+	<!-- 상품썸네일 크게보기 팝업 -->
+	<div class="pd_pop full_pop pd_itemthumb_pop" id="pdItemThumbPop"> 
+		<div class="full_popup_wrap">
+			<h5 class="sr-only">상품썸네일 크게보기</h5>
+			<div class="btn_close">
+				<a href="" id="btn_close_itemThumbPop">닫기버튼</a>
+			</div>
+			<div class="full_pop_container">
+				<!-- 배송교환반품안내 리스트 내용 -->
+			</div>
+		</div>		
+	</div>
+	<!-- //상품썸네일 크게보기 팝업 -->
 </div>
 
 <!-- EP 제휴쿠폰 팝업 -->
@@ -681,30 +748,30 @@
 		
 	var cateNm = "";
 	// 다다익선 상품
-	var jfGoodsTmtbSearch = function(params) {
+	var fnGoodsTmtbSearch = function(params) {
 		gagajf.ajaxSubmit("/goods/detail/tmtb/frame", "html", "goodsTmtbArea", params);
 	}
 	
 	// 함께본 상품
-	var jfGoodsTogetherSearch = function(params) {
+	var fnGoodsTogetherSearch = function(params) {
 		gagajf.ajaxSubmit("/goods/detail/together/frame", "html", "goodsTogetherbArea", params);
 	}
 	
 	// 추천 상품
-	var jfGoodsRecommendSearch = function(params) {
+	var fnGoodsRecommendSearch = function(params) {
 		gagajf.ajaxSubmit("/goods/detail/recommend/frame", "html", "goodsRecommendbArea", params);
 	}
 	
 	// 비슷한 상품
-	var jfGoodsLikeSearch = function(params) {
+	var fnGoodsLikeSearch = function(params) {
 		gagajf.ajaxSubmit("/goods/detail/like/frame", "html", "goodsLikebArea", params);
 	}
 	
 	//사이즈 클릭시
-	var jfViewStock = function(obj, goodsCd, optCd1, optCd2,  minOrdQty, maxOrdQty) {
-		var $obj = $(obj);
-		var selfGoodsYn = $("#cartForm  input[name=selfGoodsYn]").val();
-		var $target = null;
+	var fnViewStock = function(obj, goodsCd, optCd1, optCd2,  minOrdQty, maxOrdQty) {
+		let $obj = $(obj);
+		let selfGoodsYn = $("#cartForm  input[name=selfGoodsYn]").val();
+		let $target = null;
 		if (selfGoodsYn == "Y"){
 			$target = $obj.parent().parent().children('input[name="opt"]');
 			$target.prop("checked",true);
@@ -713,8 +780,8 @@
 			$target = $obj.children('input[name="opt"]');
 			
 		}
-		var addPrice  = $target.attr("addPrice");
-		var optCd  = $target.attr("optCd");
+		let addPrice  = $target.attr("addPrice");
+		let optCd  = $target.attr("optCd");
 		
 		if (Number(addPrice) > 0) $("#selectOptCd1addPrice").html("(+" + addPrice.addComma() + ")");
 		$("#cartForm  input[name=optCd]").val(optCd);
@@ -724,8 +791,8 @@
 		$("#cartForm  input[name=ordQty]").val("");
 		
 
-		var maxCnt = maxOrdQty;
-		var params = new Object();
+		let maxCnt = maxOrdQty;
+		let params = new Object();
 		params.goodsCd = goodsCd;
 		params.optCd = optCd;
 		params.optCd1 = optCd1;
@@ -733,7 +800,7 @@
 		params.selfGoodsYn = selfGoodsYn;
 
 		$.get("/goods/detail/ajaxGoodsStockQty", $.param(params), function(result) {
-			var itemCnt = eval(result); //해당 아이템에 선택되어진 사이즈의 수량
+			let itemCnt = eval(result); //해당 아이템에 선택되어진 사이즈의 수량
 
 			if (maxCnt > itemCnt) {
 				maxCnt = itemCnt;
@@ -749,14 +816,14 @@
 				$("#cartForm  input[name=cea]").attr("readonly",false);
 				$("#cartForm  input[name=stock]").val(itemCnt);
 
-				jfSetTotalPrice();
+				fnSetTotalPrice();
 			}
 
 		}, "text");
 	}
 	
 	// 수량 변경 클릭
-	var jfAdjustOrderEa = function(obj) {
+	var fnAdjustOrderEa = function(obj) {
 
 		if("G056_N" == $("#cartForm  input[name=goodsType]").val()){
 			if(gagajf.isNull($("#cartForm  input[name=optCd2]").val())){
@@ -773,10 +840,10 @@
 			} */
 		}
 
-		var $obj = $(obj);
-		var $target = $obj.parent().children('input[name="cea"]');
-		var minOrdQty = parseInt($("#cartForm  input[name=minOrdQty]").val());
-		var ea =parseInt($target.val());
+		let $obj = $(obj);
+		let $target = $obj.parent().children('input[name="cea"]');
+		let minOrdQty = parseInt($("#cartForm  input[name=minOrdQty]").val());
+		let ea =parseInt($target.val());
 
 		if ($obj.attr('adjust') == '-') --ea;
 		else ++ea;
@@ -789,11 +856,11 @@
 
 		$target.val(ea);
 
-		jfChangeOrderEa();
+		fnChangeOrderEa();
 	}
 
 	//옵션 갯수 변경
-	var jfChangeOrderEa = function() {
+	var fnChangeOrderEa = function() {
 
 		if("G056_N" == $("#cartForm  input[name=goodsType]").val()){
 			if(gagajf.isNull($("#cartForm  input[name=optCd2]").val())){
@@ -810,11 +877,11 @@
 			} */
 		}
 
-		var f = document.cartForm;
-		var ea = parseInt($("#cartForm  input[name=cea]").val());
-		var buymin = parseInt($("#cartForm  input[name=minOrdQty]").val());
-		var buymax = parseInt($("#cartForm  input[name=maxOrdQty]").val());
-		var alertMsg = '';
+		//let f = document.cartForm;
+		let ea = parseInt($("#cartForm  input[name=cea]").val());
+		let buymin = parseInt($("#cartForm  input[name=minOrdQty]").val());
+		let buymax = parseInt($("#cartForm  input[name=maxOrdQty]").val());
+		let alertMsg = '';
 		if (ea < buymin) {
 			alertMsg ="최소 주문 가능 수량은 "+buymin+"개 입니다.";
 			ea = buymin;
@@ -833,20 +900,20 @@
 			//return;
 		}
 
-		jfSetTotalPrice();
+		fnSetTotalPrice();
 	}
 	
 	//합계 계산
-	var jfSetTotalPrice = function() {
-		var f = document.cartForm;
+	var fnSetTotalPrice = function() {
+		//let f = document.cartForm;
 
-		var totalEa = 0;
-		var totalPrice = 0;
+		let totalEa = 0;
+		let totalPrice = 0;
 
 		$('input[name="cea"]').each(function() {
-			var ea = parseInt($(this).val());
-			var addPrice = parseInt($("#cartForm  input[name=addPrice]").val());
-			var goodsPrice = parseInt($(this).parent().find('input[name="coption"]').attr('price'));
+			let ea = parseInt($(this).val());
+			let addPrice = parseInt($("#cartForm  input[name=addPrice]").val());
+			let goodsPrice = parseInt($(this).parent().find('input[name="coption"]').attr('price'));
 
 			totalEa += ea;
 			if (goodsPrice > 0) {
@@ -865,7 +932,7 @@
 		// 바로구매는 로그인여부 확인
 		if (btnType == "O" && !cfCheckLogin()) {
 			
-			var btn = ["비회원 구매", "로그인후 구매"]; //버튼명[좌,우]
+			let btn = ["비회원 구매", "로그인후 구매"]; //버튼명[좌,우]
 			mcxDialog.confirmC("로그인 후 구매 시 다양한 혜택을 받으실 수 있습니다.", { //내용
 				btn: btn,
 				btnClick: function(index){
@@ -880,8 +947,8 @@
 			return false;
 		}
 		
-		var params = [];
-		var goodsType = $("#cartForm  input[name=goodsType]").val();
+		let params = [];
+		let goodsType = $("#cartForm  input[name=goodsType]").val();
 
 		if (goodsType == 'G056_N'){
 			if (gagajf.isNull($("#cartForm  input[name=optCd2]").val())) {
@@ -889,7 +956,7 @@
 				return;
 			}
 		
-			var obj = new Object();
+			let obj = new Object();
 			obj.goodsCd = $("#cartForm  input[name=goodsCd]").val();
 			obj.optCd = $("#cartForm  input[name=optCd]").val();
 			obj.goodsQty = $("#cartForm  input[name=ordQty]").val();
@@ -935,19 +1002,19 @@
 	}
 
 	// 룩북속 상품 쇼핑백 담기
-	var jfAddCartLookBookGoods = function(obj){
+	var fnAddCartLookBookGoods = function(obj){
 		
-		var $obj = $(obj);
-		var $target = $obj.parent().find('.li_item').find('.item_prod');
-		var btnType = "C";
-		var params = [];
+		let $obj = $(obj);
+		let $target = $obj.parent().find('.li_item').find('.item_prod');
+		let btnType = "C";
+		let params = [];
 		
 		$target.each(function(){
 			if ($(this).hasClass('unable')) {
 				
 			}else{
 				
-				var obj = new Object();
+				let obj = new Object();
 				obj.goodsCd = $(this).attr("goodsCd");
 				obj.optCd = $(this).attr("optCd");
 				obj.goodsQty = $(this).attr("minOrdQty");
@@ -971,8 +1038,8 @@
 	}
 	
 	var jfOptionSoldout = function(){
-		var $target=$("#cartForm").find('.form_field');
-		var soldout = false;
+		let $target=$("#cartForm").find('.form_field');
+		let soldout = false;
 		for(var i=0;i<$target.find('input[name="opt"]').length;i++){
 			
 			if($target.find('input[name="opt"]').eq(i).attr('disabled')) {
@@ -980,8 +1047,8 @@
 			}
 		}
 
-		var goodsType = [[${goodsInfo.goodsType}]];
-		if (soldout && goodsType == 'G056_N') {
+		let goodsType = [[${goodsInfo.goodsType}]];
+		if (soldout && goodsType == 'G056_N'&& $("#cartForm  input[name=goodsGoodsYn]").val() == 'Y') {
 			$(".info_restock").show();
 		}
 	}
@@ -991,7 +1058,7 @@
 		
 		$('.timer_box').css('display', 'none');
 		
-		var params = new Object();
+		let params = new Object();
 		params.goodsCd = [[${params.goodsCd}]];
 		params.viewDt = [[${params.viewDt}]];
 		params.preview = [[${params.preview}]];
@@ -1005,25 +1072,25 @@
 		params.goodsOtherGb = "tmtb";
 		params.ithrCd = "tmtb";
 		params.contentsLoc = "tmtb";
-//		jfGoodsTmtbSearch(params);
+//		fnGoodsTmtbSearch(params);
 		
 		// 함께본 상품(ajax html)
 		params.goodsOtherGb = "together";
 		params.ithrCd = "tmtb";
 		params.contentsLoc = "tmtb";
-		//		jfGoodsTogetherSearch(params);
+		//		fnGoodsTogetherSearch(params);
 		
 		// 추천 상품(ajax html)
 		params.goodsOtherGb = "recommend";
 		params.ithrCd = "tmtb";
 		params.contentsLoc = "tmtb";
-		//		jfGoodsRecommendSearch(params);
+		//		fnGoodsRecommendSearch(params);
 		
 		// 비슷한 상품(ajax html)
 		params.goodsOtherGb = "like";
 		params.ithrCd = "tmtb";
 		params.contentsLoc = "tmtb";
-		//		jfGoodsLikeSearch(params);
+		//		fnGoodsLikeSearch(params);
 	
 		
 		// 상품 대표설명 > 좌측 상품썸네일 navi, 우측 상품정보 고정 
@@ -1107,10 +1174,10 @@
 		/* 1차 옵션선택 후 2차 옵션 활성화 */
 		var opt_selecter01 = new sCombo('.opt_select .select_custom.item_opt1');
 		var opt_selecter02 = new sCombo('.opt_select .select_custom.item_opt2');
-		$('.opt_select .select_custom .combo .list > li').click(function(e) {
-			$(this).parents('.form_field').next('.form_field').find('.select_custom').attr('disabled', false);
-			return false;
-		});
+		//$('.opt_select .select_custom .combo .list > li').click(function(e) {
+		//	$(this).parents('.form_field').next('.form_field').find('.select_custom').attr('disabled', false);
+		//	return false;
+		//});
 		
 		if (!gagajf.isNull([[${goodsInfo.socialSq}]])){
 			$('.timer_box').css('display', 'block');
@@ -1197,13 +1264,17 @@
 		
 		// 광고 스크립트용
 		var goodsNavigation = [[${goodsNavigation}]];
-		
+		var cate1Nm = "";
+		var cate2Nm = "";
+		var cate3Nm = "";
+		var cate4Nm = "";
+		var cate5Nm = "";
 		if (!gagajf.isNull(goodsNavigation)) {
-			var cate1Nm = goodsNavigation.cate1Nm;
-			var cate2Nm = goodsNavigation.cate2Nm;
-			var cate3Nm = goodsNavigation.cate3Nm;
-			var cate4Nm = goodsNavigation.cate4Nm;
-			var cate5Nm = goodsNavigation.cate3Nm;
+			cate1Nm = goodsNavigation.cate1Nm;
+			cate2Nm = goodsNavigation.cate2Nm;
+			cate3Nm = goodsNavigation.cate3Nm;
+			cate4Nm = goodsNavigation.cate4Nm;
+			cate5Nm = goodsNavigation.cate3Nm;
 			
 			if (!gagajf.isNull(cate1Nm)) {
 				cateNm += cate1Nm;

src/main/webapp/WEB-INF/views/web/goods/GoodsInstockAlarmFormWeb.html

@@ -130,8 +130,8 @@
 	
 	var jfInstockAlarm = function(){
 	
-		var optCd2 = "";
-		var optCd = "";
+		let optCd2 = "";
+		let optCd = "";
 		$("#goodsInstockAlarmForm input:radio[name=opt]").each(function(){
 			if ($(this).is(':checked')){
 				optCd2 = $(this).val();

src/main/webapp/WEB-INF/views/web/goods/GoodsQnaDetailFormWeb.html

@@ -74,7 +74,7 @@
 
 	// 상품문의 작성 > 글자수 체크
 	$('.pd_qnawrite_pop .doc_itemqna').keyup(function (e){
-		var contentQna = $(this).val();
+		let contentQna = $(this).val();
 		$('#itemqna_cnt').html("(<em class='c_primary'>"+contentQna.length+"</em>/500자)");  
 		if (contentQna.length > 500){
 			alert("최대 500자까지 입력 가능합니다.");
@@ -114,8 +114,6 @@
 		});
 	
 	});
-	
-
 
 /*]]>*/
 </script>

src/main/webapp/WEB-INF/views/web/goods/GoodsReviewBestFormWeb.html → src/main/webapp/WEB-INF/views/web/goods/GoodsReviewDetailFormWeb.html

@@ -17,7 +17,13 @@
 <div class="modal-dialog" role="document" th:with="imgGoodsUrl=${@environment.getProperty('upload.goods.view')}, imgUrl=${@environment.getProperty('upload.image.view')}">
 	<div class="modal-content">
 		<div class="modal-header">
+			<th:block th:if="${review.bestYn == 'Y'}">
 			<h5 class="modal-title" id="pdBestReviewLabel">베스트 리뷰</h5>
+			</th:block>
+			<th:block th:unless="${review.bestYn == 'Y'}">
+			<h5 class="modal-title" id="pdPhotoReviewDetailLabel">포토/영상 리뷰</h5>
+			<button type="button" id="btn_pdPhotoReviewList_pop" th:onclick="cfGoodsReviewPhoto([[${params.goodsCd}]])"  class="btn_more"><span>전체보기</span></button>
+			</th:block>
 		</div>
 		<div class="modal-body" th:if="${reviewList != null and !reviewList.empty}">
 			<div class="pop_cont">
@@ -136,7 +142,7 @@
 								<div class="thumblist" th:if="${review.reviewAttachList != null and !review.reviewAttachList.empty and #lists.size(review.reviewAttachList) >= 2}">
 									<ul>
 										<li th:each="reviewAttach, attachStatus : ${review.reviewAttachList}">
-											<div class="pic" th:classAppend="${(attachStatus.first) ? 'active' :''}" >><!-- 활성화시 active 클래스 추가 -->
+											<div class="pic" th:classAppend="${(attachStatus.first) ? 'active' :''}" ><!-- 활성화시 active 클래스 추가 -->
 												<span class="thumb" th:classAppend="${(reviewAttach.fileGb == 'M') ? 'mov' :''}"  th:style="${'background-image:url('+imgUrl+ reviewAttach.sysFileNm+');'}" ></span><!-- 동영상의 썸네일일 경우 mov 클래스 추가 -->
 											</div>
 										</li>

src/main/webapp/WEB-INF/views/web/goods/GoodsReviewFormWeb.html

@@ -322,7 +322,7 @@
 					<div class="swiper-wrapper">
 						<div class="swiper-slide" th:each="bestReview, status : ${bestReviewList}" >
 							<div class="best_review">
-								<a href="javascript:void(0);" th:onclick="cfGoodsBestReview([[${goodsInfo.goodsCd}]])" >
+								<a href="javascript:void(0);" th:onclick="cfGoodsReviewDetail([[${goodsInfo.goodsCd}]], 'Y', '', [[${bestReview.reviewSq}]])" >
 									<div class="pic" th:if="${bestReview.reviewAttachList != null and !bestReview.reviewAttachList.empty}">
 										<th:block th:each="reviewAttach, attachStatus : ${bestReview.reviewAttachList}">
 										<span class="thumb" th:classAppend="${(reviewAttach.fileGb == 'M') ? 'mov' :''}" th:style="${'background-image:url('+imgUrl+ reviewAttach.sysFileNm+');'}"></span><!-- 동영상의 썸네일일 경우 mov 클래스 추가 -->
@@ -356,7 +356,7 @@
 							<th:block th:if="${photoReview.reviewAttachList != null and !photoReview.reviewAttachList.empty}">
 							<th:block th:each="reviewAttach, attachStatus : ${photoReview.reviewAttachList}" th:if="${attachStatus.first}">
 							
-							<a href="javascript:void(0);" th:onclick="cfGoodsReviewDetail([[${goodsInfo.goodsCd}]], '', [[${photoReview.reviewSq}]])">
+							<a href="javascript:void(0);" th:onclick="cfGoodsReviewDetail([[${goodsInfo.goodsCd}]], '', 'Y', [[${photoReview.reviewSq}]])">
 								<div class="pic">
 									<span class="thumb" th:classAppend="${(reviewAttach.fileGb == 'M') ? 'mov' :''}" th:style="${'background-image:url('+imgUrl+ reviewAttach.sysFileNm+');'}"></span><!-- 동영상의 썸네일일 경우 mov 클래스 추가 -->
 								</div>
@@ -367,7 +367,7 @@
 						
 					</ul>
 					<!-- 포토영상 게시글 최대 7개 & 버튼노출 -->
-					<th:block th:if="${#lists.size(photoReviewList) >= 8}">
+					<th:block th:if="${#lists.size(photoReviewList) >= 1}"> <!-- 나중에 8로 수정 -->
 					<button type="button" id="btn_more_photoreview" th:onclick="cfGoodsReviewPhoto([[${goodsInfo.goodsCd}]])" ><span>더 보기</span></button>
 					<!-- //포토영상 게시글 최대 7개 & 버튼노출 -->
 					</th:block>
@@ -379,63 +379,68 @@
 			<input type="hidden" name="pageSize" value ="1"/>
 			<input type="hidden" name="goodsCd" th:value ="${goodsInfo.goodsCd}"/>
 			<input type="hidden" name="goodsType" th:value ="${goodsInfo.goodsType}"/>
+			<input type="hidden" name="reviewScore" />
+			<input type="hidden" name="reviewOption" />
+			<input type="hidden" name="reviewHeight" />
+			<input type="hidden" name="reviewWeight" />
+			
 				<h6>전체리뷰<span>(<span id="reviewCount" th:text="${(reviewCount <= 9999) ? #numbers.formatInteger(reviewCount, 0,'COMMA') : '9,999+'}">9,999+</span>)</span></h6>
 				<div class="selection">
 					<div class="form_field">
 						<div class="select_custom sort_opt1">
 							<div class="combo">
-								<div class="select">평점 전체</div>
+								<div class="select">평점 전체<input type="hidden" name="selScore" value=""/></div>
 								<ul class="list" onclick="jfReviewSearch();" >
 									<!-- 선택처리 class="selected" -->
-									<li class="selected" >평점 전체<input type="hidden" name="reviewScore" value=""/></li> 
-									<li>5점&nbsp;&starf;&starf;&starf;&starf;&starf;<input type="hidden" name="reviewScore" value="5"/></li>
-									<li>4점&nbsp;&starf;&starf;&starf;&starf;<input type="hidden" name="reviewScore" value="4" scoreId="4"/></li>
-									<li>3점&nbsp;&starf;&starf;&starf;<input type="hidden" name="reviewScore" value="3"/></li>
-									<li>2점&nbsp;&starf;&starf;<input type="hidden" name="reviewScore" value="2"/></li>
-									<li>1점&nbsp;&starf;<input type="hidden" name="reviewScore" value="1"/></li>
+									<li class="selected" >평점 전체<input type="hidden" name="selScore" value=""/></li> 
+									<li>5점&nbsp;&starf;&starf;&starf;&starf;&starf;<input type="hidden" name="selScore" value="5"/></li>
+									<li>4점&nbsp;&starf;&starf;&starf;&starf;<input type="hidden" name="selScore" value="4" scoreId="4"/></li>
+									<li>3점&nbsp;&starf;&starf;&starf;<input type="hidden" name="selScore" value="3"/></li>
+									<li>2점&nbsp;&starf;&starf;<input type="hidden" name="selScore" value="2"/></li>
+									<li>1점&nbsp;&starf;<input type="hidden" name="selScore" value="1"/></li>
 								</ul>
 							</div>
 						</div>
 						<div class="select_custom sort_opt2" th:if="${reviewOptionList != null and !reviewOptionList.empty}">
 							<div class="combo">
 								<th:block th:if="${(goodsInfo.selfGoodsYn == 'Y')}">
-								<div class="select">사이즈 전체<input type="hidden" name="reviewOption" value=""/></div>
+								<div class="select">사이즈 전체<input type="hidden" name="selOption" value=""/></div>
 								</th:block>
 								<th:block th:unless="${(goodsInfo.selfGoodsYn == 'Y')}">
-								<div class="select">옵션 전체<input type="hidden" name="reviewOption" value=""/></div>
+								<div class="select">옵션 전체<input type="hidden" name="selOption" value=""/></div>
 								</th:block>
-								<ul class="list">
+								<ul class="list" onclick="jfReviewSearch();">
 									<!-- 선택처리 class="selected" -->
 									<li class="selected" th:text="${(goodsInfo.selfGoodsYn == 'Y')? '사이즈 전체' :'옵션 전체'}">사이즈 전체</li> 
 									<li th:each="reviewOption, status : ${reviewOptionList}" >
 									<th:block th:text="${reviewOption.optCd2}"></th:block>
-									<input type="hidden" name="reviewOption" th:value="${reviewOption.optCd2}"/>
+									<input type="hidden" name="selOption" th:value="${reviewOption.optCd2}"/>
 									</li>
 								</ul>
 							</div>
 						</div>
 						<div class="select_custom sort_opt3" th:if="${reviewHeightList != null and !reviewHeightList.empty}">
 							<div class="combo">
-								<div class="select">키 전체<input type="hidden" name="reviewHeight" value=""/></div>
-								<ul class="list">
+								<div class="select">키 전체<input type="hidden" name="selHeight" value=""/></div>
+								<ul class="list" onclick="jfReviewSearch();">
 									<!-- 선택처리 class="selected" -->
-									<li class="selected">키 전체<input type="hidden" name="reviewHeight" value=""/></li> 
+									<li class="selected">키 전체<input type="hidden" name="selHeight" value=""/></li> 
 									<li th:each="reviewHeight, status : ${reviewHeightList}" >
 									<th:block th:text="${reviewHeight.cdNm}"></th:block>
-									<input type="hidden" name="reviewHeight" th:value="${reviewHeight.cd}"/>
+									<input type="hidden" name="selHeight" th:value="${reviewHeight.cd}"/>
 									</li>
 								</ul>
 							</div>
 						</div>
 						<div class="select_custom sort_opt4" th:if="${reviewWeightList != null and !reviewWeightList.empty}">
 							<div class="combo">
-								<div class="select">몸무게 전체<input type="hidden" name="reviewWeight" value=""/></div>
-								<ul class="list">
+								<div class="select">몸무게 전체<input type="hidden" name="selWeight" value=""/></div>
+								<ul class="list" onclick="jfReviewSearch();">
 									<!-- 선택처리 class="selected" -->
-									<li class="selected">몸무게 전체<input type="hidden" name="reviewWeight" value=""/></li> 
+									<li class="selected">몸무게 전체<input type="hidden" name="selWeight" value=""/></li> 
 									<li th:each="reviewWeight, status : ${reviewWeightList}" >
 									<th:block th:text="${reviewWeight.cdNm}"></th:block>
-									<input type="hidden" name="reviewWeight" th:value="${reviewWeight.cd}"/>
+									<input type="hidden" name="selWeight" th:value="${reviewWeight.cd}"/>
 									</li>
 									
 								</ul>
@@ -445,7 +450,7 @@
 				</div>
 				<!-- 나열조건결과 있을 때 노출 내용 -->
 				<div class="review_list">
-					<ul  id="ulGoodsReviewQna">
+					<ul  id="ulGoodsReview">
 					</ul>
 				</div>
 				<div class="ui_row">
@@ -462,7 +467,7 @@
 						</p>
 					</div>
 					<div class="btn_box">
-						<button class="btn btn_default"><span>선택한 조건 초기화</span></button>
+						<button type="button" class="btn btn_default" onclick="jfReviewSearchInit();"><span>선택한 조건 초기화</span></button>
 					</div>
 				</div>
 				<!-- //나열조건결과 없을 때 노출 내용 -->
@@ -490,8 +495,9 @@
 	}
 	
 	var fnGetListCallback = function(result) {
-		$('#ulGoodsReviewQna').html('');
+		$('#ulGoodsReview').html('');
 		$('.nodata').hide();
+		$('.ui_row').show();
 		// 목록
 		if (result.dataList != null && result.dataList.length > 0) {
 			
@@ -570,7 +576,7 @@
 						fileGbClass = '';
 						if (reviewAttach == "M") fileGbClass = "mov";
 				tag += '				<li>\n';
-				tag += '					<a href="javascript:void();" onclick="cfGoodsBestReview(\''+item.goodsCd+'\');">\n';
+				tag += '					<a href="javascript:void();" onclick="cfGoodsReviewDetail(\''+item.goodsCd+'\',\'\', \'Y\',\''+item.reviewSq+'\');">\n';
 				tag += '						<div class="pic">\n';
 				tag += '							<span class="thumb '+ fileGbClass +'" style="background-image:url('+ _imgUrl + reviewAttach.sysFileNm +');"></span>\n'; //<!-- 동영상의 썸네일일 경우 mov 클래스 추가 -->
 				tag += '						</div>\n';
@@ -600,7 +606,7 @@
 				tag += '</div>\n';
 				tag += '</li>\n';
 				
-				$('#ulGoodsReviewQna').append(tag);
+				$('#ulGoodsReview').append(tag);
 			});
 		} else {
 			$('.nodata').show();
@@ -611,10 +617,47 @@
 		gagaPaging.createPagination(result.paging.pageable);
 	}
 	
-	var jfReviewSearch = function(obj){
-		debugger;
-		$obj = $(obj);
+	// 상품평 검색조건 클릭시
+	var jfReviewSearch = function(){
+		let reviewScore = $('#goodsReviewForm').find('.select_custom.sort_opt1').find('.select input[name=selScore]').val();
+		let reviewOption = $('#goodsReviewForm').find('.select_custom.sort_opt2').find('.select input[name=selOption]').val();
+		let reviewHeight = $('#goodsReviewForm').find('.select_custom.sort_opt3').find('.select input[name=selHeight]').val();
+		let reviewWeight = $('#goodsReviewForm').find('.select_custom.sort_opt4').find('.select input[name=selWeight]').val();
+		
+		let changFlag = false;
+		if ($('#goodsReviewForm input[name=reviewScore]').val() != reviewScore){
+			changFlag = true;
+		}else if ($('#goodsReviewForm input[name=reviewOption]').val() != reviewOption){
+			changFlag = true;
+		}else if ($('#goodsReviewForm input[name=reviewHeight]').val() != reviewHeight){
+			changFlag = true;
+		}else if ($('#goodsReviewForm input[name=reviewWeight]').val() != reviewWeight){
+			changFlag = true;
+		}
 		
+		$('#goodsReviewForm input[name=reviewScore]').val(reviewScore);
+		$('#goodsReviewForm input[name=reviewOption]').val(reviewOption);
+		$('#goodsReviewForm input[name=reviewHeight]').val(reviewHeight);
+		$('#goodsReviewForm input[name=reviewWeight]').val(reviewWeight);
+		
+		if (changFlag) fnGetList();
+		
+	}
+	
+	// 상품평 초기화
+	var jfReviewSearchInit = function(){
+		
+		$('#goodsReviewForm').find('.select_custom.sort_opt1').find('.list li').eq(0).trigger('click')
+		$('#goodsReviewForm').find('.select_custom.sort_opt2').find('.list li').eq(0).trigger('click')
+		$('#goodsReviewForm').find('.select_custom.sort_opt3').find('.list li').eq(0).trigger('click')
+		$('#goodsReviewForm').find('.select_custom.sort_opt4').find('.list li').eq(0).trigger('click')
+		
+		$('#goodsReviewForm input[name=reviewScore]').val('');
+		$('#goodsReviewForm input[name=reviewOption]').val('');
+		$('#goodsReviewForm input[name=reviewHeight]').val('');
+		$('#goodsReviewForm input[name=reviewWeight]').val('');
+		
+		fnGetList();
 	}
 	
 	$(document).ready( function() {

src/main/webapp/WEB-INF/views/web/goods/GoodsReviewPhotoDetailFormWeb.html

@@ -1,994 +0,0 @@
-<!DOCTYPE html>
-<html lang="ko"
-	xmlns:th="http://www.thymeleaf.org">
-<!--
- *******************************************************************************
- * @source  : GoodsReviewPhotoDetailFormWeb.html
- * @desc	: 상품평- 포토/영상 리뷰 상세 팝업
- *============================================================================
- * STYLE24
- * Copyright(C) 2020 TSIT, All rights reserved.
- *============================================================================
- * VER  DATE		 AUTHOR	  DESCRIPTION
- * ===  ===========  ==========  =============================================
- * 1.0  2021.03.09   eskim		최초 작성
- *******************************************************************************
- -->
-<div class="modal-dialog" role="document">
-	<div class="modal-content">
-		<div class="modal-header">
-			<h5 class="modal-title" id="pdPhotoReviewDetailLabel">포토/영상 리뷰</h5>
-			<button type="button" id="btn_pdPhotoReviewList_pop" class="btn_more"><span>전체보기</span></button>
-		</div>
-		<div class="modal-body">
-			<div class="pop_cont">
-				<div class="swiper-container detail">
-					<div class="swiper-wrapper">
-						<div class="swiper-slide">
-							<!-- 리뷰내용 -->
-							<div class="review">
-								<div class="pic">
-									<span class="thumb mov"><!-- 동영상의 썸네일일 경우 mov 클래스 추가 -->
-										<video poster="http://cdn.011st.com/11dims/resize/1999x1999/quality/75/11src/review/60101202/3121440803/5ce466b90b46400f860fe083437140ac.jpg" muted="muted" preload="metadata" controls="controls">
-											<source src="http://snsvideo.11st.co.kr/movie/item/www/662/66238860_06_1_C1.mp4" type="video/mp4">
-										</video>
-									</span>
-								</div>
-								<div class="review_cont">
-									<div class="box_wrap">
-										<div class="star_box">
-											<div class="star_score">
-												<span class="star">
-													<em class="progbar" style="width:70%;"></em> <!-- 평점 style로 표기 -->
-												</span>
-											</div>
-										</div>
-										<div class="response_box">
-											<div class="full">
-												<dl>
-													<div>
-														<dt>구매옵션</dt>
-														<dd>베이지 / 100</dd>
-													</div>
-												</dl>
-											</div>
-											<div class="full">
-												<dl>
-													<div>
-														<dt>키/몸무게</dt>
-														<dd>178cm/71kg</dd>
-													</div>
-												</dl>									
-											</div>
-											<div>
-												<dl>
-													<div>
-														<dt>사이즈</dt>
-														<dd>작음</dd>
-													</div>
-													<div>
-														<dt>컬러</dt>
-														<dd>밝음</dd>
-													</div>
-													<div>
-														<dt>핏</dt>
-														<dd>레귤러</dd>
-													</div>
-													<div>
-														<dt>두께감</dt>
-														<dd>적당함</dd>
-													</div>
-												</dl>
-											</div>
-										</div>
-										<div class="txt_review_box">
-											<p>
-												슬림하게 나와서 핏이 더 이쁩니다. 팔 기장도 수선 안해도 될 것 같고 살짝 접어서 코디해도 멋스러울것 같네요. 편하게 간절기 여기저기 코디하기도 좋을것 같고 추천할 만한 아이템 입니다. 광택이 있는데 심하지않고 너무 고급스러워 보여요. 코트안 이너로 입기도 좋고 니트에 걸치면 겨울 잘지낼 수 있을 것 같아요. 편하게 간절기 여기저기 코디하기도 좋고 추천할 만한 아이템입니다.
-											</p>
-										</div>
-										<div class="writer_box">
-											<div class="writer">
-												<span class="wr_id">ab2****</span>
-												<span class="wr_date">2020.07.15</span>
-											</div>
-										</div>
-										<div class="reply_box">
-											<div class="reply">
-												<div class="reply_writer">
-													<span class="wr_name">관리자</span>
-													<span class="wr_date">2020.07.15</span>
-												</div>
-												<div class="reply_txt">
-													<p>
-														안녕하세요, 스타일24 관리자입니다.<br>
-														최대한 검수작업을 하고 있으나, 상품 출고량이 많은 경우 간혹 검수가 누락되는 경우가 있습니다.<br>
-														만약, 받아보시고 문제가 있을 경우 텍 제거하지마시고 고객센터로 접수 해주시면 처리 도와드리겠습니다.<br>
-														구매해주셔서 감사합니다.												 
-													</p>
-												</div>
-											</div>
-										</div>
-									</div>
-								</div>
-							</div>
-							<!-- //리뷰내용 -->
-						</div>
-						<div class="swiper-slide">
-							<!-- 리뷰내용 -->
-							<div class="review">
-								<div class="pic">
-									<span class="thumb">
-										<img src="/images/pc/thumb/tmp_pdLookbook2.jpg" alt="">
-									</span>
-								</div>
-								<div class="review_cont">
-									<div class="box_wrap">
-										<div class="star_box">
-											<div class="star_score">
-												<span class="star">
-													<em class="progbar" style="width:70%;"></em> <!-- 평점 style로 표기 -->
-												</span>
-											</div>
-										</div>
-										<div class="response_box">
-											<div class="full">
-												<dl>
-													<div>
-														<dt>구매옵션</dt>
-														<dd>베이지 / 100</dd>
-													</div>
-												</dl>
-											</div>
-											<div class="full">
-												<dl>
-													<div>
-														<dt>키/몸무게</dt>
-														<dd>178cm/71kg</dd>
-													</div>
-												</dl>									
-											</div>
-											<div>
-												<dl>
-													<div>
-														<dt>사이즈</dt>
-														<dd>작음</dd>
-													</div>
-													<div>
-														<dt>컬러</dt>
-														<dd>밝음</dd>
-													</div>
-													<div>
-														<dt>핏</dt>
-														<dd>레귤러</dd>
-													</div>
-													<div>
-														<dt>두께감</dt>
-														<dd>적당함</dd>
-													</div>
-												</dl>
-											</div>
-										</div>
-										<div class="txt_review_box">
-											<p>
-												슬림하게 나와서 핏이 더 이쁩니다. 팔 기장도 수선 안해도 될 것 같고 살짝 접어서 코디해도 멋스러울것 같네요. 편하게 간절기 여기저기 코디하기도 좋을것 같고 추천할 만한 아이템 입니다. 광택이 있는데 심하지않고 너무 고급스러워 보여요. 코트안 이너로 입기도 좋고 니트에 걸치면 겨울 잘지낼 수 있을 것 같아요. 편하게 간절기 여기저기 코디하기도 좋고 추천할 만한 아이템입니다.
-											</p>
-										</div>
-										<div class="writer_box">
-											<div class="writer">
-												<span class="wr_id">ab2****</span>
-												<span class="wr_date">2020.07.15</span>
-											</div>
-										</div>
-										<div class="reply_box">
-											<div class="reply">
-												<div class="reply_writer">
-													<span class="wr_name">관리자</span>
-													<span class="wr_date">2020.07.15</span>
-												</div>
-												<div class="reply_txt">
-													<p>
-														안녕하세요, 스타일24 관리자입니다.<br>
-														최대한 검수작업을 하고 있으나, 상품 출고량이 많은 경우 간혹 검수가 누락되는 경우가 있습니다.<br>
-														만약, 받아보시고 문제가 있을 경우 텍 제거하지마시고 고객센터로 접수 해주시면 처리 도와드리겠습니다.<br>
-														구매해주셔서 감사합니다.												 
-													</p>
-												</div>
-											</div>
-										</div>
-									</div>
-								</div>
-							</div>
-							<!-- //리뷰내용 -->
-						</div>
-						<div class="swiper-slide">
-							<!-- 리뷰내용 -->
-							<div class="review">
-								<div class="pic">
-									<span class="thumb">
-										<img src="/images/pc/thumb/tmp_pdLookbook1.jpg" alt="">
-									</span>
-								</div>
-								<div class="review_cont">
-									<div class="box_wrap">
-										<div class="star_box">
-											<div class="star_score">
-												<span class="star">
-													<em class="progbar" style="width:70%;"></em> <!-- 평점 style로 표기 -->
-												</span>
-											</div>
-										</div>
-										<div class="response_box">
-											<div class="full">
-												<dl>
-													<div>
-														<dt>구매옵션</dt>
-														<dd>베이지 / 100</dd>
-													</div>
-												</dl>
-											</div>
-											<div class="full">
-												<dl>
-													<div>
-														<dt>키/몸무게</dt>
-														<dd>178cm/71kg</dd>
-													</div>
-												</dl>									
-											</div>
-											<div>
-												<dl>
-													<div>
-														<dt>사이즈</dt>
-														<dd>작음</dd>
-													</div>
-													<div>
-														<dt>컬러</dt>
-														<dd>밝음</dd>
-													</div>
-													<div>
-														<dt>핏</dt>
-														<dd>레귤러</dd>
-													</div>
-													<div>
-														<dt>두께감</dt>
-														<dd>적당함</dd>
-													</div>
-												</dl>
-											</div>
-										</div>
-										<div class="txt_review_box">
-											<p>
-												슬림하게 나와서 핏이 더 이쁩니다. 팔 기장도 수선 안해도 될 것 같고 살짝 접어서 코디해도 멋스러울것 같네요. 편하게 간절기 여기저기 코디하기도 좋을것 같고 추천할 만한 아이템 입니다. 광택이 있는데 심하지않고 너무 고급스러워 보여요. 코트안 이너로 입기도 좋고 니트에 걸치면 겨울 잘지낼 수 있을 것 같아요. 편하게 간절기 여기저기 코디하기도 좋고 추천할 만한 아이템입니다.
-											</p>
-										</div>
-										<div class="writer_box">
-											<div class="writer">
-												<span class="wr_id">ab2****</span>
-												<span class="wr_date">2020.07.15</span>
-											</div>
-										</div>
-										<div class="reply_box">
-											<div class="reply">
-												<div class="reply_writer">
-													<span class="wr_name">관리자</span>
-													<span class="wr_date">2020.07.15</span>
-												</div>
-												<div class="reply_txt">
-													<p>
-														안녕하세요, 스타일24 관리자입니다.<br>
-														최대한 검수작업을 하고 있으나, 상품 출고량이 많은 경우 간혹 검수가 누락되는 경우가 있습니다.<br>
-														만약, 받아보시고 문제가 있을 경우 텍 제거하지마시고 고객센터로 접수 해주시면 처리 도와드리겠습니다.<br>
-														구매해주셔서 감사합니다.												 
-													</p>
-												</div>
-											</div>
-										</div>
-									</div>
-								</div>
-							</div>
-							<!-- //리뷰내용 -->
-						</div>
-						<div class="swiper-slide">
-							<!-- 리뷰내용 -->
-							<div class="review">
-								<div class="pic">
-									<span class="thumb">
-										<img src="/images/pc/thumb/tmp_pdLookbook3.jpg" alt="">
-									</span>
-								</div>
-								<div class="review_cont">
-									<div class="box_wrap">
-										<div class="star_box">
-											<div class="star_score">
-												<span class="star">
-													<em class="progbar" style="width:70%;"></em> <!-- 평점 style로 표기 -->
-												</span>
-											</div>
-										</div>
-										<div class="response_box">
-											<div class="full">
-												<dl>
-													<div>
-														<dt>구매옵션</dt>
-														<dd>베이지 / 100</dd>
-													</div>
-												</dl>
-											</div>
-											<div class="full">
-												<dl>
-													<div>
-														<dt>키/몸무게</dt>
-														<dd>178cm/71kg</dd>
-													</div>
-												</dl>									
-											</div>
-											<div>
-												<dl>
-													<div>
-														<dt>사이즈</dt>
-														<dd>작음</dd>
-													</div>
-													<div>
-														<dt>컬러</dt>
-														<dd>밝음</dd>
-													</div>
-													<div>
-														<dt>핏</dt>
-														<dd>레귤러</dd>
-													</div>
-													<div>
-														<dt>두께감</dt>
-														<dd>적당함</dd>
-													</div>
-												</dl>
-											</div>
-										</div>
-										<div class="txt_review_box">
-											<p>
-												슬림하게 나와서 핏이 더 이쁩니다. 팔 기장도 수선 안해도 될 것 같고 살짝 접어서 코디해도 멋스러울것 같네요. 편하게 간절기 여기저기 코디하기도 좋을것 같고 추천할 만한 아이템 입니다. 광택이 있는데 심하지않고 너무 고급스러워 보여요. 코트안 이너로 입기도 좋고 니트에 걸치면 겨울 잘지낼 수 있을 것 같아요. 편하게 간절기 여기저기 코디하기도 좋고 추천할 만한 아이템입니다.
-											</p>
-										</div>
-										<div class="writer_box">
-											<div class="writer">
-												<span class="wr_id">ab2****</span>
-												<span class="wr_date">2020.07.15</span>
-											</div>
-										</div>
-										<div class="reply_box">
-											<div class="reply">
-												<div class="reply_writer">
-													<span class="wr_name">관리자</span>
-													<span class="wr_date">2020.07.15</span>
-												</div>
-												<div class="reply_txt">
-													<p>
-														안녕하세요, 스타일24 관리자입니다.<br>
-														최대한 검수작업을 하고 있으나, 상품 출고량이 많은 경우 간혹 검수가 누락되는 경우가 있습니다.<br>
-														만약, 받아보시고 문제가 있을 경우 텍 제거하지마시고 고객센터로 접수 해주시면 처리 도와드리겠습니다.<br>
-														구매해주셔서 감사합니다.												 
-													</p>
-												</div>
-											</div>
-										</div>
-									</div>
-								</div>
-							</div>
-							<!-- //리뷰내용 -->
-						</div>
-						<div class="swiper-slide">
-							<!-- 리뷰내용 -->
-							<div class="review">
-								<div class="pic">
-									<span class="thumb">
-										<img src="/images/pc/thumb/tmp_pdLookbook2.jpg" alt="">
-									</span>
-								</div>
-								<div class="review_cont">
-									<div class="box_wrap">
-										<div class="star_box">
-											<div class="star_score">
-												<span class="star">
-													<em class="progbar" style="width:70%;"></em> <!-- 평점 style로 표기 -->
-												</span>
-											</div>
-										</div>
-										<div class="response_box">
-											<div class="full">
-												<dl>
-													<div>
-														<dt>구매옵션</dt>
-														<dd>베이지 / 100</dd>
-													</div>
-												</dl>
-											</div>
-											<div class="full">
-												<dl>
-													<div>
-														<dt>키/몸무게</dt>
-														<dd>178cm/71kg</dd>
-													</div>
-												</dl>									
-											</div>
-											<div>
-												<dl>
-													<div>
-														<dt>사이즈</dt>
-														<dd>작음</dd>
-													</div>
-													<div>
-														<dt>컬러</dt>
-														<dd>밝음</dd>
-													</div>
-													<div>
-														<dt>핏</dt>
-														<dd>레귤러</dd>
-													</div>
-													<div>
-														<dt>두께감</dt>
-														<dd>적당함</dd>
-													</div>
-												</dl>
-											</div>
-										</div>
-										<div class="txt_review_box">
-											<p>
-												슬림하게 나와서 핏이 더 이쁩니다. 팔 기장도 수선 안해도 될 것 같고 살짝 접어서 코디해도 멋스러울것 같네요. 편하게 간절기 여기저기 코디하기도 좋을것 같고 추천할 만한 아이템 입니다. 광택이 있는데 심하지않고 너무 고급스러워 보여요. 코트안 이너로 입기도 좋고 니트에 걸치면 겨울 잘지낼 수 있을 것 같아요. 편하게 간절기 여기저기 코디하기도 좋고 추천할 만한 아이템입니다.
-											</p>
-										</div>
-										<div class="writer_box">
-											<div class="writer">
-												<span class="wr_id">ab2****</span>
-												<span class="wr_date">2020.07.15</span>
-											</div>
-										</div>
-										<div class="reply_box">
-											<div class="reply">
-												<div class="reply_writer">
-													<span class="wr_name">관리자</span>
-													<span class="wr_date">2020.07.15</span>
-												</div>
-												<div class="reply_txt">
-													<p>
-														안녕하세요, 스타일24 관리자입니다.<br>
-														최대한 검수작업을 하고 있으나, 상품 출고량이 많은 경우 간혹 검수가 누락되는 경우가 있습니다.<br>
-														만약, 받아보시고 문제가 있을 경우 텍 제거하지마시고 고객센터로 접수 해주시면 처리 도와드리겠습니다.<br>
-														구매해주셔서 감사합니다.												 
-													</p>
-												</div>
-											</div>
-										</div>
-									</div>
-								</div>
-							</div>
-							<!-- //리뷰내용 -->
-						</div>
-						<div class="swiper-slide">
-							<!-- 리뷰내용 -->
-							<div class="review">
-								<div class="pic">
-									<span class="thumb mov">
-										<img src="/images/pc/thumb/tmp_pdLookbook3.jpg" alt="">
-									</span>
-								</div>
-								<div class="review_cont">
-									<div class="box_wrap">
-										<div class="star_box">
-											<div class="star_score">
-												<span class="star">
-													<em class="progbar" style="width:70%;"></em> <!-- 평점 style로 표기 -->
-												</span>
-											</div>
-										</div>
-										<div class="response_box">
-											<div class="full">
-												<dl>
-													<div>
-														<dt>구매옵션</dt>
-														<dd>베이지 / 100</dd>
-													</div>
-												</dl>
-											</div>
-											<div class="full">
-												<dl>
-													<div>
-														<dt>키/몸무게</dt>
-														<dd>178cm/71kg</dd>
-													</div>
-												</dl>									
-											</div>
-											<div>
-												<dl>
-													<div>
-														<dt>사이즈</dt>
-														<dd>작음</dd>
-													</div>
-													<div>
-														<dt>컬러</dt>
-														<dd>밝음</dd>
-													</div>
-													<div>
-														<dt>핏</dt>
-														<dd>레귤러</dd>
-													</div>
-													<div>
-														<dt>두께감</dt>
-														<dd>적당함</dd>
-													</div>
-												</dl>
-											</div>
-										</div>
-										<div class="txt_review_box">
-											<p>
-												슬림하게 나와서 핏이 더 이쁩니다. 팔 기장도 수선 안해도 될 것 같고 살짝 접어서 코디해도 멋스러울것 같네요. 편하게 간절기 여기저기 코디하기도 좋을것 같고 추천할 만한 아이템 입니다. 광택이 있는데 심하지않고 너무 고급스러워 보여요. 코트안 이너로 입기도 좋고 니트에 걸치면 겨울 잘지낼 수 있을 것 같아요. 편하게 간절기 여기저기 코디하기도 좋고 추천할 만한 아이템입니다.
-											</p>
-										</div>
-										<div class="writer_box">
-											<div class="writer">
-												<span class="wr_id">ab2****</span>
-												<span class="wr_date">2020.07.15</span>
-											</div>
-										</div>
-										<div class="reply_box">
-											<div class="reply">
-												<div class="reply_writer">
-													<span class="wr_name">관리자</span>
-													<span class="wr_date">2020.07.15</span>
-												</div>
-												<div class="reply_txt">
-													<p>
-														안녕하세요, 스타일24 관리자입니다.<br>
-														최대한 검수작업을 하고 있으나, 상품 출고량이 많은 경우 간혹 검수가 누락되는 경우가 있습니다.<br>
-														만약, 받아보시고 문제가 있을 경우 텍 제거하지마시고 고객센터로 접수 해주시면 처리 도와드리겠습니다.<br>
-														구매해주셔서 감사합니다.												 
-													</p>
-												</div>
-											</div>
-										</div>
-									</div>
-								</div>
-							</div>
-							<!-- //리뷰내용 -->
-						</div>
-						<div class="swiper-slide">
-							<!-- 리뷰내용 -->
-							<div class="review">
-								<div class="pic">
-									<span class="thumb">
-										<img src="/images/pc/thumb/tmp_pdLookbook2.jpg" alt="">
-									</span>
-								</div>
-								<div class="review_cont">
-									<div class="box_wrap">
-										<div class="star_box">
-											<div class="star_score">
-												<span class="star">
-													<em class="progbar" style="width:70%;"></em> <!-- 평점 style로 표기 -->
-												</span>
-											</div>
-										</div>
-										<div class="response_box">
-											<div class="full">
-												<dl>
-													<div>
-														<dt>구매옵션</dt>
-														<dd>베이지 / 100</dd>
-													</div>
-												</dl>
-											</div>
-											<div class="full">
-												<dl>
-													<div>
-														<dt>키/몸무게</dt>
-														<dd>178cm/71kg</dd>
-													</div>
-												</dl>									
-											</div>
-											<div>
-												<dl>
-													<div>
-														<dt>사이즈</dt>
-														<dd>작음</dd>
-													</div>
-													<div>
-														<dt>컬러</dt>
-														<dd>밝음</dd>
-													</div>
-													<div>
-														<dt>핏</dt>
-														<dd>레귤러</dd>
-													</div>
-													<div>
-														<dt>두께감</dt>
-														<dd>적당함</dd>
-													</div>
-												</dl>
-											</div>
-										</div>
-										<div class="txt_review_box">
-											<p>
-												슬림하게 나와서 핏이 더 이쁩니다. 팔 기장도 수선 안해도 될 것 같고 살짝 접어서 코디해도 멋스러울것 같네요. 편하게 간절기 여기저기 코디하기도 좋을것 같고 추천할 만한 아이템 입니다. 광택이 있는데 심하지않고 너무 고급스러워 보여요. 코트안 이너로 입기도 좋고 니트에 걸치면 겨울 잘지낼 수 있을 것 같아요. 편하게 간절기 여기저기 코디하기도 좋고 추천할 만한 아이템입니다.
-											</p>
-										</div>
-										<div class="writer_box">
-											<div class="writer">
-												<span class="wr_id">ab2****</span>
-												<span class="wr_date">2020.07.15</span>
-											</div>
-										</div>
-										<div class="reply_box">
-											<div class="reply">
-												<div class="reply_writer">
-													<span class="wr_name">관리자</span>
-													<span class="wr_date">2020.07.15</span>
-												</div>
-												<div class="reply_txt">
-													<p>
-														안녕하세요, 스타일24 관리자입니다.<br>
-														최대한 검수작업을 하고 있으나, 상품 출고량이 많은 경우 간혹 검수가 누락되는 경우가 있습니다.<br>
-														만약, 받아보시고 문제가 있을 경우 텍 제거하지마시고 고객센터로 접수 해주시면 처리 도와드리겠습니다.<br>
-														구매해주셔서 감사합니다.												 
-													</p>
-												</div>
-											</div>
-										</div>
-									</div>
-								</div>
-							</div>
-							<!-- //리뷰내용 -->
-						</div>
-						<div class="swiper-slide">
-							<!-- 리뷰내용 -->
-							<div class="review">
-								<div class="pic">
-									<span class="thumb">
-										<img src="/images/pc/thumb/tmp_pdLookbook1.jpg" alt="">
-									</span>
-								</div>
-								<div class="review_cont">
-									<div class="box_wrap">
-										<div class="star_box">
-											<div class="star_score">
-												<span class="star">
-													<em class="progbar" style="width:70%;"></em> <!-- 평점 style로 표기 -->
-												</span>
-											</div>
-										</div>
-										<div class="response_box">
-											<div class="full">
-												<dl>
-													<div>
-														<dt>구매옵션</dt>
-														<dd>베이지 / 100</dd>
-													</div>
-												</dl>
-											</div>
-											<div class="full">
-												<dl>
-													<div>
-														<dt>키/몸무게</dt>
-														<dd>178cm/71kg</dd>
-													</div>
-												</dl>									
-											</div>
-											<div>
-												<dl>
-													<div>
-														<dt>사이즈</dt>
-														<dd>작음</dd>
-													</div>
-													<div>
-														<dt>컬러</dt>
-														<dd>밝음</dd>
-													</div>
-													<div>
-														<dt>핏</dt>
-														<dd>레귤러</dd>
-													</div>
-													<div>
-														<dt>두께감</dt>
-														<dd>적당함</dd>
-													</div>
-												</dl>
-											</div>
-										</div>
-										<div class="txt_review_box">
-											<p>
-												슬림하게 나와서 핏이 더 이쁩니다. 팔 기장도 수선 안해도 될 것 같고 살짝 접어서 코디해도 멋스러울것 같네요. 편하게 간절기 여기저기 코디하기도 좋을것 같고 추천할 만한 아이템 입니다. 광택이 있는데 심하지않고 너무 고급스러워 보여요. 코트안 이너로 입기도 좋고 니트에 걸치면 겨울 잘지낼 수 있을 것 같아요. 편하게 간절기 여기저기 코디하기도 좋고 추천할 만한 아이템입니다.
-											</p>
-										</div>
-										<div class="writer_box">
-											<div class="writer">
-												<span class="wr_id">ab2****</span>
-												<span class="wr_date">2020.07.15</span>
-											</div>
-										</div>
-										<div class="reply_box">
-											<div class="reply">
-												<div class="reply_writer">
-													<span class="wr_name">관리자</span>
-													<span class="wr_date">2020.07.15</span>
-												</div>
-												<div class="reply_txt">
-													<p>
-														안녕하세요, 스타일24 관리자입니다.<br>
-														최대한 검수작업을 하고 있으나, 상품 출고량이 많은 경우 간혹 검수가 누락되는 경우가 있습니다.<br>
-														만약, 받아보시고 문제가 있을 경우 텍 제거하지마시고 고객센터로 접수 해주시면 처리 도와드리겠습니다.<br>
-														구매해주셔서 감사합니다.												 
-													</p>
-												</div>
-											</div>
-										</div>
-									</div>
-								</div>
-							</div>
-							<!-- //리뷰내용 -->
-						</div>
-						<div class="swiper-slide">
-							<!-- 리뷰내용 -->
-							<div class="review">
-								<div class="pic">
-									<span class="thumb">
-										<img src="/images/pc/thumb/tmp_pdLookbook3.jpg" alt="">
-									</span>
-								</div>
-								<div class="review_cont">
-									<div class="box_wrap">
-										<div class="star_box">
-											<div class="star_score">
-												<span class="star">
-													<em class="progbar" style="width:70%;"></em> <!-- 평점 style로 표기 -->
-												</span>
-											</div>
-										</div>
-										<div class="response_box">
-											<div class="full">
-												<dl>
-													<div>
-														<dt>구매옵션</dt>
-														<dd>베이지 / 100</dd>
-													</div>
-												</dl>
-											</div>
-											<div class="full">
-												<dl>
-													<div>
-														<dt>키/몸무게</dt>
-														<dd>178cm/71kg</dd>
-													</div>
-												</dl>									
-											</div>
-											<div>
-												<dl>
-													<div>
-														<dt>사이즈</dt>
-														<dd>작음</dd>
-													</div>
-													<div>
-														<dt>컬러</dt>
-														<dd>밝음</dd>
-													</div>
-													<div>
-														<dt>핏</dt>
-														<dd>레귤러</dd>
-													</div>
-													<div>
-														<dt>두께감</dt>
-														<dd>적당함</dd>
-													</div>
-												</dl>
-											</div>
-										</div>
-										<div class="txt_review_box">
-											<p>
-												슬림하게 나와서 핏이 더 이쁩니다. 팔 기장도 수선 안해도 될 것 같고 살짝 접어서 코디해도 멋스러울것 같네요. 편하게 간절기 여기저기 코디하기도 좋을것 같고 추천할 만한 아이템 입니다. 광택이 있는데 심하지않고 너무 고급스러워 보여요. 코트안 이너로 입기도 좋고 니트에 걸치면 겨울 잘지낼 수 있을 것 같아요. 편하게 간절기 여기저기 코디하기도 좋고 추천할 만한 아이템입니다.
-											</p>
-										</div>
-										<div class="writer_box">
-											<div class="writer">
-												<span class="wr_id">ab2****</span>
-												<span class="wr_date">2020.07.15</span>
-											</div>
-										</div>
-										<div class="reply_box">
-											<div class="reply">
-												<div class="reply_writer">
-													<span class="wr_name">관리자</span>
-													<span class="wr_date">2020.07.15</span>
-												</div>
-												<div class="reply_txt">
-													<p>
-														안녕하세요, 스타일24 관리자입니다.<br>
-														최대한 검수작업을 하고 있으나, 상품 출고량이 많은 경우 간혹 검수가 누락되는 경우가 있습니다.<br>
-														만약, 받아보시고 문제가 있을 경우 텍 제거하지마시고 고객센터로 접수 해주시면 처리 도와드리겠습니다.<br>
-														구매해주셔서 감사합니다.												 
-													</p>
-												</div>
-											</div>
-										</div>
-									</div>
-								</div>
-							</div>
-							<!-- //리뷰내용 -->
-						</div>
-						<div class="swiper-slide">
-							<!-- 리뷰내용 -->
-							<div class="review">
-								<div class="pic">
-									<span class="thumb">
-										<img src="/images/pc/thumb/tmp_pdLookbook2.jpg" alt="">
-									</span>
-								</div>
-								<div class="review_cont">
-									<div class="box_wrap">
-										<div class="star_box">
-											<div class="star_score">
-												<span class="star">
-													<em class="progbar" style="width:70%;"></em> <!-- 평점 style로 표기 -->
-												</span>
-											</div>
-										</div>
-										<div class="response_box">
-											<div class="full">
-												<dl>
-													<div>
-														<dt>구매옵션</dt>
-														<dd>베이지 / 100</dd>
-													</div>
-												</dl>
-											</div>
-											<div class="full">
-												<dl>
-													<div>
-														<dt>키/몸무게</dt>
-														<dd>178cm/71kg</dd>
-													</div>
-												</dl>									
-											</div>
-											<div>
-												<dl>
-													<div>
-														<dt>사이즈</dt>
-														<dd>작음</dd>
-													</div>
-													<div>
-														<dt>컬러</dt>
-														<dd>밝음</dd>
-													</div>
-													<div>
-														<dt>핏</dt>
-														<dd>레귤러</dd>
-													</div>
-													<div>
-														<dt>두께감</dt>
-														<dd>적당함</dd>
-													</div>
-												</dl>
-											</div>
-										</div>
-										<div class="txt_review_box">
-											<p>
-												슬림하게 나와서 핏이 더 이쁩니다. 팔 기장도 수선 안해도 될 것 같고 살짝 접어서 코디해도 멋스러울것 같네요. 편하게 간절기 여기저기 코디하기도 좋을것 같고 추천할 만한 아이템 입니다. 광택이 있는데 심하지않고 너무 고급스러워 보여요. 코트안 이너로 입기도 좋고 니트에 걸치면 겨울 잘지낼 수 있을 것 같아요. 편하게 간절기 여기저기 코디하기도 좋고 추천할 만한 아이템입니다.
-											</p>
-										</div>
-										<div class="writer_box">
-											<div class="writer">
-												<span class="wr_id">ab2****</span>
-												<span class="wr_date">2020.07.15</span>
-											</div>
-										</div>
-										<div class="reply_box">
-											<div class="reply">
-												<div class="reply_writer">
-													<span class="wr_name">관리자</span>
-													<span class="wr_date">2020.07.15</span>
-												</div>
-												<div class="reply_txt">
-													<p>
-														안녕하세요, 스타일24 관리자입니다.<br>
-														최대한 검수작업을 하고 있으나, 상품 출고량이 많은 경우 간혹 검수가 누락되는 경우가 있습니다.<br>
-														만약, 받아보시고 문제가 있을 경우 텍 제거하지마시고 고객센터로 접수 해주시면 처리 도와드리겠습니다.<br>
-														구매해주셔서 감사합니다.												 
-													</p>
-												</div>
-											</div>
-										</div>
-									</div>
-								</div>
-							</div>
-							<!-- //리뷰내용 -->
-						</div>				
-					</div>
-				</div>
-				<div class="swiper-button-next"></div>
-				<div class="swiper-button-prev"></div>
-				<!-- 리뷰 썸네일 리스트 -->
-				<div class="swiper-container thumblist">
-					<div class="swiper-wrapper">
-						<div class="swiper-slide">
-							<div class="pic">
-								<span class="thumb mov" style="background-image:url('http://cdn.011st.com/11dims/resize/1999x1999/quality/75/11src/review/60101202/3121440803/5ce466b90b46400f860fe083437140ac.jpg');"></span><!-- 동영상의 썸네일일 경우 mov 클래스 추가 -->
-							</div>
-						</div>
-						<div class="swiper-slide">
-							<div class="pic">
-								<span class="thumb" style="background-image:url('/images/pc/thumb/tmp_pdLookbook2.jpg');"></span>
-							</div>
-						</div>
-						<div class="swiper-slide">
-							<div class="pic">
-								<span class="thumb" style="background-image:url('/images/pc/thumb/tmp_pdLookbook1.jpg');"></span>
-							</div>
-						</div>
-						<div class="swiper-slide">
-							<div class="pic">
-								<span class="thumb" style="background-image:url('/images/pc/thumb/tmp_pdLookbook3.jpg');"></span>
-							</div>
-						</div>
-						<div class="swiper-slide">
-							<div class="pic">
-								<span class="thumb" style="background-image:url('/images/pc/thumb/tmp_pdLookbook2.jpg');"></span>
-							</div>
-						</div>
-						<div class="swiper-slide">
-							<div class="pic">
-								<span class="thumb" style="background-image:url('/images/pc/thumb/tmp_pdLookbook3.jpg');"></span>
-							</div>
-						</div>
-						<div class="swiper-slide">
-							<div class="pic">
-								<span class="thumb" style="background-image:url('/images/pc/thumb/tmp_pdLookbook2.jpg');"></span>
-							</div>
-						</div>
-						<div class="swiper-slide">
-							<div class="pic">
-								<span class="thumb" style="background-image:url('/images/pc/thumb/tmp_pdLookbook1.jpg');"></span>
-							</div>
-						</div>
-						<div class="swiper-slide">
-							<div class="pic">
-								<span class="thumb" style="background-image:url('/images/pc/thumb/tmp_pdLookbook3.jpg');"></span>
-							</div>
-						</div>
-						<div class="swiper-slide">
-							<div class="pic">
-								<span class="thumb" style="background-image:url('/images/pc/thumb/tmp_pdLookbook2.jpg');"></span>
-							</div>
-						</div>						  
-					</div>
-					<div class="swiper-scrollbar"></div>
-				</div>
-				<!-- //리뷰 썸네일 리스트 -->
-			</div>
-		</div>
-	</div>
-</div>
-<a href="javascript:void(0);" rel="modal:close" onclick="cfCloseLayer('layer_review_photo_detail')" class="close-modal">Close</a>
-<script th:inline="javascript">
-/*<![CDATA[*/
-	 //슬라이드 - 상품 포토/영상 리뷰 썸네일리스트 영역 
-    var photoReviewListSwiper = new Swiper('.pd_photoreviewdetail_pop .swiper-container.thumblist', {
-        slidesPerView: 'auto',
-        spaceBetween: 8,
-        freeMode: true,
-        grabCursor: true,
-        watchSlidesVisibility: true,
-        watchSlidesProgress: true,
-        scrollbar: {el: '.pd_photoreviewdetail_pop .swiper-container.thumblist .swiper-scrollbar'},
-    }); 
-
-    //슬라이드 - 상품 포토/영상 리뷰 자세히보기 영역 
-    var photoReviewDetailSwiper = new Swiper('.pd_photoreviewdetail_pop .swiper-container.detail', {
-        effect :'fade',
-        slidesPerView: 1,
-        spaceBetween: 0,
-        simulateTouch:false,
-        navigation: {
-            nextEl: '.pd_photoreviewdetail_pop .swiper-button-next',
-            prevEl: '.pd_photoreviewdetail_pop .swiper-button-prev',
-        },
-        thumbs: {
-            swiper: photoReviewListSwiper
-        }
-    });
-/*]]>*/
-</script>	
- </html>

src/main/webapp/WEB-INF/views/web/goods/GoodsReviewPhotoFormWeb.html

@@ -22,7 +22,7 @@
 		<div class="modal-body">
 			<div class="pop_cont">
 				<div class="photo_list">
-					<ul>
+					<ul id="ulGoodsReviewPhoto">
 						<li>
 							<a href="">
 								<div class="pic">
@@ -30,100 +30,80 @@
 								</div>
 							</a>
 						</li>
-						<li>
-							<a href="">
-								<div class="pic">
-									<span class="thumb mov" style="background-image:url('/images/pc/thumb/tmp_pdLookbook2.jpg');"></span><!-- 동영상의 썸네일일 경우 mov 클래스 추가 -->
-								</div>
-							</a>
-						</li>
-						<li>
-							<a href="">
-								<div class="pic">
-									<span class="thumb" style="background-image:url('/images/pc/thumb/tmp_pdDetail4.jpg');"></span>
-								</div>
-							</a>
-						</li>
-						<li>
-							<a href="">
-								<div class="pic">
-									<span class="thumb" style="background-image:url('/images/pc/thumb/tmp_pdDetail4.jpg');"></span>
-								</div>
-							</a>
-						</li>
-						<li>
-							<a href="">
-								<div class="pic">
-									<span class="thumb" style="background-image:url('/images/pc/thumb/tmp_pdDetail4.jpg');"></span>
-								</div>
-							</a>
-						</li>
-						<li>
-							<a href="">
-								<div class="pic">
-									<span class="thumb" style="background-image:url('/images/pc/thumb/tmp_pdDetail4.jpg');"></span>
-								</div>
-							</a>
-						</li>
-						<li>
-							<a href="">
-								<div class="pic">
-									<span class="thumb" style="background-image:url('/images/pc/thumb/tmp_pdDetail4.jpg');"></span>
-								</div>
-							</a>
-						</li>
-						<li>
-							<a href="">
-								<div class="pic">
-									<span class="thumb" style="background-image:url('/images/pc/thumb/tmp_pdDetail4.jpg');"></span>
-								</div>
-							</a>
-						</li>
-						<li>
-							<a href="">
-								<div class="pic">
-									<span class="thumb" style="background-image:url('/images/pc/thumb/tmp_pdDetail4.jpg');"></span>
-								</div>
-							</a>
-						</li>
-						<li>
-							<a href="">
-								<div class="pic">
-									<span class="thumb" style="background-image:url('/images/pc/thumb/tmp_pdDetail4.jpg');"></span>
-								</div>
-							</a>
-						</li>
 					</ul>
 				</div>
 				<div class="ui_row">
-					<ul class="pageNav">
-						<li class="disabled"><a href="#">«</a></li>
-						<li class="prev disabled"><a href="#">‹</a></li>
-						<li><a href="#">1</a></li>
-						<li class="active"><a href="#">2</a></li>
-						<li><a href="#">3</a></li>
-						<li><a href="#">4</a></li>
-						<li><a href="#">5</a></li>
-						<li><a href="#">6</a></li>
-						<li><a href="#">7</a></li>
-						<li><a href="#">8</a></li>
-						<li><a href="#">9</a></li>
-						<li><a href="#">10</a></li>
-						<li class="next"><a href="#">›</a></li>
-						<li><a href="#">»</a></li>
+					<ul class="pageNav"  id="reviewPhtoPageNav">
 					</ul>
 				</div>
 			</div>
 		</div>
 	<!-- 포토영상 리뷰 자세히보기 팝업 내용 -->
 	</div>
+	<form id="goodsReviewPhotoForm" name="goodsReviewPhotoForm" action="#" th:action="@{'/goods/review/list'}">
+		<input type="hidden" name="pageNo" value ="1"/>
+		<input type="hidden" name="pageSize" value ="1"/>
+		<input type="hidden" name="photoYn" value ="Y"/>
+		<input type="hidden" name="goodsCd" th:value ="${params.goodsCd}"/>
+	</form>
 </div>
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <a href="javascript:void(0);" rel="modal:close" onclick="cfCloseLayer('layer_review_photo')" class="close-modal">Close</a>
 <script th:inline="javascript">
 /*<![CDATA[*/
 	
+	var fnReviewPhotoGetList = function() {
+
+	// Initialize a pagination
+		gagaPaging.init('goodsReviewPhotoForm', fnReviewPhotoGetListCallback, 'reviewPhtoPageNav', 1);
+
+		// Load data
+		gagaPaging.load(1);
+	}
+	
+	var fnReviewPhotoGetListCallback = function(result) {
+		$('#ulGoodsReviewPhoto').html('');
+	
+		// 목록
+		if (result.dataList != null && result.dataList.length > 0) {
+			
+			$.each(result.dataList, function(idx, item) {
+				let tag = '';
+				if (item.reviewAttachList != null && item.reviewAttachList.length > 0){
+					var fileGbClass = '';
+					$.each(item.reviewAttachList, function(aIdx, reviewAttach){
+						fileGbClass = '';
+						if (reviewAttach == "M") fileGbClass = "mov";
+				tag += '				<li>\n';
+				tag += '					<a href="javascript:void();" onclick="fnGoodsReviewDetail(\''+item.reviewSq+'\');">\n';
+				tag += '						<div class="pic">\n';
+				tag += '							<span class="thumb '+ fileGbClass +'" style="background-image:url('+ _imgUrl + reviewAttach.sysFileNm +');"></span>\n'; //<!-- 동영상의 썸네일일 경우 mov 클래스 추가 -->
+				tag += '						</div>\n';
+				tag += '					</a>\n';
+				tag += '				</li>\n';		
+					});	
+				}
+				
+				$('#ulGoodsReviewPhoto').append(tag);
+			});
+		
+		}
+
+		// Create pagination
+		gagaPaging.createPagination(result.paging.pageable);
+	}
+	
+	// 상세보기
+	var fnGoodsReviewDetail = function(reviewSq){
+		cfGoodsReviewDetail([[${params.goodsCd}]],'', 'Y', reviewSq);
+		cfCloseLayer('layer_review_photo');
+	}
 	
+	$(document).ready( function() {
+		
+		fnReviewPhotoGetList();
+		
+	});
 /*]]>*/
 </script>	
  </html>

src/main/webapp/WEB-INF/views/web/mypage/MypageCancelFormWeb.html

@@ -0,0 +1,607 @@
+<!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/MypageLayoutWeb">
+<!--
+ *******************************************************************************
+ * @source  : MypageCancelFormWeb.html
+ * @desc    : 마이페이지 > 취소신청 Page
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2021 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.03.19   card007     최초 작성
+ *******************************************************************************
+ -->
+<body>
+
+<th:block layout:fragment="content">
+	<div class="cont">
+		<div class="sec_head">
+			<h3 class="subH1">주문취소</h3>
+			<span class="order_number">주문번호&nbsp;:&nbsp;<em th:text="${cancelList.oneData.ordNo}"></em></span>
+		</div>
+		<div class="sec_body">
+			<div class="part_goods">
+				<div class="goods_head">
+					<p>주문일 <span th:text="${cancelList.oneData.ordDt}"></span></p>
+				</div>
+				<div class="goods_cont">
+					<th:block th:if="${cancelList.cancelList}" th:each="cancel, status : ${cancelList.cancelList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
+					<!-- 주문상품 -->
+					<div class="goods_info">
+						<div class="order_desc">
+							<div class="goods_box">
+								<div class="gd_item">
+									<a href="javascript:void(0)" th:attr="goodsCd=${cancel.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+										<span class="thumb">
+											<img th:src="${imageUrl + '/' + cancel.sysImgNm}" width="100%" alt="">
+										</span>
+										<p>
+											<span class="brand" th:text="${cancel.brandNm}"></span>
+											<span class="tag primary" th:if="${cancel.shotDelvYn == 'Y'}">총알배송</span>
+											<span class="tag" th:if="${cancel.shotDelvYn == 'N' and cancel.selfGoodsYn == 'Y'}">STYLE24 일반배송</span>
+											<span class="tag" th:if="${cancel.selfGoodsYn == 'N'}">업체직배송</span>
+										</p>
+										<p>
+											<span class="name" th:text="${cancel.goodsNm}"></span>
+										</p>
+									</a>
+								</div>
+								<div class="gd_opt">
+									<div class="option_wrap">
+										<span class="title sr-only">주문 옵션</span>
+										<span class="option" th:text="|${cancel.optCd1} / ${cancel.optCd2}|"></span>
+									</div>
+								</div>
+								<div class="gd_calc">
+									<p>
+										<span class="count"><em th:text="${cancel.ordQty}"></em>개</span>
+									</p>
+									<p>
+										<span class="price_org"><em th:text="${#numbers.formatInteger(cancel.listPrice * cancel.ordQty, 1, 'COMMA')}"></em>원</span>
+										<span class="price_sale"><em th:text="${#numbers.formatInteger(cancel.ordAmt, 1, 'COMMA')}"></em>원</span>
+									</p>
+								</div>
+							</div>
+							<div class="button_box">
+								<div class="count_modify">
+									<span class="txt">수량</span>
+									<form class="form_wrap">
+										<div class="form_field">
+											<div class="select_custom select_count">
+												<div class="combo">
+													<input type="hidden" name="chgQty" value="0" th:attr="ordDtlNo=${cancel.ordDtlNo}, ordCanChgQty=${cancel.ordCanChgQty}"/>
+													<div class="select">선택</div>
+													<ul class="list">
+														<li class="selected" value="0">선택</li>
+														<li th:if="${cancel.ordCanChgQty > 0}" th:each="num : ${#numbers.sequence(1,cancel.ordCanChgQty)}" th:value="${num}" th:text="${num}" onclick="fnChangeCancelQty(this);"></li>
+													</ul>
+												</div>
+											</div>
+										</div>
+									</form>
+								</div>
+							</div>
+						</div>
+						<div class="order_text">
+							<p>취소하실 수량을 선택하신 후 주문 취소를 하실 수 있습니다.</p>
+						</div>
+					</div>
+					<!-- //주문상품 -->
+					</th:block>
+				</div>
+			</div>
+			<h4 class="subH3">환불정보</h4>
+			<div class="tbl type6">
+				<table>
+					<colgroup>
+						<col width="50%">
+						<col width="50%">
+					</colgroup>
+					<tr>
+						<td>
+							<dl>
+								<div>
+									<dt>환불 예정 금액</dt>
+									<dd>
+										<div class="price">
+											<span class="return_total_price"><em id="returnAmt">0</em>원</span>
+										</div>
+									</dd>
+								</div>
+								<div class="include_item"> <!-- 할인항목 표기 class명 include_item -->
+									<dt>상품 취소 금액</dt>
+									<dd><em id="goodsCancelAmt">0</em>원</dd>
+								</div>
+								<div class="include_item">
+									<dt>배송비</dt>
+									<dd><em id="deliveryFee">0</em>원</dd>
+								</div>
+								<div class="include_item">
+									<dt>할인 금액 차감</dt>
+									<dd><em id="deductDcAmt">0</em>원</dd>
+								</div>
+							</dl>
+						</td>
+						<td>
+							<dl>
+								<div>
+									<dt>환불 수단</dt>
+									<dd th:text="${paymentInfo.payMeansNm}"></dd>
+								</div>
+								<div>
+									<dt>결제 금액 환불</dt>
+									<dd>
+										<em id="refundPayAmt">0</em>원
+									</dd>
+								</div>
+								<div>
+									<dt>포인트 환불</dt>
+									<dd>
+										<em id="refundPoint">0</em>P
+									</dd>
+								</div>
+								<div>
+									<dt>상품권 환불</dt>
+									<dd>
+										<em id="refundGiftCard">0</em>원
+									</dd>
+								</div>
+							</dl>
+						</td>
+					</tr>
+				</table>
+			</div>
+			<div class="txt_info">
+				<ul>
+					<li>
+						카드사로 결제 취소 요청이 전달된 후 환불까지는 평일 기준 3 ~7일이 소요될 수 있습니다.
+					</li>
+				</ul>
+			</div>
+			<div class="btn_footer_area">
+				<button type="button" class="btn btn_default btn_md"><span>취소</span></button>
+				<button type="button" id="btn_refund_pop" class="btn btn_dark btn_md"><span>주문 취소</span></button>
+			</div>
+		</div>
+	</div>
+	<!-- // CONT-BODY -->
+
+	<!--<div class="my_cont">
+		<div class="sec_head">
+			<h3>반품 신청</h3>
+			<div class="od_detail">
+				(주문번호 : <span class="num" th:text="${ordNo}"></span>)
+			</div>
+		</div>
+		<div class="sec_body mypage_body">
+			<form class="form_wrap" role="form">
+				<div class="order_list">
+					<section class="order_row">
+						<div class="part_deliver">
+							<div class="tbl_tit">
+								&lt;!&ndash; 주문일/선물일 설정 &ndash;&gt;
+								<span class="start_t" th:unless="${returnList.oneData.giftPackYn == 'Y'}">주문일</span>
+								<span class="gift_t" th:if="${returnList.oneData.giftPackYn == 'Y'}">선물일</span>
+								&lt;!&ndash; //주문일/선물일 설정 &ndash;&gt;
+
+								<span class="order_date" th:text="${returnList.oneData.ordDt}"></span>
+
+								&lt;!&ndash; 배송구분 설정 &ndash;&gt;
+								<span class="order_label02" th:if="${returnList.shotDelv}">총알배송</span>
+								<span class="order_label01" th:if="${returnList.selfMall}">STYLE24 일반배송</span>
+								<span class="order_label01" th:if="${returnList.supplyMall}">업체직배송</span>
+								&lt;!&ndash; //배송구분 설정 &ndash;&gt;
+								<a href="javascript:void(0)" class="detail_btn" th:attr="ordNo=${returnList.oneData.ordNo}" onclick="fnGoToOrderDetail(this)">주문상세보기</a>
+							</div>
+							<div class="tbl type2">
+								<table id="returnList">
+									<colgroup>
+										<col width="1020">
+										<col width="180">
+									</colgroup>
+									<tbody>
+									<th:block th:if="${returnList.returnList}" th:each="return, status : ${returnList.returnList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
+										<tr>
+											<td>
+												<div class="info_item">
+													<div class="thumb_box">
+														<a href="">
+															<img th:src="${imageUrl + '/' + return.sysImgNm}" width="100%" alt="">
+														</a>
+													</div>
+													<div class="info_box">
+														<p class="od_name">
+															<a href="">
+																<span class="brand" th:text="${return.brandNm}"></span>
+																<span class="name" th:text="${return.goodsNm}"></span>
+															</a>
+														</p>
+														<p class="od_opt">
+															<span class="option"><em th:text="${return.optCd1}"></em><em th:text="${return.optCd2}"></em></span>
+															<span class="count">수량 <em th:text="${return.ordQty}"></em>개</span>
+														</p>
+													</div>
+													<div class="info_calc">
+														<p class="price">
+															<span class="selling_price" th:text="|${#numbers.formatInteger(return.ordAmt, 1, 'COMMA')}원|"></span>
+														</p>
+														<p class="point"><span th:text="${#numbers.formatInteger(return.savePntAmt, 1, 'COMMA')}"></span>p</p>
+													</div>
+												</div>
+											</td>
+											<td class="cnt_sel">
+												<span class="cnt_t">수량</span>
+												<div class="form_field">
+													<div class="select_custom type1">
+														<div class="combo">
+															<input type="hidden" name="chgQty" value="0" th:attr="ordDtlNo=${return.ordDtlNo}, ordCanChgQty=${return.ordCanChgQty}"/>
+															<div class="select">선택</div>
+															<ul class="list" style="width:100px; margin:0 auto">
+																<li class="selected" value="0">선택</li>
+																<li th:if="${return.ordCanChgQty > 0}" th:each="num : ${#numbers.sequence(1,return.ordCanChgQty)}" th:value="${num}" th:text="${num}" onclick="fnChangeQty(this);"></li>
+															</ul>
+														</div>
+													</div>
+												</div>
+&lt;!&ndash;												<select class="select_dress" name="chgQty" onchange="fnChangeQty();">&ndash;&gt;
+&lt;!&ndash;													<option value="">선택</option>&ndash;&gt;
+&lt;!&ndash;													<option th:if="${return.ordQty > 0}" th:each="num : ${#numbers.sequence(1,return.ordQty)}" th:value="${num}" th:text="${num}"></option>&ndash;&gt;
+&lt;!&ndash;												</select>&ndash;&gt;
+											</td>
+										</tr>
+									</th:block>
+									</tbody>
+								</table>
+							</div>
+							<div class="order_confirm">
+								<p class="cf_txt cf_desc c_primary">반품하실 상품의 수량을 선택하신 후 반품 신청을 하실 수 있습니다.</p>
+							</div>
+						</div>
+					</section>
+					<section class="order_row">
+						<div class="tbl_tit">
+							<h3 class="subH3">반품 사유</h3>
+						</div>
+						<div class="tbl type1">
+							<table>
+								<colgroup>
+									<col width="*">
+								</colgroup>
+								<tbody>
+								<tr>
+									<td>
+										<div class="form_field">
+											<div class="select_custom type1">
+												<div class="combo">
+													<input type="hidden" name="chgReason"/>
+													<div class="select">반품 사유를 선택하세요</div>
+													<ul class="list" style="width:400px">
+														<li class="selected" value="">반품 사유를 선택하세요</li>
+														<li th:if="${returnReason}" th:each="oneData, status : ${returnReason}" th:value="${oneData.cd}" th:text="${oneData.cdNm}" onclick="fnChangeReason(this);"></li>
+													</ul>
+												</div>
+											</div>
+										</div>
+									</td>
+								</tr>
+								<tr>
+									<td>
+										<textarea class="doc_exchange" name="chgMemo" id="chgMemo" placeholder="자세한 사유를 입력해주세요." onkeyup="cfnGetTextLength(this, 200, $('#return_cnt'));"></textarea>
+										<p class="txt_cnt"><span id="return_cnt" class="c_primary">0</span>/200</p>
+									</td>
+								</tr>
+								</tbody>
+							</table>
+						</div>
+					</section>
+					<section class="order_row" id="wdGb">
+						<div class="order_tit">
+							<h3 class="subH3">반품 방식 선택</h3>
+						</div>
+						<div class="tbl type1">
+							<table>
+								<colgroup>
+									<col width="*">
+								</colgroup>
+								<tbody>
+								<tr>
+									<td>
+										<div class="form_field radio_field">
+											<div class="">
+												<input type="radio" name="wdGb" id="withdraw" value="W" checked>
+												<label for="withdraw"><span>방문회수 <b class="c_primary">택배사에서 방문하여 회수</b></span></label>
+											</div>
+											<div class="">
+												<input type="radio" name="wdGb" id="direct" value="D">
+												<label for="direct"><span>직접반송 <b class="c_primary">고객이 직접 반송처리</b></span></label>
+											</div>
+										</div>
+									</td>
+								</tr>
+								</tbody>
+							</table>
+						</div>
+					</section>
+					<section class="order_row" id="chgerLocation">
+						<div class="order_tit">
+							<h3 class="subH3">상품 회수지</h3>
+							<span class="del_t">택배사에서 반품 상품을 직접 회수할 장소 선택</span>
+							<button type="button" class="btn_popup" onclick="fnChangeDeliveryAddr('chger');"><span>회수지 선택</span></button>
+						</div>
+						<div class="tbl type1">
+							<table>
+								<colgroup>
+									<col width="200">
+									<col width="*">
+								</colgroup>
+								<tbody>
+								<tr>
+									<th>성명</th>
+									<td id="chgerNm" th:text="${deliveryAddrInfo.recipNm}"></td>
+									<input type="hidden" name="chgerNm" th:value="${deliveryAddrInfo.recipNm}">
+								</tr>
+								<tr>
+									<th>연락처</th>
+									<td id="chgerPhnno" th:text="${deliveryAddrInfo.recipPhnno}"></td>
+									<input type="hidden" name="chgerPhnno" th:value="${deliveryAddrInfo.recipPhnno}">
+								</tr>
+								<tr>
+									<th>주소</th>
+									<td id="chgerAddr" th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|"></td>
+									<input type="hidden" name="chgerBaseAddr" th:value="${deliveryAddrInfo.recipBaseAddr}">
+									<input type="hidden" name="chgerDtlAddr" th:value="${deliveryAddrInfo.recipDtlAddr}">
+								</tr>
+								</tbody>
+							</table>
+						</div>
+					</section>
+					<section class="order_row" id="returnLocation" style="display:none">
+						<div class="order_tit">
+							<h3 class="subH3">반품하실 배송지</h3>
+						</div>
+						<div class="tbl type1">
+							<table>
+								<colgroup>
+									<col width="200">
+									<col width="*">
+								</colgroup>
+								<tbody>
+								<tr>
+									<th>성명</th>
+									<td th:text="${deliveryAddrInfo.rtnLocNm}"></td>
+									<input type="hidden" name="rtnLocNm" th:value="${deliveryAddrInfo.rtnLocNm}">
+								</tr>
+								<tr>
+									<th>연락처</th>
+									<td th:text="${deliveryAddrInfo.rtnLocTelno}"></td>
+									<input type="hidden" name="rtnLocTelno" th:value="${deliveryAddrInfo.rtnLocTelno}">
+								</tr>
+								<tr>
+									<th>주소</th>
+									<td th:text="|${deliveryAddrInfo.rtnLocBaseAddr} ${deliveryAddrInfo.rtnLocDtlAddr}|"></td>
+									<input type="hidden" name="rtnLocBaseAddr" th:value="${deliveryAddrInfo.rtnLocBaseAddr}">
+									<input type="hidden" name="rtnLocDtlAddr" th:value="${deliveryAddrInfo.rtnLocDtlAddr}">
+								</tr>
+								</tbody>
+							</table>
+						</div>
+					</section>
+					<section class="order_row">
+						<div class="order_tit">
+							<h3 class="subH3">환불 정보</h3>
+							<button type="button" class="btn_popup"><span>취소 전표 보기</span></button>
+						</div>
+						<div class="tbl type1 re_info_tbl">
+							<div class="r_left">
+								<dl>
+									<dt>환불(예정) 금액</dt>
+									<dd>
+										<span class="big_t"><strong id="returnAmt">0</strong>원</span>
+									</dd>
+								</dl>
+								<dl>
+									<dt>상품취소 금액</dt>
+									<dd>
+										<span id="goodsCancelAmt">0</span>원
+									</dd>
+								</dl>
+								<dl>
+									<dt>배송비</dt>
+									<dd>
+										<span id="deliveryFee">0</span>원
+									</dd>
+								</dl>
+								<dl>
+									<dt>할인금액 차감</dt>
+									<dd>
+										<span id="deductDcAmt">0</span>원
+									</dd>
+								</dl>
+							</div>
+							<div class="r_right">
+								<dl>
+									<dt>환불수단</dt>
+									<dd>
+										<span th:text="${paymentInfo.payMeansNm}"></span>
+									</dd>
+								</dl>
+								<dl>
+									<dt>결제금액 환불</dt>
+									<dd>
+										<span id="refundPayAmt">0</span>원
+									</dd>
+								</dl>
+								<dl>
+									<dt>포인트 환불</dt>
+									<dd>
+										<span id="refundPoint">0</span>P
+									</dd>
+								</dl>
+								<dl>
+									<dt>상품권 환불</dt>
+									<dd>
+										<span id="refundGiftCard">0</span>원
+									</dd>
+								</dl>
+							</div>
+						</div>
+						<p class="alert_t">※ 카드사로 결제 취소 요청이 전달된 후 환불까지는 평일 기준 3 ~7일이 소요될 수 있습니다.</p>
+					</section>
+					<section class="order_row" id="addDeliveryFee" style="display:none">
+						<div class="ship_fee">
+							<p><span class="c_primary" id="addPayCost">2,500원</span> 배송비 추가 결제가 필요합니다.</p>
+							<input type="hidden" name="addPayCost"/>
+						</div>
+					</section>
+					<div class="btn_wrap">
+						<button type="button" class="btn btn_default cancle_btn" onclick="cfnGoToPage(_PAGE_MYPAGE_CRS_LIST)"><span>반품 취소</span></button>
+						<button tyep="submit" class="btn btn_primary submit_btn" onclick="fnReturn()"><span id="returnButton">반품 신청</span></button>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>-->
+<script src="/ux/plugins/gaga/gaga.paging.js"></script>
+<script th:inline="javascript">
+	let cancelList = [[${cancelList}]];
+	let usedGiftCardInfo = [[${usedGiftCardInfo}]];
+	let usedPointInfo = [[${usedPointInfo}]];
+
+	$(document).ready(function() {
+		// 마이페이지 LNB 설정
+		fnSetMypageLnbList(2);
+		
+		// 마이페이지 location 설정
+		fnSetMypageLocation('취소/반품/환불내역', '_PAGE_MYPAGE_CRS_LIST', '취소 신청');
+		
+		// 셀렉트박스 활성화
+		var goods_count_selecter = new sCombo('.myOrderView .part_goods .select_custom.select_count');
+	});
+	
+	// 취소 처리
+	var fnCancel = function() {
+		// TODO
+		// 취소신청 처리
+	}
+	
+	// 취소 수량 변경 이벤트 처리
+	var fnChangeCancelQty = function(param) {
+		let url = '/mypage/cancel/refund/amt/calculate';
+
+		if (param != null) {
+			$(param).parent().parent().find('input[name=chgQty]').val($(param).val());
+		}
+
+		let cancelRequestList = [];
+
+		// 취소 수량 설정
+		let chgQtyArr = [];
+		let ordDtlNoArr = [];
+		let ordCanChgQtyArr = [];
+		let chgQtyChk = 0;
+		$.each($('input[name=chgQty]'), function(idx, item) {
+			let chgQty = $(item).val();
+			let ordDtlNo = $(item).attr('ordDtlNo');
+			let ordCanChgQty = $(item).attr('ordCanChgQty');
+
+			chgQtyArr.push(Number(chgQty));
+			ordDtlNoArr.push(Number(ordDtlNo));
+			ordCanChgQtyArr.push(Number(ordCanChgQty));
+			
+			chgQtyChk += Number(chgQty);
+		});
+
+		if (chgQtyChk > 0) {
+			// 환불포인트, 환불상품권 금액 계산
+			let refundPoint = fnCalculatePoint(chgQtyArr, ordDtlNoArr, ordCanChgQtyArr);
+			let refundGiftCard = fnCalculateGiftCard(chgQtyArr, ordDtlNoArr, ordCanChgQtyArr);
+			
+			$.each(cancelList, function (idx, item) {
+				let index = ordDtlNoArr.indexOf(item.ordDtlNo);
+				item.ordCanChgQty = chgQtyArr[index];
+				
+				cancelRequestList.push(item);
+			})
+			
+			let jsonData = JSON.stringify(cancelRequestList);
+			
+			gagajf.ajaxJsonSubmit(url, jsonData, function (result) {
+				let spanCnclRtnAmt = Number(result.spanCnclRtnAmt);
+				let sumDeliveryFee = Number(result.sumDeliveryFee);
+				let spanTotDeliveryFee = Number(result.spanTotDeliveryFee);
+				let spanCpnDcAmt = Number(result.spanCpnDcAmt);
+				let spanTmtbDcAmt = Number(result.spanTmtbDcAmt);
+				let spanPrePntDcAmt = Number(result.spanPrePntDcAmt);
+				let spanRefundAmt = Number(result.spanRefundAmt);
+				
+				let goodsCancelAmt = spanCnclRtnAmt;										// 상품취소금액
+				let deliveryFee = sumDeliveryFee - spanTotDeliveryFee;						// 배송비
+				let deductDcAmt = 0 - spanCpnDcAmt - spanTmtbDcAmt - spanPrePntDcAmt;		// 할인금액 차감(쿠폰+다다익선+선포인트)
+				let refundPayAmt = spanRefundAmt;											// 결제금액 환불
+				let returnAmt = refundPayAmt + refundPoint + refundGiftCard;				// 환불예정금액
+				
+				// 금액 설정
+				$('#returnAmt').text(returnAmt.addComma());
+				$('#goodsCancelAmt').text(goodsCancelAmt.addComma());
+				$('#deliveryFee').text(deliveryFee.addComma());
+				$('#deductDcAmt').text(deductDcAmt.addComma());
+				$('#refundPayAmt').text(refundPayAmt.addComma());
+				$('#refundPoint').text(refundPoint.addComma());
+				$('#refundGiftCard').text(refundGiftCard.addComma());
+				console.log(result);
+			});
+		}
+	}
+
+	// 환불 포인트 계산
+	var fnCalculatePoint = function(chgQtyArr, ordDtlNoArr, ordCanChgQtyArr) {
+		let refundPoint = 0;
+
+		$.each(usedPointInfo, function(idx, item) {
+			let index = ordDtlNoArr.indexOf(item.ordDtlNo);
+			let chgQty = chgQtyArr[index];
+			let ordCanChgQty = ordCanChgQtyArr[index];
+			
+			if (chgQty > 0) {
+				if (chgQty == ordCanChgQty) {
+					refundPoint += item.pntAmt;
+				} else {
+					refundPoint += item.pntAmt * (chgQty / ordCanChgQty);
+				}
+			}
+		});
+		
+		return refundPoint;
+	}
+	
+	// 환불 상품권 계산
+	var fnCalculateGiftCard = function(chgQtyArr, ordDtlNoArr, ordCanChgQtyArr) {
+		let refundGiftCard = 0;
+		
+		$.each(usedGiftCardInfo, function(idx, item) {
+			let index = ordDtlNoArr.indexOf(item.ordDtlNo);
+			let chgQty = chgQtyArr[index];
+			let ordCanChgQty = ordCanChgQtyArr[index];
+			
+			if (chgQty > 0) {
+				if (chgQty == ordCanChgQty) {
+					refundGiftCard += item.gfcdAmt;
+				} else {
+					refundGiftCard += item.pntAmt * (chgQty / ordCanChgQty);
+				}
+			}
+		});
+		
+		return refundGiftCard;
+	}
+</script>
+
+</th:block>
+
+</body>
+</html>

src/main/webapp/WEB-INF/views/web/mypage/MypageCouponDetailPopWeb.html

@@ -18,55 +18,50 @@
  -->
 <!-- 쿠폰 상세보기 팝업 -->
 <div class="modal-dialog" role="document">
-	<div class="modal-content">
-		<div class="modal-header">
-			<h5 class="modal-title" th:text="${couponDetailInfo.cpnNm}"></h5>
-		</div>
-		<div class="modal-body">
-			<section class="order_row">
-				<div class="coupon_condition">
-					<dl class="clear">
-						<dt>사용조건</dt>
-						<dd th:if="${couponDetailInfo.buyLimitAmt < 1}">제한없음</dd>
-						<dd th:unless="${couponDetailInfo.buyLimitAmt < 1}">
-							<span th:text="${#numbers.formatInteger(couponDetailInfo.buyLimitAmt,0,'COMMA')}"></span>원 구매 시 최대 <span th:text="${#numbers.formatInteger(couponDetailInfo.maxDcAmt,0,'COMMA')}"></span>원 할인
-						</dd>
-					</dl>
-					<dl class="clear">
-						<dt>발급수량</dt>
-						<dd th:if="${couponDetailInfo.custPubLimitQty < 1}">제한없음</dd>
-						<dd th:unless="${couponDetailInfo.custPubLimitQty < 1}" th:text="'1인 최대 '+${#numbers.formatInteger(couponDetailInfo.custPubLimitQty,0,'COMMA')} + ' 매'"></dd>
-					</dl>
-					<dl class="clear">
-						<dt>유효기간</dt>
-						<dd th:text="${couponDetailInfo.availStdt} + ' ~ ' +${couponDetailInfo.availEddt}"></dd>
-					</dl>
-					<dl class="clear">
-						<dt>적용 브랜드</dt>
-						<th:block th:each="BrandData, BrandStat : ${cpnDtlRefvalBrandList}">
-						<dd th:text="${BrandData.brandEnm}"></dd>
-						</th:block>
-					</dl>
-					<dl class="clear">
-						<dt>적용 카테고리</dt>
-						<th:block th:each="CateData, CateStat : ${cpnDtlRefvalCateList}">
-						<dd th:text="${CateData.cateNm}"></dd>
-						</th:block>
-					</dl>
-					<dl class="clear">
-						<dt>적용 상품</dt>
-						<th:block th:each="GoodsData, GoodsStat : ${cpnDtlRefvalApplyGoodsList}">
-						<dd th:text="'- '+${GoodsData.goodsNm}"></dd><br>
-						</th:block>
-					</dl>
-					<dl class="clear">
-						<dt>제외 상품</dt>
-						<th:block th:each="ExceptData, ExceptStat : ${cpnDtlRefvalExceptGoodsList}">
-						<dd th:text="'- '+${ExceptData.goodsNm}"></dd><br>
-						</th:block>
-					</dl>
-				</div>
-			</section>
-		</div>
-	</div>
-</div>
+    <div class="modal-content">
+        <div class="modal-header">
+            <h5 class="modal-title" th:text="${couponDetailInfo.cpnNm}"></h5>
+        </div>
+        <div class="modal-body">
+            <div class="pop_cont">
+                <p th:if="${couponDetailInfo.buyLimitAmt < 1}"><strong>사용조건</strong>제한없음</p>
+                <p th:unless="${couponDetailInfo.buyLimitAmt < 1}"><strong>사용조건</strong>[[${#numbers.formatInteger(couponDetailInfo.buyLimitAmt,0,'COMMA')}]]원 이상 구매 시 최대 [[${#numbers.formatInteger(couponDetailInfo.maxDcAmt,0,'COMMA')}]]원 할인 </p>
+                <p th:if="${couponDetailInfo.custPubLimitQty < 1}"><strong>발급수량</strong>제한없음</p>
+                <p th:unless="${couponDetailInfo.custPubLimitQty < 1}"><strong>발급수량</strong>1인 최대 [[${#numbers.formatInteger(couponDetailInfo.custPubLimitQty,0,'COMMA')}]] 매</p>
+                <p><strong>유효기간</strong>[[${couponDetailInfo.availStdt}]] ~ [[${couponDetailInfo.availEddt}]]</p>
+             
+                <p><strong>브랜드</strong>
+                   <th:block th:each="BrandData, BrandStat : ${cpnDtlRefvalBrandList}">
+                		[[${BrandData.brandEnm}]],
+               		</th:block>
+                </p>
+                
+                
+                <p><strong>카테고리</strong>
+                	<th:block th:each="CateData, CateStat : ${cpnDtlRefvalCateList}">
+                		[[${CateData.cateNm}]],
+                	</th:block>
+                </p>
+                
+                
+                <p><strong>상품</strong>
+                	<th:block th:each="GoodsData, GoodsStat : ${cpnDtlRefvalApplyGoodsList}">
+                		[[${GoodsData.goodsNm}]],
+                	</th:block>
+                </p>
+                
+                
+                <p><strong>제외상품</strong>
+                	<th:block th:each="ExceptData, ExceptStat : ${cpnDtlRefvalExceptGoodsList}">
+                		[[${ExceptData.goodsNm}]],
+               		</th:block>
+                </p>
+                
+            </div>
+        </div>
+        <div class="modal-footer">
+            <p>본 쿠폰은 특정 상품&#47;행사에 적용되는 쿠폰이며,적용가능여부는 상품별 상이할 수 있습니다.</p>
+            <p>본 이벤트는 당사 사정에 따라 사전고지 없이 변경 또는 조기종료 될 수 있습니다.</p>
+        </div>
+    </div>
+</div>

src/main/webapp/WEB-INF/views/web/mypage/MypageCouponFormWeb.html

@@ -1,6 +1,5 @@
 <!DOCTYPE html>
-<html lang="ko"
-	xmlns:th="http://www.thymeleaf.org"
+<html lang="ko" xmlns:th="http://www.thymeleaf.org"
 	xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
 	layout:decorator="web/common/layout/MypageLayoutWeb">
 <!--
@@ -17,68 +16,119 @@
  *******************************************************************************
  -->
 <body>
-
-<th:block layout:fragment="content">
-<!--  container -->
-	<div class="my_cont">
-		<div class="sec_head">
-			<h3>나의 쿠폰</h3>
-		</div>
-		<div class="sec_body">
-			<div class="save_area mypage_coupon">
-				<p>내가 보유한 할인 쿠폰<strong th:text="${#numbers.formatInteger(couponInfo.allCouponCnt,0,'COMMA')}"></strong>장</p>
-				<ul>
-					<li>사용 가능 할인 쿠폰 <span th:text="${#numbers.formatInteger(couponInfo.useCouponCnt,0,'COMMA')} + '장'"></span></li>
-					<li>7일 이내 마감 쿠폰 <span th:text="${#numbers.formatInteger(couponInfo.expireCouponCnt,0,'COMMA')} + '장'"></span></li>
-				</ul>
-			</div>
-			<div class="coupon_list">
-				<ul class="clear">
-					<th:block th:each="CouponData, CouponStat : ${couponList}">
-					<li th:class="${CouponData.userYn == 'Y' ? '' : 'off'}">
-						<div class="cp_top">
-							<div class="cp_detail">
-								<p class="tit" th:text="${CouponData.cpnNm}"></p>
-								<th:block th:if="${CouponData.dcWay == '할인율'}">
-								<strong class="sale_t won_t"><span th:text="${CouponData.dcPval}"></span>%</strong>
-								</th:block>
-								<th:block th:unless="${CouponData.dcWay == '할인율'}">
-								<strong class="sale_t won_t"><span th:text="${#numbers.formatInteger(CouponData.dcPval,0,'COMMA')}"></span>원</strong>
-								</th:block>
-								
-								<p class="cp_cont"><span th:text="${#numbers.formatInteger(CouponData.buyLimitAmt,0,'COMMA')}"></span>원 이상 구매시 최대 <span th:text="${#numbers.formatInteger(CouponData.maxDcAmt,0,'COMMA')}"></span>원 할인</p>
-								<span class="cp_cnt"><span th:text="${CouponData.cnt}"></span>장 보유</span>
+	<th:block layout:fragment="content">
+		<!--  container -->
+		<!-- CONT-BODY -->
+		<div class="content myCoupon">
+			<!-- 페이지특정 클래스 = myCoupon -->
+			<div class="cont_body">
+				<div class="lnb">
+					<!-- 마이페이지 lnb 영역 -->
+				</div>
+				<div class="cont my_cont">
+					<div class="sec_head">
+						<h3 class="subH1">쿠폰</h3>
+					</div>
+					<div class="sec_body">
+						<div class="highlight_area">
+							<div class="have_amount">
+								<div class="total_amount">
+									나의 보유 쿠폰&nbsp;<span><em
+										th:text="${#numbers.formatInteger(couponInfo.allCouponCnt,0,'COMMA')}"></em>장</span>
+								</div>
+								<dl>
+									<div>
+										<dt>
+											<span class="tag primary_line">D-<em>7</em></span>7일 이내 소멸 예정
+										</dt>
+										<dd>
+											<em
+												th:text="${#numbers.formatInteger(couponInfo.expireCouponCnt,0,'COMMA')}"></em>장
+										</dd>
+									</div>
+								</dl>
 							</div>
-							<span class="cp_shape"></span>
 						</div>
-					
-						<th:block th:if="${CouponData.userYn == 'Y'}">
-						<div class="cp_date">
-							<span th:text="${CouponData.availStdt}"></span> ~ <span th:text="${CouponData.availEddt}"></span>
-						</div>
-						</th:block>
-						
-						<th:block th:unless="${CouponData.userYn == 'Y'}">
-						<div class="cp_date">
-							<span class="cp_off">사용완료</span>
-						</div>
-						</th:block>
-						
-						<div class="cp_info">
-							<button type="button" th:onclick="useInfoCoupon([[${CouponData.cpnId}]])" class="coupon_pop_btn"><span>사용안내</span></button>
+						<div class="content_area">
+							<!-- 데이터 있을 시 -->
+							<div class="list_box">
+								<div class="coupon_list">
+									<ul>
+										<th:block th:if="${couponList != null and !couponList.empty}"
+											th:each="CouponData, CouponStat : ${couponList}">
+											<li>
+												<!-- 쿠폰사용 기한 -->
+												<div
+													th:class="${CouponData.userYn == 'coupon' ? '' : 'coupon disabled'}">
+													<div>
+														<p class="cp_name" th:text="${CouponData.cpnNm}"></p>
+														<p class="cp_cont">
+															<th:block th:if="${CouponData.dcWay == '할인율'}">
+																<span><em th:text="${CouponData.dcPval}"></em>%</span>
+															</th:block>
+															<th:block th:unless="${CouponData.dcWay == '할인율'}">
+																<span><em
+																	th:text="${#numbers.formatInteger(CouponData.dcPval,0,'COMMA')}"></em>원</span>
+															</th:block>
+
+														</p>
+														<p class="cp_condition">
+															[[${#numbers.formatInteger(CouponData.buyLimitAmt,0,'COMMA')}]]원
+															이상 구매 시 최대
+															[[${#numbers.formatInteger(CouponData.maxDcAmt,0,'COMMA')}]]원
+															할인 <span><em class="tag primary_line"
+																th:text="${CouponData.cnt}+' 장 보유'"></em></span>
+														</p>
+													</div>
+													<th:block th:if="${CouponData.userYn == 'Y'}">
+														<p class="cp_date">
+															<span th:text="${CouponData.availStdt}"></span>&nbsp;~&nbsp;<span
+																th:text="${CouponData.availEddt}"></span>
+														</p>
+													</th:block>
+													<th:block th:unless="${CouponData.userYn == 'Y'}">
+														<p class="cp_date">사용완료</p>
+													</th:block>
+
+												</div> <!-- 쿠폰사용 기한-->
+												<button type="button" id="btn_couponInfo_pop" class="btn_underline"	th:onclick="useInfoCoupon([[${CouponData.cpnId}]])">
+													<span>사용안내</span>
+												</button>
+											</li>
+									</ul>
+								</div>
+							</div>
+							<!-- //데이터 있을 시 -->
+							<!-- 데이터 없을 시 -->
+							<div class="nodata" style="display: none;">
+								<div class="txt_box">
+									<p>
+										현재 노출 할 수 있는 쿠폰이 없습니다.<br>
+									</p>
+								</div>
+								<!-- 버튼 필요시 -->
+								<!-- <div class="btn_box">
+										<button class="btn btn_default"><span>행동하기</span></button>
+									</div> -->
+								<!-- //버튼 필요시 -->
+							</div>
+							<!-- 데이터 없을 시 -->
 						</div>
-					</li>
-					</th:block>
-				</ul>
+					</div>
+				</div>
 			</div>
 		</div>
-	</div>
-	
-	<!-- 쿠폰 사용 내역 팝업 -->
-	<div class="modal coupon_popup" tabindex="-1" role="dialog" aria-labelledby="PopupBasicLabel" aria-hidden="true" id="couponDetailPop"></div>
+		<!-- // CONT-BODY -->
+
+		<!-- 쿠폰 사용 내역 팝업 -->
+		<div class="modal fade dp_coupon_pop"  id="coupon_modal_02" tabindex="-1" role="dialog"	aria-labelledby="PopupBasicLabel" aria-hidden="true"></div>
 
-	<!-- // container -->	
-<script th:inline="javascript">
+		<!-- // container -->
+		<script th:inline="javascript">
+
+let couponList = ([[${couponList}]]);	
+
+console.log(couponList);
 // 사용안내 모달
 var useInfoCoupon = function (id) {
 	 $.ajax( {
@@ -87,8 +137,8 @@ var useInfoCoupon = function (id) {
 		dataType 	: 'html',
 		success 	: function(result) {
 			if (result != null) {
-				$("#couponDetailPop").html(result);
-				$("#couponDetailPop").modal("show");
+				$("#coupon_modal_02").html(result);
+				$("#coupon_modal_02").modal("show");
 			}
 		}
 	});
@@ -96,8 +146,23 @@ var useInfoCoupon = function (id) {
 	return false; 
 }
 
-$(document).ready(function() {
+if(couponList.length>0){
+	$(".nodata").hide();
+}else{
+	$(".nodata").show();
+}
+
 
+
+
+$(document).ready(function() {
+	
+	if(couponList.length>0){
+		$(".nodata").hide();
+	}else{
+		$(".nodata").show();
+	}
+	
 	// 마이페이지 LNB 설정
 	fnSetMypageLnbList(4);
 	
@@ -107,7 +172,7 @@ $(document).ready(function() {
 
 });
 </script>
-</th:block>
+	</th:block>
 
 </body>
 </html>

src/main/webapp/WEB-INF/views/web/mypage/MypageGiftcardFormWeb.html

@@ -19,339 +19,359 @@
 
 	<th:block layout:fragment="content">
 		<!--  container -->
-		<div class="cont">
-			<div class="sec_head">
-				<h3 class="subH1">상품권</h3>
-			</div>
-			<div class="sec_body">
-				<div class="highlight_area">
-					<div class="have_amount">
-						<div class="total_amount">
-							나의 보유 금액&nbsp;<span><em th:text="${#numbers.formatInteger(giftcardInfo.useGift,0,'COMMA')}"></em>원</span>
-						</div>
-						<dl>
-							<div>
-								<dt>보유 상품권</dt>
-								<dd>
-									<em th:text="${#numbers.formatInteger(giftcardInfo.totalCount,0,'COMMA')}"></em>장
-								</dd>
-							</div>
-							<div>
-								<dt>
-									<span class="tag primary_line">D-<em>30</em></span>한 달 이내 소멸 예정
-								</dt>
-								<dd>
-									<em th:text="${#numbers.formatInteger(giftcardInfo.expireCount,0,'COMMA')}"></em>원
-								</dd>
-							</div>
-						</dl>
+		<div class="content myVoucher">
+			<!-- 페이지특정 클래스 = myVoucher -->
+			<div class="cont_body">
+			<div class="lnb">
+						<!-- 마이페이지 lnb 영역 -->
 					</div>
-				</div>
-				<div class="input_area">
-					<form class="form_wrap">
-						<div class="form_field">
-							<label class="input_label"><span>상품권 등록</span></label>
-							<div class="input_wrap">
-								<input type="text" class="form_control"	  id="gift_input" placeholder="상품권 번호를 입력해주세요">
+				<div class="cont">
+					<div class="sec_head">
+						<h3 class="subH1">상품권</h3>
+					</div>
+					<div class="sec_body">
+						<div class="highlight_area">
+							<div class="have_amount">
+								<div class="total_amount">
+									나의 보유 금액&nbsp;<span><em
+										th:text="${#numbers.formatInteger(giftcardInfo.useGift,0,'COMMA')}"></em>원</span>
+								</div>
+								<dl>
+									<div>
+										<dt>보유 상품권</dt>
+										<dd>
+											<em
+												th:text="${#numbers.formatInteger(giftcardInfo.totalCount,0,'COMMA')}"></em>장
+										</dd>
+									</div>
+									<div>
+										<dt>
+											<span class="tag primary_line">D-<em>30</em></span>한 달 이내 소멸
+											예정
+										</dt>
+										<dd>
+											<em
+												th:text="${#numbers.formatInteger(giftcardInfo.expireCount,0,'COMMA')}"></em>원
+										</dd>
+									</div>
+								</dl>
 							</div>
-							<button type="button" class="btn btn_dark" onclick="giftcardSave()">
-								<span>등록</span>
-							</button>
 						</div>
-					</form>
-				</div>
-				<div class="com_info_txt">
-					<p class="tit">상품권 등록 안내</p>
-					<ul>
-						<li>상품권은 상품 구매시 현금과 동일하게 사용됩니다.</li>
-						<li>상품권은 등록한 해당 몰에서만 사용이 가능합니다.(YES24와 중복 사용불가)</li>
-						<li>사용 후 남은 잔액은 상품권 잔액으로 환불되며, 유효기간 내에 사용 가능합니다.</li>
-						<li>유효기간이 지난 상품권의 잔액은 자동 소멸됩니다.</li>
-						<li>상품권은 현금성 결제 수단에 포함되어 주문시 포인트 적립이 가능합니다.</li>
-						<li>상품권으로 결제한 금액은 마이페이지 > 주문상세페이지에서 현금영수증을 발급 받으실 수 있습니다.</li>
-					</ul>
-				</div>
-				<div class="content_area">
-					<div class="taps">
-						<div>
+						<div class="input_area">
+							<form class="form_wrap">
+								<div class="form_field">
+									<label class="input_label"><span>상품권 등록</span></label>
+									<div class="input_wrap">
+										<input type="text" class="form_control" id="gift_input"
+											placeholder="상품권 번호를 입력해주세요">
+									</div>
+									<button type="button" class="btn btn_dark"
+										onclick="giftcardSave()">
+										<span>등록</span>
+									</button>
+								</div>
+							</form>
+						</div>
+						<div class="com_info_txt">
+							<p class="tit">상품권 등록 안내</p>
 							<ul>
-								<li><a href="javascript:void(0);" id="SearchUseGiftcard">사용내역</a></li>
-								<li><a href="javascript:void(0);" id="SearchOwnGiftcard">보유 상품권</a></li>
+								<li>상품권은 상품 구매시 현금과 동일하게 사용됩니다.</li>
+								<li>상품권은 등록한 해당 몰에서만 사용이 가능합니다.(YES24와 중복 사용불가)</li>
+								<li>사용 후 남은 잔액은 상품권 잔액으로 환불되며, 유효기간 내에 사용 가능합니다.</li>
+								<li>유효기간이 지난 상품권의 잔액은 자동 소멸됩니다.</li>
+								<li>상품권은 현금성 결제 수단에 포함되어 주문시 포인트 적립이 가능합니다.</li>
+								<li>상품권으로 결제한 금액은 마이페이지 > 주문상세페이지에서 현금영수증을 발급 받으실 수 있습니다.</li>
 							</ul>
 						</div>
-					</div>
-					<div class="select_box" id="dateField">
-						<div class="form_field">
-							<div class="select_custom month">
-								<div class="combo">
-									<div class="select"></div>
-									<ul class="list" id="searchDt">
+						<div class="content_area">
+							<div class="taps">
+								<div>
+									<ul>
+										<li id="SearchUseGiftcard"><a href="javascript:void(0);" >사용내역</a></li>
+										<li id="SearchOwnGiftcard"><a href="javascript:void(0);" >보유
+												상품권</a></li>
 									</ul>
 								</div>
 							</div>
+							<div class="select_box" id="dateField">
+								<div class="form_field">
+									<div class="select_custom month">
+										<div class="combo">
+											<div class="select"></div>
+											<ul class="list" id="searchDt">
+											</ul>
+										</div>
+									</div>
+								</div>
+							</div>
+							<!-- 데이터 있을 시 -->
+							<div class="list_box" id="giftcardList"></div>
+							<!-- //데이터 있을 시 -->
 						</div>
 					</div>
-					<!-- 데이터 있을 시 -->
-					<div class="list_box" id="giftcardList">
-						
-					</div>
-					<!-- //데이터 있을 시 -->
 				</div>
 			</div>
 		</div>
 		<!-- // CONT-BODY -->
 <script th:inline="javascript">
-var date = new Date();
-var year = date.getFullYear();
-var month = date.getMonth()+1;
+	var date = new Date();
+	var year = date.getFullYear();
+	var month = date.getMonth() + 1;
 
+	//동적으로 날짜 년도 append
+	function appendYear() {
 
-//동적으로 날짜 년도 append
-function appendYear(){
-	
-    for(var i=year; i<=year; i++){
-       	for (var j= 1; j <=month; j++) {
-       		$("#searchDt").prepend("<li onclick='fnChangeDate(this.value)' value='"+year+""+j+"'>"+i+"년"+j +"월 </li>");
+		for (var i = year; i <= year; i++) {
+			for (var j = 1; j <= month; j++) {
+				$("#searchDt").prepend(
+						"<li onclick='fnChangeDate(this.value)' value='"
+								+ year + "" + j + "'>" + i
+								+ "년" + j + "월 </li>");
+			}
 		}
-    }
-    $(".select").append("<li class='selected' value='"+year+""+month+"'>"+year+"년"+ month +"월 </li>"); // 현재년도 선택 */
-}
- 
-appendYear($("#searchDt"));
-
-// 사용내역 조회
-$("#SearchUseGiftcard").click(function(){
-	// class제거 추가
-	$("#SearchOwnGiftcard").removeClass("active");
-	$("#SearchUseGiftcard").addClass("active");
-	$("#giftcardList").attr("class","order_list");
-	
-	// 날짜 필드 
-	$("#dateField").css("display","block");
-	
-	let data = {searchDt : year+""+month,
-				month : month};
-
-	var jsonData = JSON.stringify(data);
-	
-	$.ajax(
-			{
-				type 	 : "POST",
-				data	 : jsonData,
-				url 	 : '/mypage/gift/use/list',
-				contentType: 'application/json',
-					dataType : 'json',
-				success  : function(result){
-					useGiftcard(result);
-				}
+		$(".select").append(
+				"<li class='selected' value='"+year+""+month+"'>"
+						+ year + "년" + month + "월 </li>"); // 현재년도 선택 */
+	}
+
+	appendYear($("#searchDt"));
+
+	// 사용내역 조회
+	$("#SearchUseGiftcard").click(function() {
+		// class제거 추가
+		$("#SearchOwnGiftcard").removeClass("active");
+		$("#SearchUseGiftcard").addClass("active");
+		$("#giftcardList").attr("class", "order_list");
+
+		// 날짜 필드 
+		$("#dateField").css("display", "block");
+
+		let data = {
+			searchDt : year + "" + month,
+			month : month
+		};
+
+		var jsonData = JSON.stringify(data);
+
+		$.ajax({
+			type : "POST",
+			data : jsonData,
+			url : '/mypage/gift/use/list',
+			contentType : 'application/json',
+			dataType : 'json',
+			success : function(result) {
+				useGiftcard(result);
 			}
-	)
-});
-
-function useGiftcard(result) {
-	
-	let giftcardUseList = result.giftcardUseList;
-	
-	let tmtbHtml = "";
-	tmtbHtml += '<div class="tbl type5">';
-	tmtbHtml += '<table>';
-	tmtbHtml += '<colgroup>';
-	tmtbHtml += '<col width="10%">';	
-	tmtbHtml += '<col width="*">';		
-	tmtbHtml += '<col width="18%">';		
-	tmtbHtml += '<col width="18%">';		
-	tmtbHtml += '</colgroup>';
-	tmtbHtml += '<thead>';	
-	tmtbHtml += '<tr>';	
-	tmtbHtml += '<th scope="col"><span class="sr-only">차감</span></th>';		
-	tmtbHtml += '<th scope="col">내용</th>';				
-	tmtbHtml += '<th scope="col">사용금액</th>';			
-	tmtbHtml += '<th scope="col">일자</th>';			
-	tmtbHtml += '</tr>';				
-	tmtbHtml += '</thead>';		
-	
-	if(giftcardUseList.length<=0){
-		tmtbHtml += '<tbody>';
-		tmtbHtml += '</tbody>';
-		tmtbHtml += '</table>';
-		tmtbHtml += '</div>';
-		tmtbHtml += '<div class="nodata">';
-		tmtbHtml += '<div class="txt_box">';
-		tmtbHtml += '<p>현재 노출 할 수 있는 이용내역이 없습니다.<br></p>';
-		tmtbHtml += '</div>';		
-		tmtbHtml += '</div>';	
-		
-	}else{
-		tmtbHtml += '<tbody>';
-		
-		for(let i=0; i<giftcardUseList.length; i++){
-			let useGiftcard = giftcardUseList[i];
-			tmtbHtml += '<tr>';
-			tmtbHtml += '<td><span class="tag deepgray">차감</span></td>';
-			tmtbHtml += '<td>';
-			if(useGiftcard.goodsNm.length>0){
-				tmtbHtml +='<div class="txt_content">'+ useGiftcard.goodsNm + '</div>';	
-			}else{
-				tmtbHtml +='<div class="txt_content">'+ useGiftcard.balanceName + '</div>';	
+		})
+	});
+
+	function useGiftcard(result) {
+
+		let giftcardUseList = result.giftcardUseList;
+
+		let tmtbHtml = "";
+		tmtbHtml += '<div class="tbl type5">';
+		tmtbHtml += '<table>';
+		tmtbHtml += '<colgroup>';
+		tmtbHtml += '<col width="10%">';
+		tmtbHtml += '<col width="*">';
+		tmtbHtml += '<col width="18%">';
+		tmtbHtml += '<col width="18%">';
+		tmtbHtml += '</colgroup>';
+		tmtbHtml += '<thead>';
+		tmtbHtml += '<tr>';
+		tmtbHtml += '<th scope="col"><span class="sr-only">차감</span></th>';
+		tmtbHtml += '<th scope="col">내용</th>';
+		tmtbHtml += '<th scope="col">사용금액</th>';
+		tmtbHtml += '<th scope="col">일자</th>';
+		tmtbHtml += '</tr>';
+		tmtbHtml += '</thead>';
+
+		if (giftcardUseList.length <= 0) {
+			tmtbHtml += '<tbody>';
+			tmtbHtml += '</tbody>';
+			tmtbHtml += '</table>';
+			tmtbHtml += '</div>';
+			tmtbHtml += '<div class="nodata">';
+			tmtbHtml += '<div class="txt_box">';
+			tmtbHtml += '<p>현재 노출 할 수 있는 이용내역이 없습니다.<br></p>';
+			tmtbHtml += '</div>';
+			tmtbHtml += '</div>';
+
+		} else {
+			tmtbHtml += '<tbody>';
+
+			for (let i = 0; i < giftcardUseList.length; i++) {
+				let useGiftcard = giftcardUseList[i];
+				tmtbHtml += '<tr>';
+				tmtbHtml += '<td><span class="tag deepgray">차감</span></td>';
+				tmtbHtml += '<td>';
+				tmtbHtml += '<div class="txt_content">'	+ useGiftcard.goodsNm + '</div>';
+				tmtbHtml += '</td>';
+				tmtbHtml += '<td><span class="amount_minus"> <em>'
+						+ '-'
+						+ ' '
+						+ useGiftcard.gfcdAmt.addComma()
+						+ '</em>원';
+				tmtbHtml += '</span></td>';
+				tmtbHtml += '<td>' + useGiftcard.regDt
+						+ '</td>';
+				tmtbHtml += '</tr>';
 			}
-			tmtbHtml += '</td>';
-			tmtbHtml += '<td><span class="amount_minus"> <em>'+ useGiftcard.balance + ' ' + useGiftcard.gfcdAmt.addComma() + '</em>원';
-			tmtbHtml += '</span></td>';					
-			tmtbHtml += '<td>'+useGiftcard.regDt +'</td>';					
-			tmtbHtml += '</tr>';		
+			tmtbHtml += '</tbody>';
+			tmtbHtml += '</table>';
+			tmtbHtml += '</div>';
+
 		}
-		tmtbHtml += '</tbody>';
-		tmtbHtml += '</table>';
-		tmtbHtml += '</div>';
-		
+
+		$("#giftcardList").html(tmtbHtml);
 	}
-		
-	$("#giftcardList").html(tmtbHtml);
-}
-
-// 보유상품권 조회
-$("#SearchOwnGiftcard").click(function(){
-	$("#SearchUseGiftcard").removeClass("active");
-	$("#SearchOwnGiftcard").addClass("active");
-	$("#giftcardList").attr("class","gift_list");
-	
-	// 날짜 필드 
-	$("#dateField").css("display","none");
-	let data = {};
-	
-	var jsonData = JSON.stringify(data);
-	
-	$.ajax(
-			{
-				type 	 : "POST",
-				data	 : jsonData,
-				url 	 : '/mypage/gift/own/list',
-				contentType: 'application/json',
-					dataType : 'json',
-				success  : function(result){
-					ownGiftcard(result);
-				}
-			}
-	)
-});
-
-function ownGiftcard(result) {
-	
-	let giftcardOwnList = result.giftcardOwnList;
-	
-	let tmtbHtml2 = "";
-
-	if(giftcardOwnList == null){
-		tmtbHtml2 += '<div class="nodata">';
-		tmtbHtml2 += '<div class="txt_box">';
-		tmtbHtml2 += '<p>현재 노출 할 수 있는 상품권이 없습니다.<br></p>';
-		tmtbHtml2 += '</div>';		
-		tmtbHtml2 += '</div>';	
-	}else{
-		
-		tmtbHtml2 += '<div class="voucher_list">';
-		tmtbHtml2 += '<ul>';
-		
-		for(let i=0; i<giftcardOwnList.length; i++){
-			let ownGiftcard = giftcardOwnList[i];
-
-			tmtbHtml2 += '<li>';
-			if(ownGiftcard.rmGfcdAmt > 0){
-				tmtbHtml2 += '<div class="voucher">';
-			}else{
-				tmtbHtml2 += '<div class="voucher disable">';
-			}	
-			
-			tmtbHtml2 += '<div>';
-			tmtbHtml2 += '<p class="vch_name">'+ownGiftcard.gfcdNm +'</p>';
-			tmtbHtml2 += '<p class="vch_price"><span class="tag primary_line"><em>'+ownGiftcard.chgGfcdAmt.addComma() +'</em>원권</span></p>';
-			if(ownGiftcard.rmGfcdAmt > 0){
-				tmtbHtml2 += '<p class="vch_remain">'+ownGiftcard.rmGfcdAmt.addComma() +'</p>';
-			}else{
-				tmtbHtml2 += '<p class="vch_remain">전액소진</p>';
+
+	// 보유상품권 조회
+	$("#SearchOwnGiftcard").click(function() {
+		$("#SearchUseGiftcard").removeClass("active");
+		$("#SearchOwnGiftcard").addClass("active");
+		$("#giftcardList").attr("class", "gift_list");
+
+		// 날짜 필드 
+		$("#dateField").css("display", "none");
+		let data = {};
+
+		var jsonData = JSON.stringify(data);
+
+		$.ajax({
+			type : "POST",
+			data : jsonData,
+			url : '/mypage/gift/own/list',
+			contentType : 'application/json',
+			dataType : 'json',
+			success : function(result) {
+				ownGiftcard(result);
 			}
-			
-			tmtbHtml2 += '<p class="vch_code">'+ownGiftcard.gfcdNo +'</p>';
+		})
+	});
+
+	function ownGiftcard(result) {
+
+		let giftcardOwnList = result.giftcardOwnList;
+
+		let tmtbHtml2 = "";
+
+		if (giftcardOwnList == null) {
+			tmtbHtml2 += '<div class="nodata">';
+			tmtbHtml2 += '<div class="txt_box">';
+			tmtbHtml2 += '<p>현재 노출 할 수 있는 상품권이 없습니다.<br></p>';
 			tmtbHtml2 += '</div>';
-			tmtbHtml2 += '<div class="vch_date">~&nbsp;<span>'+ownGiftcard.useExpDate+'</span></div>';
 			tmtbHtml2 += '</div>';
-			tmtbHtml2 += '<li>';
+		} else {
+
+			tmtbHtml2 += '<div class="voucher_list">';
+			tmtbHtml2 += '<ul>';
+				for (let i = 0; i < giftcardOwnList.length; i++) {
+				let ownGiftcard = giftcardOwnList[i];
+
+				tmtbHtml2 += '<li>';
+				if (ownGiftcard.rmGfcdAmt == 0) {
+					tmtbHtml2 += '<div class="voucher disable">';
+				} else {
+					tmtbHtml2 += '<div class="voucher">';
+				}
+
+				tmtbHtml2 += '<div>';
+				tmtbHtml2 += '<p class="vch_name">'	+ ownGiftcard.gfcdNm + '</p>';
+				tmtbHtml2 += '<p class="vch_price"><span class="tag primary_line"><em>'	+ ownGiftcard.chgGfcdAmt.addComma()	+ '</em>원권</span></p>';
+				if (ownGiftcard.rmGfcdAmt > 0) {
+					tmtbHtml2 += '<p class="vch_remain">'+ ownGiftcard.rmGfcdAmt.addComma()+ '원</p>';
+				} else {
+					tmtbHtml2 += '<p class="vch_remain">전액소진</p>';
+				}
+
+				tmtbHtml2 += '<p class="vch_code">'	+ ownGiftcard.gfcdNo + '</p>';
+				tmtbHtml2 += '</div>';
+				tmtbHtml2 += '<div class="vch_date">~&nbsp;<span>'	+ ownGiftcard.useExpDate	+ '</span></div>';
+				tmtbHtml2 += '</div>';
+				tmtbHtml2 += '</li>';
+			}
+			tmtbHtml2 += '</ul>';
+			tmtbHtml2 += '</div>';
+
 		}
-		tmtbHtml2 += '</ul>';
-		tmtbHtml2 += '</div>';
-		
+
+		$("#giftcardList").html(tmtbHtml2);
+
 	}
-		
-	$("#giftcardList").html(tmtbHtml2);
-
-}
-
-function fnChangeDate(obj) {
-
-	var seletedDate = obj.toString();
-	var splitMonth = seletedDate.substr(4);
-	
-	data = {month : splitMonth,
-			searchDt : seletedDate};
-
- 	var jsonData = JSON.stringify(data);
-	
-	$.ajax(
-			{
-				type 	 : "POST",
-				data	 : jsonData,
-				url 	 : '/mypage/gift/use/list',
-				contentType: 'application/json',
-					dataType : 'json',
-				success  : function(result){
-					useGiftcard(result);
-				}
+
+	function fnChangeDate(obj) {
+
+		var seletedDate = obj.toString();
+		var splitMonth = seletedDate.substr(4);
+
+		data = {
+			month : splitMonth,
+			searchDt : seletedDate
+		};
+
+		var jsonData = JSON.stringify(data);
+
+		$.ajax({
+			type : "POST",
+			data : jsonData,
+			url : '/mypage/gift/use/list',
+			contentType : 'application/json',
+			dataType : 'json',
+			success : function(result) {
+				useGiftcard(result);
 			}
-		)  
-}
-
-// 상품권 등록 버튼 누를 시 
-function giftcardSave() {
-	if($("#gift_input").val() == "" || $("#gift_input").val() == null){
-		mcxDialog.alert("상품권 번호를 입력해주세요.");
-		return;
+		})
 	}
-	
- 	data = {gfcdNo : $("#gift_input").val()};
-
- 	var jsonData = JSON.stringify(data);
- 	
- 	mcxDialog.confirm("상품권을 등록 하시겠습니까?", {
-		cancelBtnText: "취소",
-		sureBtnText: "확인",
-		sureBtnClick: function() {
-			
-			gagajf.ajaxJsonSubmit('/mypage/gift/use/confirm', jsonData, function() {
-				cfnGoToPage(_PAGE_MYPAGE_GIFTCARD);
-			});
+
+	// 상품권 등록 버튼 누를 시 
+	function giftcardSave() {
+		if ($("#gift_input").val() == ""
+				|| $("#gift_input").val() == null) {
+			mcxDialog.alert("상품권 번호를 입력해주세요.");
+			return;
 		}
+
+		data = {
+			gfcdNo : $("#gift_input").val()
+		};
+
+		var jsonData = JSON.stringify(data);
+
+		mcxDialog.confirm("상품권을 등록 하시겠습니까?", {
+			cancelBtnText : "취소",
+			sureBtnText : "확인",
+			sureBtnClick : function() {
+
+				gagajf.ajaxJsonSubmit(
+						'/mypage/gift/use/confirm', jsonData,
+						function() {
+							cfnGoToPage(_PAGE_MYPAGE_GIFTCARD);
+						});
+			}
+		});
+
+	}
+
+	$(document).ready(function() {
+
+		// 마이페이지 LNB 설정
+		fnSetMypageLnbList(6);
+
+		// 마이페이지 location 설정
+		fnSetMypageLocation('상품권', '_PAGE_MYPAGE_GIFTCARD');
+
+		// 전체내역 표시
+		$("#SearchUseGiftcard").trigger('click');
+
+		// 셀렉트박스 활성화
+		$('.select_custom.month').each(function(index) {
+			var selecter01 = new sCombo($(this));
+		});
 	});
-	
-}
-
-$(document).ready(function() {
-
-	// 마이페이지 LNB 설정
-	fnSetMypageLnbList(6);
-	
-	// 마이페이지 location 설정
-	fnSetMypageLocation('상품권', '_PAGE_MYPAGE_GIFTCARD');
-	
-	// 전체내역 표시
-	$("#SearchUseGiftcard").trigger('click');
-
-	// 셀렉트박스 활성화
-	$('.select_custom.month').each(function(index) {
-		var selecter01 = new sCombo($(this));
-	});
-});
 </script>
-	</th:block>
+</th:block>
 
 </body>
 </html>

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

@@ -237,15 +237,21 @@
 		</form>
 		<form id="exchangeForm" name="exchangeForm" action="#" th:action="@{'/mypage/exchange/form'}" th:method="post">
 			<input type="hidden" name="ordNo"/>
-			<input type="hidden" name="ordDtlNoArr"/>
+			<input type="hidden" name="ordDtlNo"/>
+			<input type="hidden" name="supplyCompCd"/>
+		</form>
+		<form id="returnForm" name="returnForm" action="#" th:action="@{'/mypage/return/form'}" th:method="post">
+			<input type="hidden" name="ordNo"/>
+			<input type="hidden" name="ordDtlNo"/>
+			<input type="hidden" name="supplyCompCd"/>
 		</form>
 		<form id="cancelForm" name="cancelForm" th:action="@{'/mypage/cancel/form'}" th:method="post">
 			<input type="hidden" name="ordNo"/>
-			<input type="hidden" name="ordDtlNoArr"/>
+			<input type="hidden" name="ordDtlNo"/>
 		</form>
 		<form id="reviewForm" name="reviewForm" th:action="@{'/mypage/review/form'}" th:method="post">
 			<input type="hidden" name="ordNo"/>
-			<input type="hidden" name="ordDtlNoArr"/>
+			<input type="hidden" name="ordDtlNo"/>
 		</form>
 	</div>
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
@@ -418,12 +424,11 @@
 				tag += '	</div>\n';
 				tag += '	<div class="goods_cont">\n';
 				$.each(order.ordDtlList, function (index, ordDtl) {
-					console.log(ordDtl);
 					tag += '		<div class="goods_info">\n';
 					tag += '			<div class="order_desc">\n';
 					tag += '				<div class="goods_box">\n';
 					tag += '					<div class="gd_item">\n';
-					tag += '						<a href="">\n';
+					tag += '						<a href="javascript:void(0)" goodsCd="' + ordDtl.goodsCd + '" onclick="fnGoToGoodsDetail(this)">\n';
 					tag += '							<span class="thumb">\n';
 					tag += '								<img src="' + imageUrl + '/' + ordDtl.sysImgNm + '" width="100%" alt="">\n';
 					tag += '							</span>\n';
@@ -454,7 +459,7 @@
 					tag += '							<span class="count"><em>' + ordDtl.ordQty + '</em>개</span>\n';
 					tag += '						</p>\n';
 					tag += '						<p>\n';
-					tag += '							<span class="price_org"><em>' + ordDtl.listPrice.addComma() + '</em>원</span>\n';
+					tag += '							<span class="price_org"><em>' + (ordDtl.listPrice * ordDtl.ordQty).addComma() + '</em>원</span>\n';
 					tag += '							<span class="price_sale"><em>' + ordDtl.ordAmt.addComma() + '</em>원</span>\n';
 					tag += '						</p>\n';
 					tag += '					</div>\n';
@@ -493,22 +498,19 @@
 
 						// 교환신청 버튼(배송중, 출고완료, 배송완료)
 						if (ordDtl.ordDtlStat == 'G013_50' || ordDtl.ordDtlStat == 'G013_55' || ordDtl.ordDtlStat == 'G013_60') {
-							console.log(ordDtl);
-							console.log(ordDtl.changeableYn);
-							console.log(ordDtl.returnableYn);
 							// 교환/반품 가능한 상품
 							if (ordDtl.changeableYn == 'Y' && ordDtl.returnableYn == 'Y') {
-								tag += '					<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" onclick="fnCreateChange(this, \'exchange\');"><span>교환 신청</span></button></p>\n';
-								tag += '					<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" onclick="fnCreateChange(this, \'return\');"><span>반품 신청</span></button></p>\n';
+								tag += '					<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" supplyCompCd="' + ordDtl.supplyCompCd + '" onclick="fnCreateChange(this, \'exchange\');"><span>교환 신청</span></button></p>\n';
+								tag += '					<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" supplyCompCd="' + ordDtl.supplyCompCd + '" onclick="fnCreateChange(this, \'return\');"><span>반품 신청</span></button></p>\n';
 							}
 							// 교환 신청 불가 상품
 							else if (ordDtl.changeableYn == 'N' && ordDtl.returnableYn == 'Y') {
 								tag += '					<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></p>\n';
-								tag += '					<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" onclick="fnCreateChange(this, \'return\');"><span>반품 신청</span></button></p>\n';
+								tag += '					<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" supplyCompCd="' + ordDtl.supplyCompCd + '" onclick="fnCreateChange(this, \'return\');"><span>반품 신청</span></button></p>\n';
 							}
 							// 반품 신청 불가 상품
 							else if (ordDtl.changeableYn == 'Y' && ordDtl.returnableYn == 'N') {
-								tag += '					<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" onclick="fnCreateChange(this, \'exchange\');"><span>교환 신청</span></button></p>\n';
+								tag += '					<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" supplyCompCd="' + ordDtl.supplyCompCd + '" onclick="fnCreateChange(this, \'exchange\');"><span>교환 신청</span></button></p>\n';
 								tag += '					<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></p>\n';
 							}
 							// 교환/반품 신청 불가 상품
@@ -524,12 +526,7 @@
 
 						// 구매확정 버튼(배송완료)
 						if (ordDtl.ordDtlStat == 'G013_60') {
-							tag += '					<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" onclick="fnDecideOrder(this);"><span>구매 확정</span></button></p>\n';
-						}
-
-						// 쇼핑백담기 버튼(구매확정)
-						if (ordDtl.ordDtlStat == 'G013_70') {
-							tag += '					<p><button type="button" class="btn btn_primary_line btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></p>\n';
+							tag += '					<p><button type="button" class="btn btn_primary_line btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" onclick="fnDecideOrder(this);"><span>구매 확정</span></button></p>\n';
 						}
 
 						// 리뷰작성 버튼(구매확정)
@@ -537,6 +534,11 @@
 							tag += '					<p><button type="button" class="btn btn_primary_line btn_sm" ordNo="' + ordDtl.ordNo + '" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></p>\n';
 						}
 
+						// 쇼핑백담기 버튼(구매확정)
+						if (ordDtl.ordDtlStat == 'G013_70') {
+							tag += '					<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></p>\n';
+						}
+
 						// 1:1문의 버튼(구매확정)
 						if (ordDtl.ordDtlStat == 'G013_70' && (ordDtl.reviewableYn == 'N' || ordDtl.reviewSq > 0)) {
 							tag += '					<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></p>\n';

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

@@ -21,7 +21,7 @@
 				<span>주문고객</span>
 			</div>
 			<div class="data">
-				<span th:text="${custemerInfo.ordNm}"></span> 
+				<span th:text="${custemerInfo.custNm}"></span> 
 				<span th:text="${custemerInfo.email}"></span> 
 				<span th:text="${custemerInfo.cellPhnno}"></span>
 			</div>
@@ -29,13 +29,17 @@
 	</a>
 </div>
 <div class="fold_cont" style="display: none;">
+	<input type="hidden" name="custNm" 		th:value="${custemerInfo.custNm}"/>
+	<input type="hidden" name="email" 		th:value="${custemerInfo.email}"/>
+	<input type="hidden" name="cellPhnno" 	th:value="${custemerInfo.cellPhnno}"/>
+	
 	<div class="area_mbinfo">
 		<dl>
 			<div>
 				<dt>
 					<span class="sr-only">주문자명</span>
 				</dt>
-				<dd th:text="${custemerInfo.ordNm}"></dd>
+				<dd th:text="${custemerInfo.custNm}"></dd>
 			</div>
 			<div>
 				<dt>

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

@@ -13,8 +13,9 @@
  * 1.0  2021.02.01   jsh77b     최초 작성
  *******************************************************************************
  -->
+
 <!-- 할인/혜택 사용 -->
-<div class="fold_head">
+<div class="fold_head on">
 	<a href="javascript:void(0)">
 		<div>
 			<div class="fold_tit">
@@ -24,155 +25,81 @@
 				<div class="form_field">
 					<input id="chk-maxdisc" type="checkbox" checked="">
 					<label for="chk-maxdisc">
-						<span>최대 할인혜택을 바로 적용하세요 <em class="maxdisc_amount"></em></span>
+						<span>최대 할인혜택을 바로 적용하세요!</span>&nbsp;
+						<span class="maxdisc_amount">(<em class="cpnDcAmt"></em>원 할인)</span>
 					</label>
 				</div>
 			</div>
 		</div>
 	</a>
 </div>
-<div class="fold_cont" style="display: none;">
+<div class="fold_cont" style="display: block;">
 	<div class="area_seldiscount">
 		<dl>
 			<div>
-				<dt><span class="mid">할인코드</span></dt>
+				<dt>할인쿠폰</dt>
 				<dd>
-					<div class="form_field">
-						<div class="input_wrap">
-							<input type="text" id="serialCpnNm" class="form_control" maxlength="13" placeholder="할인코드를 입력해주세요.">
-							<button type="button" class="btn btn_dark" onclick="serialCpnApply()">적용</button>
+					<div class="sale_coupon_box">
+						<div>
+							<span class="maxdisc_amount">총&nbsp;<em class="cpnDcAmt"></em>원 할인</span>
+							<button id="btn_couponModify_pop" class="btn btn_default btn_sm">
+								<span>쿠폰변경</span>
+							</button>
+						</div>
+						<div class="form_field">
+							<div class="input_wrap">
+								<input type="text" id="serialCpnNm" class="form_control" maxlength="13" placeholder="할인코드를 입력해주세요.">
+								<button type="button" class="btn btn_dark btn_sm" onclick="serialCpnApply()">
+									<span>적용</span>
+								</button>
+							</div>
 						</div>
 					</div>
 				</dd>
 			</div>
-			<div id="custCpnInfo" style="display:none">
-				<dt>할인쿠폰</dt>
-				<dd>
-					<a href="javascript:void(0);" class="btn_coupon_toggle">할인쿠폰 <span id="cpnApplyCnt"></span>적용</a>
-					<div class="coupon_list">
-						<ul>
-							<!--  상품쿠폰 -->
-							<th:block th:each="goods, i : ${goodsApplyCpnList}">
-								<th:block th:if="${goods.goodsCpnList.size() > 0}">
-									<li>
-										<div class="coupon">
-											<div class="item_gd">
-												<figure>
-													<span class="thumb"><img src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
-													<figcaption>
-														<div class="brand" th:text="${goods.brandEnm}+' '+${goods.brandKnm}"></div>
-														<div class="name" th:text="${goods.goodsNm}"></div>
-														<div class="price">
-															<th:block th:if="${goods.tmtbDcAmt} > 0">
-																<span class="selling_price"  th:text="${#numbers.formatInteger(goods.tmtbDcAmt, 1, 'COMMA')}"></span>
-															</th:block>
-															<th:block th:if="${goods.tmtbDcAmt} < 1">
-																<span class="selling_price"  th:text="${#numbers.formatInteger(goods.currPrice, 1, 'COMMA')}"></span>
-															</th:block>
-														</div>
-													</figcaption>
-												</figure>
-											</div>
-											 
-											<div class="form_field">
-												<div class="select_custom type1">
-													<div class="combo">
-														<input type="hidden" name="cpnType" value="goodsCpn"/>
-														<input type="hidden" name="cpnCartSq" th:value="${goods.cartSq}"/>
-														<input type="hidden" name="custCpnSq" value="0"/>
-														<input type="hidden" name="cpnDcAmt" value="0"/>
+			
+			<th:block th:if="${delvCpnList.size() > 0}">
+				<div>
+					<dt>배송비 쿠폰</dt>
+					<dd>
+						<div class="dlvr_fee_box">
+							<div class="form_field">
+								<div class="select_custom coupon_list">
+									<div class="combo">
+										<input type="hidden" name="cpnType" value="delvCpn"/>
+										<input type="hidden" name="custCpnSq" value="0"/>
+										<input type="hidden" name="cpnDcAmt" value="0"/>
+										<input type="hidden" name="delvFeeCd" value="0"/>
 														
-														<div class="select">선택없음</div>
-														<ul class="list">
-															<li value="0">선택없음</li>
-															<th:block th:each="goodsCpn, k : ${goods.goodsCpnList}">
-																<li th:value="${goodsCpn.custCpnSq}" th:data="${goodsCpn.cpnDcAmt}" th:text="${goodsCpn.cpnNm}"></li>
-															</th:block>
-														</ul>
-													</div>
-												</div>
-											</div>
-											<div class="cp_discount" style="display:none;">
-												<span class="cp_amount"></span>
-												<button type="button" class="btn_del_coupon"><span>쿠폰적용해제</span></button>
-											</div>
-										</div>
-									</li>
-								</th:block>
-							</th:block>
-							<!--  상품쿠폰 -->
-
-							<!--  장바구니쿠폰 -->
-							<th:block th:if="${cartCpnList.size() > 0}">
-								<li>
-									<div class="coupon">
-										<div class="form_field">
-											<div class="select_custom type1">
-												<div class="combo">
-													<input type="hidden" name="cpnType" value="cartCpn"/>
-													<input type="hidden" name="custCpnSq" value="0"/>
-													<input type="hidden" name="cpnDcAmt" value="0"/>
-													
-													<div class="select">선택없음</div>
-													<ul class="list">
-														<li value="0">선택없음</li>
-														<th:block th:each="cartCpn, k : ${cartCpnList}">
-															<li th:value="${cartCpn.custCpnSq}" th:data="${cartCpn.cpnDcAmt}">
-																<th:block th:text="${cartCpn.cpnNm}"></th:block>
-																<input type="hidden" name="dcWay" th:value="${cartCpn.dcWay}"/>
-																<input type="hidden" name="dcVal" th:value="${cartCpn.dcVal}"/>
-																<th:block th:each="cartCpnCartSq, kokok : ${cartCpn.cartCpnCartSqArr}"> 
-																	<input type="hidden" name="cartCpnCartSq" th:value="${cartCpnCartSq}" />
-																</th:block>
-															</li>
-														</th:block>
-													</ul>
-												</div>
-											</div>
-										</div>
-										<div class="cp_discount">
-											<span class="cp_amount"></span>
-											<button type="button" class="btn_del_coupon"><span>쿠폰적용해제</span></button>
-										</div>
-									</div>
-								</li>
-							</th:block>
-							<!--  장바구니쿠폰 -->
-							
-							<!--  배송비쿠폰 -->
-							<th:block th:if="${delvCpnList.size() > 0}">
-								<li>
-									<div class="coupon">
-										<div class="form_field">
-											<div class="select_custom type1">
-												<div class="combo">
-													<input type="hidden" name="cpnType" value="delvCpn"/>
-													<input type="hidden" name="custCpnSq" value="0"/>
-													<input type="hidden" name="cpnDcAmt" value="0"/>
-													<input type="hidden" name="delvFeeCd" value="0"/>
-													
-													<div class="select" value="0">선택없음</div>
-													<ul class="list">
-														<li value="0">선택없음</li>
-														<th:block th:each="delvCpn, k : ${delvCpnList}">
-															<li th:value="${delvCpn.custCpnSq}" th:data="${delvCpn.dcVal}" th:delvfeecd="${delvCpn.delvFeeCd}" th:delvfee="${delvCpn.delvFee}" th:text="${delvCpn.cpnNm}"></li>
-														</th:block>
-													</ul>
-												</div>
-											</div>
-										</div>
-										<div class="cp_discount">
-											<span class="cp_amount"></span>
-											<button type="button" class="btn_del_coupon"><span>쿠폰적용해제</span></button>
+										<div class="select">
+											<div class="dlvr_coupon"><p class="empty">선택</p></div>
 										</div>
+										<ul class="list" style="display: none;">
+											<th:block th:each="delvCpn, k : ${delvCpnList}">
+												<!-- <li class="selected"> -->
+												<li th:value="${delvCpn.custCpnSq}" th:data="${delvCpn.dcVal}" th:delvfeecd="${delvCpn.delvFeeCd}" th:delvfee="${delvCpn.delvFee}">
+													<div class="dlvr_coupon">
+														<input type="hidden" name="dcWay" th:value="${cartCpn.dcWay}"/>
+														<input type="hidden" name="dcVal" th:value="${cartCpn.dcVal}"/>
+														<p class="name" th:text="${delvCpn.cpnNm}"></p>
+														<!-- 
+														<p class="txt"><span th:text="${cartCpn.buyLimitAmt}">30,000</span>원 이상 구매시 최대 <span th:text="${cartCpn.maxDcAmt}">3,000</span>원 할인</p>
+														 -->
+														<p class="discount"><span th:text="${delvCpn.dcVal}"></span>원 할인</p>
+													</div>
+												</li>
+											</th:block>
+											<li>
+												<div class="dlvr_coupon"><p class="empty">적용 안함</p></div>
+											</li>
+										</ul>
 									</div>
-								</li>
-							</th:block>
-							<!--  배송비쿠폰 -->
-						</ul>
-					</div>
-				</dd>
-			</div>
+								</div>
+							</div>
+						</div>
+					</dd>
+				</div>
+			</th:block>
 		</dl>
 	</div>
 	
@@ -180,6 +107,7 @@
 	<th:block th:if="${prePntDcAmt} > 0 or ${rmPntAmt} > 0 or ${rmGfcdAmt} > 0">
 		<div class="area_selpoint">
 			<dl>
+				<!-- 선포인트금액, 포인트금액, 상품권금액 0보다 클때 적용 -->
 				<th:block th:if="${prePntDcAmt} > 0">
 					<div>
 						<dt>선 포인트 사용</dt>
@@ -187,23 +115,22 @@
 							<div class="form_field">
 								<input type="hidden" name="rmPrePntAmt" th:value="${prePntDcAmt}"/>
 								<div>
-									<input type="radio" name="rdi-beforpoint" id="rdi-beforpoint1" value="N"> 
+									<input type="radio" name="rdi-beforpoint" id="rdi-beforpoint1"value="N" checked=""> 
 									<label for="rdi-beforpoint1"><span>사용 안함</span></label>
 								</div>
 								<div>
 									<input type="radio" name="rdi-beforpoint" id="rdi-beforpoint2" value="Y"> 
 									<label for="rdi-beforpoint2"><span>사용함</span></label> 
-									<span class="remain_point" th:text="|사용가능 포인트 : ${#numbers.formatInteger(prePntDcAmt, 1, 'COMMA')} P|"></span>
+									<span class="useable_point">(<em th:text="${#numbers.formatInteger(prePntDcAmt, 1, 'COMMA')"></em>&nbsp;사용 가능)</span>
 								</div>
 							</div>
 						</dd>
 					</div>
 				</th:block>
+				
 				<th:block th:if="${rmPntAmt} > 0">
 					<div>
-						<dt>
-							<span class="mid">스타일 포인트</span>
-						</dt>
+						<dt>스타일 포인트</dt>
 						<dd>
 							<div class="form_field">
 								<input type="hidden" name="rmPntAmt" th:value="${rmPntAmt}"/>
@@ -211,35 +138,47 @@
 								<th:block th:if="${orgGoodsSumAmt} >= 30000">
 									<div class="input_wrap">
 										<input type="text" name="pntDcAmtStr" class="form_control" maxlength="" placeholder="사용할 포인트를 입력해주세요.">
-										<button type="button" class="btn btn_dark" id="btn_point_apply">적용</button>
+										<button type="button" class="btn btn_dark btn_sm">
+											<span>적용</span>
+										</button>
 									</div>
-									<p><span class="remain_point rmPntAmt" th:text="|보유 : ${#numbers.formatInteger(rmPntAmt, 1, 'COMMA')} P|"></span>(결제금액의 최대 40%까지 사용가능)</p>
 								</th:block>
 								<!-- 스타일 포인트 3만원 이상 결제시 노출 -->
 								
 								<!-- 스타일 포인트 3만원 미만 결제시 노출 -->
 								<th:block th:if="${orgGoodsSumAmt} < 30000">
 									<div class="input_wrap">
-										<input type="text" class="form_control" maxlength="" placeholder="3만원 이상 결제시에만 포인트 사용이 가능합니다." disabled>
+										<input type="text" class="form_control" maxlength="" placeholder="3만원 이상 결제시에만 포인트 사용이 가능합니다." disabled="">
 									</div>
 								</th:block>
+								<!-- //스타일 포인트 3만원 미만 결제시 노출 -->
+								
+								<p>
+									<span class="remain_point">보유:&nbsp;
+										<em class="rmPntAmt" th:text="${#numbers.formatInteger(rmPntAmt, 1, 'COMMA')"></em>P
+									</span>(결제금액의 최대 40%까지 사용가능)
+								</p>
 							</div>
 						</dd>
 					</div>
 				</th:block>
+				
 				<th:block th:if="${rmGfcdAmt} > 0">
 					<div>
-						<dt>
-							<span class="mid">상품권</span>
-						</dt>
+						<dt>상품권</dt>
 						<dd>
 							<div class="form_field">
 								<input type="hidden" name="rmGfcdAmt" th:value="${rmGfcdAmt}"/>
 								<div class="input_wrap">
 									<input type="text" name="gfcdUseAmtStr" class="form_control" maxlength="" placeholder="사용할 금액을 입력해주세요.">
-									<button type="button" class="btn btn_dark" id="btn_gfcd_apply">적용</button>
+									<button type="button" class="btn btn_dark btn_sm">
+										<span>적용</span>
+									</button>
 								</div>
-								<p><span class="remain_point" th:text="|보유 : ${#numbers.formatInteger(rmGfcdAmt, 1, 'COMMA')} 원|"></span></p>
+								<p>
+									<span class="remain_point">보유:&nbsp;<em th:text="${#numbers.formatInteger(rmGfcdAmt, 1, 'COMMA')}"></em>원
+									</span>
+								</p>
 								<div class="agree_receipt">
 									<input id="chk-receipt" type="checkbox"> 
 									<label for="chk-receipt"><span>상품권 현금영수증 신청</span></label>

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

@@ -0,0 +1,286 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org">
+<!--
+ *******************************************************************************
+ * @source  : OrderDcAmtInfoWeb.html
+ * @desc    : 할인혜택 Page
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2020 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.02.01   jsh77b     최초 작성
+ *******************************************************************************
+ -->
+<div class="fold_head">
+	<a href="javascript:void(0)">
+		<div>
+			<div class="fold_tit">
+				<span>할인/혜택 사용</span>
+			</div>
+			<div class="data maxdisc">
+				<div class="form_field">
+					<input id="chk-maxdisc" type="checkbox" checked="">
+					<label for="chk-maxdisc">
+						<span>최대 할인혜택을 바로 적용하세요 <em class="maxdisc_amount"></em></span>
+					</label>
+				</div>
+			</div>
+		</div>
+	</a>
+</div>
+<div class="fold_cont" style="display: none;">
+	<div class="area_seldiscount">
+		<dl>
+			<div>
+				<dt><span class="mid">할인코드</span></dt>
+				<dd>
+					<div class="form_field">
+						<div class="input_wrap">
+							<input type="text" id="serialCpnNm" class="form_control" maxlength="13" placeholder="할인코드를 입력해주세요.">
+							<button type="button" class="btn btn_dark" onclick="serialCpnApply()">적용</button>
+						</div>
+					</div>
+				</dd>
+			</div>
+			<div id="custCpnInfo" style="display:none">
+				<dt>할인쿠폰</dt>
+				<dd>
+					<a href="javascript:void(0);" class="btn_coupon_toggle">할인쿠폰 <span id="cpnApplyCnt"></span>적용</a>
+					<div class="coupon_list">
+						<ul>
+							<!--  상품쿠폰 -->
+							<th:block th:each="goods, i : ${goodsApplyCpnList}">
+								<th:block th:if="${goods.goodsCpnList.size() > 0}">
+									<li>
+										<div class="coupon">
+											<div class="item_gd">
+												<figure>
+													<span class="thumb"><img src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
+													<figcaption>
+														<div class="brand" th:text="${goods.brandEnm}+' '+${goods.brandKnm}"></div>
+														<div class="name" th:text="${goods.goodsNm}"></div>
+														<div class="price">
+															<th:block th:if="${goods.tmtbDcAmt} > 0">
+																<span class="selling_price"  th:text="${#numbers.formatInteger(goods.tmtbDcAmt, 1, 'COMMA')}"></span>
+															</th:block>
+															<th:block th:if="${goods.tmtbDcAmt} < 1">
+																<span class="selling_price"  th:text="${#numbers.formatInteger(goods.currPrice, 1, 'COMMA')}"></span>
+															</th:block>
+														</div>
+													</figcaption>
+												</figure>
+											</div>
+											 
+											<div class="form_field">
+												<div class="select_custom type1">
+													<div class="combo">
+														<input type="hidden" name="cpnType" value="goodsCpn"/>
+														<input type="hidden" name="cpnCartSq" th:value="${goods.cartSq}"/>
+														<input type="hidden" name="custCpnSq" value="0"/>
+														<input type="hidden" name="cpnDcAmt" value="0"/>
+														
+														<div class="select">선택없음</div>
+														<ul class="list">
+															<li value="0">선택없음</li>
+															<th:block th:each="goodsCpn, k : ${goods.goodsCpnList}">
+																<li th:value="${goodsCpn.custCpnSq}" th:data="${goodsCpn.cpnDcAmt}" th:text="${goodsCpn.cpnNm}"></li>
+															</th:block>
+														</ul>
+													</div>
+												</div>
+											</div>
+											<div class="cp_discount" style="display:none;">
+												<span class="cp_amount"></span>
+												<button type="button" class="btn_del_coupon"><span>쿠폰적용해제</span></button>
+											</div>
+										</div>
+									</li>
+								</th:block>
+							</th:block>
+							<!--  상품쿠폰 -->
+
+							<!--  장바구니쿠폰 -->
+							<th:block th:if="${cartCpnList.size() > 0}">
+								<li>
+									<div class="coupon">
+										<div class="form_field">
+											<div class="select_custom type1">
+												<div class="combo">
+													<input type="hidden" name="cpnType" value="cartCpn"/>
+													<input type="hidden" name="custCpnSq" value="0"/>
+													<input type="hidden" name="cpnDcAmt" value="0"/>
+													
+													<div class="select">선택없음</div>
+													<ul class="list">
+														<li value="0">선택없음</li>
+														<th:block th:each="cartCpn, k : ${cartCpnList}">
+															<li th:value="${cartCpn.custCpnSq}" th:data="${cartCpn.cpnDcAmt}">
+																<th:block th:text="${cartCpn.cpnNm}"></th:block>
+																<input type="hidden" name="dcWay" th:value="${cartCpn.dcWay}"/>
+																<input type="hidden" name="dcVal" th:value="${cartCpn.dcVal}"/>
+																<th:block th:each="cartCpnCartSq, kokok : ${cartCpn.cartCpnCartSqArr}"> 
+																	<input type="hidden" name="cartCpnCartSq" th:value="${cartCpnCartSq}" />
+																</th:block>
+															</li>
+														</th:block>
+													</ul>
+												</div>
+											</div>
+										</div>
+										<div class="cp_discount">
+											<span class="cp_amount"></span>
+											<button type="button" class="btn_del_coupon"><span>쿠폰적용해제</span></button>
+										</div>
+									</div>
+								</li>
+							</th:block>
+							<!--  장바구니쿠폰 -->
+							
+							<!--  배송비쿠폰 -->
+							<th:block th:if="${delvCpnList.size() > 0}">
+								<li>
+									<div class="coupon">
+										<div class="form_field">
+											<div class="select_custom type1">
+												<div class="combo">
+													<input type="hidden" name="cpnType" value="delvCpn"/>
+													<input type="hidden" name="custCpnSq" value="0"/>
+													<input type="hidden" name="cpnDcAmt" value="0"/>
+													<input type="hidden" name="delvFeeCd" value="0"/>
+													
+													<div class="select" value="0">선택없음</div>
+													<ul class="list">
+														<li value="0">선택없음</li>
+														<th:block th:each="delvCpn, k : ${delvCpnList}">
+															<li th:value="${delvCpn.custCpnSq}" th:data="${delvCpn.dcVal}" th:delvfeecd="${delvCpn.delvFeeCd}" th:delvfee="${delvCpn.delvFee}" th:text="${delvCpn.cpnNm}"></li>
+														</th:block>
+													</ul>
+												</div>
+											</div>
+										</div>
+										<div class="cp_discount">
+											<span class="cp_amount"></span>
+											<button type="button" class="btn_del_coupon"><span>쿠폰적용해제</span></button>
+										</div>
+									</div>
+								</li>
+							</th:block>
+							<!--  배송비쿠폰 -->
+						</ul>
+					</div>
+				</dd>
+			</div>
+		</dl>
+	</div>
+	
+	<!-- 선포인트금액, 포인트금액, 상품권금액 0보다 클때 적용 -->
+	<th:block th:if="${prePntDcAmt} > 0 or ${rmPntAmt} > 0 or ${rmGfcdAmt} > 0">
+		<div class="area_selpoint">
+			<dl>
+				<th:block th:if="${prePntDcAmt} > 0">
+					<div>
+						<dt>선 포인트 사용</dt>
+						<dd>
+							<div class="form_field">
+								<input type="hidden" name="rmPrePntAmt" th:value="${prePntDcAmt}"/>
+								<div>
+									<input type="radio" name="rdi-beforpoint" id="rdi-beforpoint1" value="N"> 
+									<label for="rdi-beforpoint1"><span>사용 안함</span></label>
+								</div>
+								<div>
+									<input type="radio" name="rdi-beforpoint" id="rdi-beforpoint2" value="Y"> 
+									<label for="rdi-beforpoint2"><span>사용함</span></label> 
+									<span class="remain_point" th:text="|사용가능 포인트 : ${#numbers.formatInteger(prePntDcAmt, 1, 'COMMA')} P|"></span>
+								</div>
+							</div>
+						</dd>
+					</div>
+				</th:block>
+				<th:block th:if="${rmPntAmt} > 0">
+					<div>
+						<dt>
+							<span class="mid">스타일 포인트</span>
+						</dt>
+						<dd>
+							<div class="form_field">
+								<input type="hidden" name="rmPntAmt" th:value="${rmPntAmt}"/>
+								<!-- 스타일 포인트 3만원 이상 결제시 노출 -->
+								<th:block th:if="${orgGoodsSumAmt} >= 30000">
+									<div class="input_wrap">
+										<input type="text" name="pntDcAmtStr" class="form_control" maxlength="" placeholder="사용할 포인트를 입력해주세요.">
+										<button type="button" class="btn btn_dark" id="btn_point_apply">적용</button>
+									</div>
+									<p><span class="remain_point rmPntAmt" th:text="|보유 : ${#numbers.formatInteger(rmPntAmt, 1, 'COMMA')} P|"></span>(결제금액의 최대 40%까지 사용가능)</p>
+								</th:block>
+								<!-- 스타일 포인트 3만원 이상 결제시 노출 -->
+								
+								<!-- 스타일 포인트 3만원 미만 결제시 노출 -->
+								<th:block th:if="${orgGoodsSumAmt} < 30000">
+									<div class="input_wrap">
+										<input type="text" class="form_control" maxlength="" placeholder="3만원 이상 결제시에만 포인트 사용이 가능합니다." disabled>
+									</div>
+								</th:block>
+							</div>
+						</dd>
+					</div>
+				</th:block>
+				<th:block th:if="${rmGfcdAmt} > 0">
+					<div>
+						<dt>
+							<span class="mid">상품권</span>
+						</dt>
+						<dd>
+							<div class="form_field">
+								<input type="hidden" name="rmGfcdAmt" th:value="${rmGfcdAmt}"/>
+								<div class="input_wrap">
+									<input type="text" name="gfcdUseAmtStr" class="form_control" maxlength="" placeholder="사용할 금액을 입력해주세요.">
+									<button type="button" class="btn btn_dark" id="btn_gfcd_apply">적용</button>
+								</div>
+								<p><span class="remain_point" th:text="|보유 : ${#numbers.formatInteger(rmGfcdAmt, 1, 'COMMA')} 원|"></span></p>
+								<div class="agree_receipt">
+									<input id="chk-receipt" type="checkbox"> 
+									<label for="chk-receipt"><span>상품권 현금영수증 신청</span></label>
+									<div class="info_box">
+										<div class="input_wrap">
+											<input type="text" class="form_control" maxlength="11" placeholder="">
+										</div>
+									</div>
+								</div>
+							</div>
+						</dd>
+					</div>
+				</th:block>
+			</dl>
+		</div>
+	</th:block>
+</div> <!-- //할인/혜택 사용 -->
+
+<script th:inline="javascript">
+var dispYn = [[${order.dispYn}]]; // 노출여부
+
+//컨텐츠 호출
+$(document).ready( function() {
+	// 화면펼침
+	if (dispYn == "Y") {
+		$("#dcAmtInfo .fold_head").addClass("on");
+		$("#dcAmtInfo .fold_cont").css("display", "block");
+
+		$("#dcAmtInfo .fold_cont .btn_coupon_toggle").addClass("on");
+		$("#dcAmtInfo .fold_cont .coupon_list").css("display", "block");
+		
+		// 2021.03.15 보유쿠폰존재하면 할인쿠폰 영역 노출
+		var custCpnCnt  = 0;
+		$("#custCpnInfo .coupon").each(function(){
+			custCpnCnt++;
+		});
+		
+		if (custCpnCnt > 0) {
+			$("#custCpnInfo").show();
+		}
+		
+	}
+});
+</script>
+</html>

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

@@ -21,13 +21,12 @@
 			<div class="fold_tit">
 				<span>배송지 정보</span>
 			</div>
-			<div class="data" th:text="${deliveryAddrInfo.recipBaseAddr} + ' ' + ${deliveryAddrInfo.recipDtlAddr}"></div>
+			<div class="data" th:text="${deliveryAddrInfo.recipBaseAddr} + '   ' + ${deliveryAddrInfo.recipDtlAddr}"></div>
 		</div>
 	</a>
 </div>
-
 <div class="fold_cont" style="display: none;">
-	<div class="area_mbinfo">
+	<div class="area_receiveinfo">
 		<input type="hidden" name="recipZipcode" 	th:value="${deliveryAddrInfo.recipZipcode}"/>
 		<input type="hidden" name="recipBaseAddr" 	th:value="${deliveryAddrInfo.recipBaseAddr}"/>
 		<input type="hidden" name="recipDtlAddr" 	th:value="${deliveryAddrInfo.recipDtlAddr}"/>
@@ -37,13 +36,15 @@
 		
 		<dl>
 			<div>
-				<dt><span class="sr-only">배송지명</span></dt>
+				<dt>
+					<span class="sr-only">배송지명</span>
+				</dt>
 				<dd>
-					<span th:text="${deliveryAddrInfo.delvAddrNm}"></span>
-					<span class="icon_tag">
-						<em class="tag_stype1">기본 배송지</em>
+					<th:block th:text="${deliveryAddrInfo.delvAddrNm}"></th:block>
+					<span class="icon_tag"> 
+						<em class="tag gray">기본 배송지</em> 
 						<th:block th:if="${order.shotDelvUseYn} == 'Y'"> 
-							<em class="tag_stype2">총알배송</em>
+							<em class="tag primary_line">총알배송</em>
 						</th:block>
 					</span>
 				</dd>
@@ -53,9 +54,9 @@
 					<span class="sr-only">배송주소</span>
 				</dt>
 				<dd>
-					<span th:text="${deliveryAddrInfo.recipBaseAddr} + ${deliveryAddrInfo.recipDtlAddr}"></span>
-					<button type="button" class="btn_popup" id="btn_adrsChange_pop">
-						<span>배송지 선택</span>
+					<th:block th:text="${deliveryAddrInfo.recipBaseAddr} + '    ' + ${deliveryAddrInfo.recipDtlAddr}"></th:block>
+					<button type="button" class="btn btn_default btn_sm" id="btn_adrsChange_pop">
+						<span>배송지 변경</span>
 					</button>
 				</dd>
 			</div>
@@ -68,53 +69,53 @@
 			<div>
 				<dt>배송요청 사항</dt>
 				<dd>
-					<span th:text="${deliveryAddrInfo.delvMemo}" id="delvMemo"></span>
-					<button type="button" class="btn_popup" id="btn_rqstModify_pop">
+					<th:block th:text="${deliveryAddrInfo.delvMemo}" id="delvMemo"></th:block>
+					<button type="button" class="btn_underline" id="btn_rqstModify_pop">
 						<span>변경하기</span>
 					</button>
 				</dd>
 			</div>
 		</dl>
 	</div>
-	<!-- /배송지정보 -->
 	
 	<!-- 해외배송상품일 경우 노출 -->
 	<th:block th:if="${order.foreignBuyYn} == 'Y'">
 		<div class="area_overseas">
 			<dl>
 				<div>
-					<input type="hidden" name="entryNo" value=""/>
-					
 					<dt>개인통관고유부호</dt>
 					<dd>
 						<div class="form_field">
 							<div>
-								<input type="radio" name="rdi-overseas" id="rdi-overs1" checked> 
-								<label for="rdi-overs1"><span>받는사람 개인통관고유부호</span></label>
+								<input type="radio" name="rdi-overseas"
+									id="rdi-overs1" value="" checked=""> <label
+									for="rdi-overs1"><span>받는사람 개인통관고유부호</span></label>
 							</div>
 							<div>
-								<input type="radio" name="rdi-overseas" id="rdi-overs2">
-								<label for="rdi-overs2"><span>입력 안 함</span></label>
+								<input type="radio" name="rdi-overseas"
+									id="rdi-overs2" value=""> <label
+									for="rdi-overs2"><span>입력 안 함</span></label>
 							</div>
 							<div class="info_box overs1">
 								<div class="input_wrap">
-									<input type="text" name="entryNo" class="form_control err" maxlength="13" placeholder="P로 시작하는 13자리" value="abcde12345qwe">
+									<input type="text" class="form_control err"
+										maxlength="13" placeholder="P로 시작하는 13자리">
 									<!-- 유효하지 않은 개인통관고유부호 일때 class명 'err' 추가 -->
 								</div>
 								<div class="t_err">개인통관고유부호가 유효하지 않습니다.</div>
 								<!-- 유효하지 않은 개인통관고유부호 일때 노출 -->
 								<div class="agree_overs">
 									<input id="chk-overs-agr" type="checkbox" checked="">
-									<label for="chk-overs-agr">
-										<span>
-											위 정보는 원활한 통관을 위해 수집 및 판매자에게 제공하며,계속 사용하도록 안전하게 STYLE24에서 저장 &#47; 관리 합니다.&nbsp;&nbsp;
-											<em class="tmark_required">(필수)</em>
-										</span>
-									</label>
+									<label for="chk-overs-agr"><span>위
+											정보는 원활한 통관을 위해 수집 및 판매자에게 제공하며,계속 사용하도록 안전하게
+											STYLE24에서 저장 / 관리 합니다.&nbsp;&nbsp;<em
+											class="tmark_required">(필수)</em>
+									</span></label>
 								</div>
 							</div>
 							<div class="info_box overs2" style="display: none;">
-								<p>개인통관고유부호를 입력하지 않아도 관세사무소에서 개인정보 확인을 위해 별도 연락을 드릴 예정입니다.</p>
+								<p>개인통관고유부호를 입력하지 않아도 관세사무소에서 개인정보 확인을 위해 별도 연락을
+									드릴 예정입니다.</p>
 							</div>
 						</div>
 						<div class="info_txt">
@@ -136,23 +137,24 @@
 			<div class="form_field">
 				<div class="agree_custom">
 					<input id="chk-custom-agr1" type="checkbox" checked="">
-					<label for="chk-custom-agr1">
-						<span>고객님께서 주문하신 상품에는 주문제작상품이 포함되어 있습니다.<br>주문제작상품에 대한 안내를 확인하였으며 배송에 동의합니다.&nbsp;&nbsp;
-							<em class="tmark_required">(필수)</em>
-						</span>
-					</label>
+					<label for="chk-custom-agr1"><span>고객님께서
+							주문하신 상품에는 주문제작상품이 포함되어 있습니다.<br>주문제작상품에 대한 안내를
+							확인하였으며 배송에 동의합니다.&nbsp;&nbsp;<em
+							class="tmark_required">(필수)</em>
+					</span></label>
 				</div>
 			</div>
 			<div class="info_txt">
 				<ul>
 					<li>주문 제작 상품은 주문 후 제작이 진행되며, 제작 완료 후 배송이 시작됩니다.</li>
-					<li>주문 제작 상품의 특성상 주문 완료 후 취소/교환이 불가능합니다. (상품 하자에 한해 가능)</li>
+					<li>주문 제작 상품의 특성상 주문 완료 후 취소/교환이 불가능합니다. (상품 하자에 한해
+						가능)</li>
 				</ul>
 			</div>
 		</div>
 	</th:block>
 	<!-- //주문제작상품일 경우 노출 -->
-</div>
+</div> <!-- //배송지정보 -->
 
 <script th:inline="javascript">
 var dispYn = [[${order.dispYn}]]; // 노출여부

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

@@ -271,531 +271,24 @@
 									<li class="fold_mbinfo" id="custemerInfo" style="display:none"></li>
 									<!-- //주문고객정보 -->
 									
-									<!-- 주문고객정보 
-									<li class="fold_mbinfo" id="custemerInfo" style="display:none"></li>-->
-									<!-- 주문고객정보 -->
+									<!-- 배송지정보 -->
+									<li class="fold_mbinfo" id="deliveryAddrInfo" style="display:none"></li>
+									<!-- //배송지정보 -->
 									
-									<li class="fold_mbinfo">
-										<!-- 배송지정보 -->
-										<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_receiveinfo">
-												<dl>
-													<div>
-														<dt>
-															<span class="sr-only">배송지명</span>
-														</dt>
-														<dd>
-															홍길동 <span class="icon_tag"> <em class="tag gray">기본
-																	배송지</em> <em class="tag primary_line">총알배송</em>
-															</span>
-														</dd>
-													</div>
-													<div>
-														<dt>
-															<span class="sr-only">배송주소</span>
-														</dt>
-														<dd>
-															서울시 영등포구 은행로 11,8층(여의도동,일신빌딩)
-															<button type="button" class="btn btn_default btn_sm"
-																id="btn_adrsChange_pop">
-																<span>배송지 변경</span>
-															</button>
-														</dd>
-													</div>
-													<div>
-														<dt>
-															<span class="sr-only">휴대폰 번호</span>
-														</dt>
-														<dd>010-1234-5647</dd>
-													</div>
-													<div>
-														<dt>배송요청 사항</dt>
-														<dd>
-															직접받고 부재 시 문앞
-															<button type="button" class="btn_underline"
-																id="btn_rqstModify_pop">
-																<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>
-																<div>
-																	<input type="radio" name="rdi-overseas"
-																		id="rdi-overs2" value=""> <label
-																		for="rdi-overs2"><span>입력 안 함</span></label>
-																</div>
-																<div class="info_box overs1">
-																	<div class="input_wrap">
-																		<input type="text" class="form_control err"
-																			maxlength="13" placeholder="P로 시작하는 13자리">
-																		<!-- 유효하지 않은 개인통관고유부호 일때 class명 'err' 추가 -->
-																	</div>
-																	<div class="t_err">개인통관고유부호가 유효하지 않습니다.</div>
-																	<!-- 유효하지 않은 개인통관고유부호 일때 노출 -->
-																	<div class="agree_overs">
-																		<input id="chk-overs-agr" type="checkbox" checked="">
-																		<label for="chk-overs-agr"><span>위
-																				정보는 원활한 통관을 위해 수집 및 판매자에게 제공하며,계속 사용하도록 안전하게
-																				STYLE24에서 저장 / 관리 합니다.&nbsp;&nbsp;<em
-																				class="tmark_required">(필수)</em>
-																		</span></label>
-																	</div>
-																</div>
-																<div class="info_box overs2" style="display: none;">
-																	<p>개인통관고유부호를 입력하지 않아도 관세사무소에서 개인정보 확인을 위해 별도 연락을
-																		드릴 예정입니다.</p>
-																</div>
-															</div>
-															<div class="info_txt">
-																<ul>
-																	<li>물품가액이 $150초과할 경우 관/부과세가 발생 할 수 있습니다.</li>
-																	<li>물품 종류와 해외공급자 관계없이 같은 날 입항하게 되면 합산과세 대상이 됩니다.</li>
-																</ul>
-															</div>
-														</dd>
-													</div>
-												</dl>
-											</div>
-											<!-- //해외배송상품일 경우 노출 -->
-											<!-- 주문제작상품일 경우 노출 -->
-											<div class="area_customitem">
-												<div class="form_field">
-													<div class="agree_custom">
-														<input id="chk-custom-agr1" type="checkbox" checked="">
-														<label for="chk-custom-agr1"><span>고객님께서
-																주문하신 상품에는 주문제작상품이 포함되어 있습니다.<br>주문제작상품에 대한 안내를
-																확인하였으며 배송에 동의합니다.&nbsp;&nbsp;<em
-																class="tmark_required">(필수)</em>
-														</span></label>
-													</div>
-												</div>
-												<div class="info_txt">
-													<ul>
-														<li>주문 제작 상품은 주문 후 제작이 진행되며, 제작 완료 후 배송이 시작됩니다.</li>
-														<li>주문 제작 상품의 특성상 주문 완료 후 취소/교환이 불가능합니다. (상품 하자에 한해
-															가능)</li>
-													</ul>
-												</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="total_gift">2</em>개 선택
-														</span> <span><em class="total_deduct">0</em>P 차감</span>
-													</div>
-												</div>
-											</a>
-										</div>
-										<div class="fold_cont" style="display: none;">
-											<div class="area_selgift">
-												<div class="gift_box">
-													<p class="txt">
-														<span>사은품선택1</span> TBJ 남성 제기장 스웨이드 트러커 자켓 에서 주는 사은품
-													</p>
-													<div class="form_field">
-														<div class="gift">
-															<input type="radio" name="rdi-gift1" id="rdi-gift1"
-																class="chk_img" value=""> <label
-																for="rdi-gift1"> <span class="thumb"><img
-																	src="/images/pc/thumb/tmp_gift1.jpg" width="" alt=""></span>
-																<span class="name">유니 NBA 팀로고 양말 (N215AO225P)</span> <span
-																class="deduct">무료</span>
-															</label>
-														</div>
-														<div class="gift">
-															<input type="radio" name="rdi-gift1" id="rdi-gift2"
-																class="chk_img" value=""> <label
-																for="rdi-gift2"> <span class="thumb"><img
-																	src="/images/pc/thumb/tmp_gift1.jpg" width="" alt=""></span>
-																<span class="name">사은품이름</span> <span class="deduct">-4,000P</span>
-															</label>
-														</div>
-														<div class="gift">
-															<input type="radio" name="rdi-gift1" id="rdi-gift3"
-																class="chk_img" value=""> <label
-																for="rdi-gift3"> <span class="thumb"><img
-																	src="/images/pc/thumb/tmp_gift1.jpg" width="" alt=""></span>
-																<span class="name">사은품이름</span> <span class="deduct">-4,000P</span>
-															</label>
-														</div>
-														<div class="gift">
-															<input type="radio" name="rdi-gift1" id="rdi-gift4"
-																class="chk_img" value=""> <label
-																for="rdi-gift4"> <span class="thumb"><img
-																	src="/images/pc/thumb/tmp_gift_empty.jpg" width=""
-																	alt=""></span> <span class="name">사은품 수령안함</span> <span
-																class="deduct">수령거부</span>
-															</label>
-														</div>
-													</div>
-												</div>
-												<div class="gift_box">
-													<p class="txt">
-														<span>사은품선택2</span> 10만원 이상 구매시 사은품
-													</p>
-													<div class="form_field">
-														<div class="gift">
-															<input type="radio" name="rdi-gift2" id="rdi-gift11"
-																class="chk_img" value=""> <label
-																for="rdi-gift11"> <span class="thumb"><img
-																	src="/images/pc/thumb/tmp_gift1.jpg" width="" alt=""></span>
-																<span class="name">유니 NBA 팀로고 양말 (N215AO225P)</span> <span
-																class="deduct">무료</span>
-															</label>
-														</div>
-														<div class="gift">
-															<input type="radio" name="rdi-gift2" id="rdi-gift12"
-																class="chk_img" value=""> <label
-																for="rdi-gift12"> <span class="thumb"><img
-																	src="/images/pc/thumb/tmp_gift1.jpg" width="" alt=""></span>
-																<span class="name">사은품이름</span> <span class="deduct">-4,000P</span>
-															</label>
-														</div>
-														<div class="gift">
-															<input type="radio" name="rdi-gift2" id="rdi-gift13"
-																class="chk_img" value=""> <label
-																for="rdi-gift13"> <span class="thumb"><img
-																	src="/images/pc/thumb/tmp_gift_empty.jpg" width=""
-																	alt=""></span> <span class="name">사은품 수령안함</span> <span
-																class="deduct">수령거부</span>
-															</label>
-														</div>
-													</div>
-												</div>
-												<div class="form_field">
-													<div class="agree_gift">
-														<p>
-															<input id="chk-agree_gift" type="checkbox"><label
-																for="chk-agree_gift"><span>동의합니다</span></label>
-														</p>
-														<p class="txt">
-															사은품 지금에 대한 내용을 확인하였으며, 이에 동의합니다.
-															<button type="button" class="btn_underline"
-																id="btn_infoGift_pop">
-																<span>보기</span>
-															</button>
-														</p>
-													</div>
-												</div>
-											</div>
-										</div> <!-- //사은품선택 -->
-									</li>
-									<li>
-										<!-- 할인/혜택 사용 -->
-										<div class="fold_head on">
-											<a href="javascript:void(0)">
-												<div>
-													<div class="fold_tit">
-														<span>할인/혜택 사용</span>
-													</div>
-													<div class="data maxdisc">
-														<div class="form_field">
-															<input id="chk-maxdisc" type="checkbox" checked="">
-															<label for="chk-maxdisc"><span>최대 할인혜택을
-																	바로 적용하세요!</span>&nbsp;<span class="maxdisc_amount">(<em>-3,000</em>원
-																	할인)
-															</span></label>
-														</div>
-													</div>
-												</div>
-											</a>
-										</div>
-										<div class="fold_cont" style="display: block;">
-											<div class="area_seldiscount">
-												<dl>
-													<div>
-														<dt>할인쿠폰</dt>
-														<dd>
-															<div class="sale_coupon_box">
-																<div>
-																	<span class="maxdisc_amount">총&nbsp;<em>-3,000</em>원
-																		할인
-																	</span>
-																	<button id="btn_couponModify_pop"
-																		class="btn btn_default btn_sm">
-																		<span>쿠폰변경</span>
-																	</button>
-																</div>
-																<div class="form_field">
-																	<div class="input_wrap">
-																		<input type="text" class="form_control"
-																			maxlength="13" placeholder="할인코드를 입력해주세요.">
-																		<button type="button" class="btn btn_dark btn_sm">
-																			<span>적용</span>
-																		</button>
-																	</div>
-																</div>
-															</div>
-														</dd>
-													</div>
-													<div>
-														<dt>배송비 쿠폰</dt>
-														<dd>
-															<div class="dlvr_fee_box">
-
-																<div class="form_field">
-																	<div class="select_custom coupon_list">
-																		<div class="combo">
-																			<div class="select">
-																				<div class="dlvr_coupon">
-																					<p class="empty">선택</p>
-																				</div>
-																			</div>
-																			<ul class="list" style="display: none;">
-																				<!-- 선택처리 class="selected" / 선택불가 aria-disabled="true"추가  -->
-																				<li class="selected">
-																					<div class="dlvr_coupon">
-																						<p class="name">TBJ 배송비 무료쿠폰</p>
-																						<p class="txt">
-																							<span>30,000</span>원 이상 구매시 최대 <span>3,000</span>원
-																							할인
-																						</p>
-																						<p class="discount">
-																							<span>15,000</span>원 할인
-																						</p>
-																					</div>
-																				</li>
-																				<li>
-																					<div class="dlvr_coupon">
-																						<p class="name">TBJ 배송비 무료쿠폰</p>
-																						<p class="txt">
-																							<span>30,000</span>원 이상 구매시 최대 <span>3,000</span>원
-																							할인
-																						</p>
-																						<p class="discount">
-																							<span>15,000</span>원 할인
-																						</p>
-																					</div>
-																				</li>
-																				<li>
-																					<div class="dlvr_coupon">
-																						<p class="name">TBJ 배송비 무료쿠폰</p>
-																						<p class="txt">
-																							<span>30,000</span>원 이상 구매시 최대 <span>3,000</span>원
-																							할인
-																						</p>
-																						<p class="discount">
-																							<span>15,000</span>원 할인
-																						</p>
-																					</div>
-																				</li>
-																				<li aria-disabled="true">
-																					<div class="dlvr_coupon">
-																						<p class="name">TBJ 배송비 무료쿠폰</p>
-																						<p class="txt">
-																							<span>30,000</span>원 이상 구매시 최대 <span>3,000</span>원
-																							할인
-																						</p>
-																						<p class="discount">
-																							<span>15,000</span>원 할인
-																						</p>
-																					</div>
-																				</li>
-																				<li>
-																					<div class="dlvr_coupon">
-																						<p class="empty">적용 안함</p>
-																					</div>
-																				</li>
-																			</ul>
-																		</div>
-																	</div>
-																</div>
-
-															</div>
-														</dd>
-													</div>
-												</dl>
-											</div>
-											<div class="area_selpoint">
-												<dl>
-													<div>
-														<dt>선 포인트 사용</dt>
-														<dd>
-															<div class="form_field">
-																<div>
-																	<input type="radio" name="rdi-beforpoint"
-																		id="rdi-beforpoint1" value="" checked=""> <label
-																		for="rdi-beforpoint1"><span>사용 안함</span></label>
-																</div>
-																<div>
-																	<input type="radio" name="rdi-beforpoint"
-																		id="rdi-beforpoint2" value=""> <label
-																		for="rdi-beforpoint2"><span>사용함</span></label> <span
-																		class="useable_point">(<em>1,500P</em>&nbsp;사용
-																		가능)
-																	</span>
-																</div>
-															</div>
-														</dd>
-													</div>
-													<div>
-														<dt>스타일 포인트</dt>
-														<dd>
-															<div class="form_field">
-																<!-- 스타일 포인트 3만원 이상 결제시 노출 -->
-																<div class="input_wrap">
-																	<input type="text" class="form_control" maxlength=""
-																		placeholder="사용할 포인트를 입력해주세요.">
-																	<button type="button" class="btn btn_dark btn_sm">
-																		<span>적용</span>
-																	</button>
-																</div>
-																<!-- 스타일 포인트 3만원 이상 결제시 노출 -->
-																<!-- 스타일 포인트 3만원 미만 결제시 노출 -->
-																<div class="input_wrap">
-																	<input type="text" class="form_control" maxlength=""
-																		placeholder="3만원 이상 결제시에만 포인트 사용이 가능합니다."
-																		disabled="">
-																	<button type="button" class="btn btn_dark btn_sm">
-																		<span>적용</span>
-																	</button>
-																</div>
-																<!-- //스타일 포인트 3만원 미만 결제시 노출 -->
-																<p>
-																	<span class="remain_point">보유:&nbsp;<em>25,500</em>P
-																	</span>(결제금액의 최대 40%까지 사용가능)
-																</p>
-															</div>
-														</dd>
-													</div>
-													<div>
-														<dt>상품권</dt>
-														<dd>
-															<div class="form_field">
-																<div class="input_wrap">
-																	<input type="text" class="form_control" maxlength=""
-																		placeholder="사용할 금액을 입력해주세요.">
-																	<button type="button" class="btn btn_dark btn_sm">
-																		<span>적용</span>
-																	</button>
-																</div>
-																<p>
-																	<span class="remain_point">보유:&nbsp;<em>25,500</em>원
-																	</span>
-																</p>
-																<div class="agree_receipt">
-																	<input id="chk-receipt" type="checkbox"> <label
-																		for="chk-receipt"><span>상품권 현금영수증 신청</span></label>
-																	<div class="info_box">
-																		<div class="input_wrap">
-																			<input type="text" class="form_control"
-																				maxlength="11" placeholder="">
-																		</div>
-																	</div>
-																</div>
-															</div>
-														</dd>
-													</div>
-												</dl>
-											</div>
-										</div> <!-- //할인/혜택 사용 -->
-									</li>
-									<li class="fold_paymethod">
-										<!-- 결제수단 선택 -->
-										<div class="fold_head">
-											<a href="javascript:void(0)">
-												<div>
-													<div class="fold_tit">
-														<span>결제수단 선택</span>
-													</div>
-													<div class="data">
-														<span>신용카드</span>
-													</div>
-												</div>
-											</a>
-										</div>
-										<div class="fold_cont" style="display: none;">
-											<div class="area_paymethod">
-												<div class="form_field">
-													<div class="paymethod_box">
-														<ul class="sel_method">
-															<li><input type="radio" name="rdi-paynormal"
-																id="payCreditCard" value="" checked="checked">
-																<label for="payCreditCard"><span>신용카드</span></label></li>
-															<li><input type="radio" name="rdi-paynormal"
-																id="payCellphone" value=""> <label
-																for="payCellphone"><span>휴대폰 결제</span></label></li>
-															<li><input type="radio" name="rdi-paynormal"
-																id="payKakao" value=""> <label for="payKakao"><span><em
-																		class="sr-only">카카오페이 결제</em><em
-																		class="payimg kakao"></em></span></label></li>
-															<li><input type="radio" name="rdi-paynormal"
-																id="payNaver" value=""> <label for="payNaver"><span><em
-																		class="sr-only">네이버페이 결제</em><em
-																		class="payimg naver"></em></span></label></li>
-															<li><input type="radio" name="rdi-paynormal"
-																id="payPayco" value=""> <label for="payPayco"><span><em
-																		class="sr-only">페이코 결제</em><em class="payimg payco"></em></span></label>
-															</li>
-															<li><input type="radio" name="rdi-paynormal"
-																id="payRealBank" value=""> <label
-																for="payRealBank"><span>실시간계좌이체</span></label></li>
-															<li><input type="radio" name="rdi-paynormal"
-																id="payVirtualBank" value=""> <label
-																for="payVirtualBank"><span>무통장입금</span></label></li>
-														</ul>
-													</div>
-												</div>
-												<div class="form_field">
-													<div class="agree_paymethod">
-														<input id="chk-agree_paymethod" type="checkbox">
-														<label for="chk-agree_paymethod"> <span>선택한
-																결제수단으로 향후 결제 이용에 동의합니다.&nbsp;&nbsp;<em
-																class="tmark_optional">(선택)</em>
-														</span>
-														</label>
-													</div>
-												</div>
-												<div class="form_field">
-													<div class="agree_insurance">
-														<input id="chk-insurance" type="checkbox"> <label
-															for="chk-insurance"> <span>소비자 피해 보상보험
-																신청&nbsp;&nbsp;<em class="tmark_optional">(선택)</em>
-														</span> <a href="" class="btn_underline"><span>FAQ확인</span></a>
-														</label>
-														<p>
-															‘전자상거래 등에서의 소비자보호에 관한 법률‘에 따라 현금 결제 시 서울보증보험㈜가 제공하는 소비자
-															피해보상보험을<br>신청할 수 있도록 해드리고 있습니다. (2013.11.28부터 시행)
-														</p>
-													</div>
-												</div>
-											</div>
-										</div> <!-- //결제수단 선택 -->
-									</li>
+									<!-- //사은품정보 -->
+									<li id="freegiftInfo" style="display:none"></li>
+									<!-- //사은품정보 -->
+									
+									<!-- 할인/혜택 사용 -->
+									<li id="dcAmtInfo" style="display:none"></li>
+									<!-- //할인/혜택 사용 -->
+									
+									<!-- 결제수단 선택 -->
+									<li class="fold_paymethod" id="paymentInfo" style="display:none"></li>
+									<!-- //결제수단 선택 -->
 								</ul>
 							</div>
+							
 							<div class="area_paymentinfo">
 								<div class="paymentinfo">
 									<div class="payinfo_blk">
@@ -833,23 +326,21 @@
 											내용입니다.결제대행서비스 약관 동의 내용입니다.</div>
 									</div>
 								</div>
-
-								<div class="agree_payment">위 주문내역을 확인 하였으며, 회원 본인은 결제에
-									동의합니다.</div>
+								<div class="agree_payment">위 주문내역을 확인 하였으며, 회원 본인은 결제에 동의합니다.</div>
 							</div>
+							
 							<div class="area_paybtn">
 								<div class="form_field">
 									<button type="button" class="btn btn_primary btn_block">
-										<span>동의 후 <em>123,456,789원</em> 결제하기
-										</span>
+										<span>동의 후 <em>123,456,789원</em> 결제하기</span>
 									</button>
 								</div>
 							</div>
 						</div>
 					</form>
-
-
 				</div>
+				
+				
 				<div class="od_side">
 					<div class="area_order">
 						<div class="tit_box">
@@ -1215,7 +706,7 @@ var custemerInfoSet = function(jsonData) {
 				$(".cellPhnno").text($("input[name='cellPhnno']").val());
 			}
 			// 1.2 배송정보로드
-			//deliveryAddrInfoSet(jsonData);
+			deliveryAddrInfoSet(jsonData);
 		}
 	});
 }

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

@@ -307,132 +307,7 @@
 										</div> <!-- //주문고객정보 -->
 									</li>
 									<li class="fold_mbinfo">
-										<!-- 배송지정보 -->
-										<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_receiveinfo">
-												<dl>
-													<div>
-														<dt>
-															<span class="sr-only">배송지명</span>
-														</dt>
-														<dd>
-															홍길동 <span class="icon_tag"> <em class="tag gray">기본
-																	배송지</em> <em class="tag primary_line">총알배송</em>
-															</span>
-														</dd>
-													</div>
-													<div>
-														<dt>
-															<span class="sr-only">배송주소</span>
-														</dt>
-														<dd>
-															서울시 영등포구 은행로 11,8층(여의도동,일신빌딩)
-															<button type="button" class="btn btn_default btn_sm"
-																id="btn_adrsChange_pop">
-																<span>배송지 변경</span>
-															</button>
-														</dd>
-													</div>
-													<div>
-														<dt>
-															<span class="sr-only">휴대폰 번호</span>
-														</dt>
-														<dd>010-1234-5647</dd>
-													</div>
-													<div>
-														<dt>배송요청 사항</dt>
-														<dd>
-															직접받고 부재 시 문앞
-															<button type="button" class="btn_underline"
-																id="btn_rqstModify_pop">
-																<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>
-																<div>
-																	<input type="radio" name="rdi-overseas"
-																		id="rdi-overs2" value=""> <label
-																		for="rdi-overs2"><span>입력 안 함</span></label>
-																</div>
-																<div class="info_box overs1">
-																	<div class="input_wrap">
-																		<input type="text" class="form_control err"
-																			maxlength="13" placeholder="P로 시작하는 13자리">
-																		<!-- 유효하지 않은 개인통관고유부호 일때 class명 'err' 추가 -->
-																	</div>
-																	<div class="t_err">개인통관고유부호가 유효하지 않습니다.</div>
-																	<!-- 유효하지 않은 개인통관고유부호 일때 노출 -->
-																	<div class="agree_overs">
-																		<input id="chk-overs-agr" type="checkbox" checked="">
-																		<label for="chk-overs-agr"><span>위
-																				정보는 원활한 통관을 위해 수집 및 판매자에게 제공하며,계속 사용하도록 안전하게
-																				STYLE24에서 저장 / 관리 합니다.&nbsp;&nbsp;<em
-																				class="tmark_required">(필수)</em>
-																		</span></label>
-																	</div>
-																</div>
-																<div class="info_box overs2" style="display: none;">
-																	<p>개인통관고유부호를 입력하지 않아도 관세사무소에서 개인정보 확인을 위해 별도 연락을
-																		드릴 예정입니다.</p>
-																</div>
-															</div>
-															<div class="info_txt">
-																<ul>
-																	<li>물품가액이 $150초과할 경우 관/부과세가 발생 할 수 있습니다.</li>
-																	<li>물품 종류와 해외공급자 관계없이 같은 날 입항하게 되면 합산과세 대상이 됩니다.</li>
-																</ul>
-															</div>
-														</dd>
-													</div>
-												</dl>
-											</div>
-											<!-- //해외배송상품일 경우 노출 -->
-											<!-- 주문제작상품일 경우 노출 -->
-											<div class="area_customitem">
-												<div class="form_field">
-													<div class="agree_custom">
-														<input id="chk-custom-agr1" type="checkbox" checked="">
-														<label for="chk-custom-agr1"><span>고객님께서
-																주문하신 상품에는 주문제작상품이 포함되어 있습니다.<br>주문제작상품에 대한 안내를
-																확인하였으며 배송에 동의합니다.&nbsp;&nbsp;<em
-																class="tmark_required">(필수)</em>
-														</span></label>
-													</div>
-												</div>
-												<div class="info_txt">
-													<ul>
-														<li>주문 제작 상품은 주문 후 제작이 진행되며, 제작 완료 후 배송이 시작됩니다.</li>
-														<li>주문 제작 상품의 특성상 주문 완료 후 취소/교환이 불가능합니다. (상품 하자에 한해
-															가능)</li>
-													</ul>
-												</div>
-											</div>
-											<!-- //주문제작상품일 경우 노출 -->
-										</div> <!-- //배송지정보 -->
+										
 									</li>
 									<li>
 										<!-- 사은품선택 -->

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

@@ -15,7 +15,7 @@
  -->
 
 <th:block th:if="${freegiftList != null && #lists.size(freegiftList) > 0}">
-
+<!-- 사은품선택 -->
 <div class="fold_head">
 	<a href="javascript:void(0)">
 		<div>
@@ -23,83 +23,83 @@
 				<span>사은품 선택</span>
 			</div>
 			<div class="data">
-				<span>사은품 총 <em class="total_gift">0</em>&nbsp;개 선택</span> 
-				<span><em class="total_deduct">0</em>&nbsp;P 차감</span>
+				<span>사은품 총 <em class="total_gift">0</em>개 선택</span> 
+				<span><em class="total_deduct">0</em>P 차감</span>
 			</div>
 		</div>
 	</a>
 </div>
 <div class="fold_cont" style="display: none;">
 	<div class="area_selgift">
-		<th:block th:each="freegift, i : ${freegiftList}">
-			<div class="gift_box">
-				<p class="txt">
-					<th:block th:if="${freegift.allYn} == 'Y'">
-						<span th:text="'사은품필수' + ${i.count} + ' ' + ${freegift.freegiftNm}"></span>
-					</th:block>
-					<th:block th:if="${freegift.allYn} == 'N'">
-						<span th:text="'사은품선택' + ${i.count} + ' ' + ${freegift.freegiftNm}"></span>
-					</th:block>
-				</p>
-				<div class="form_field">
-					<!-- 전체지급 사음품(필수) -->
-					<th:block th:if="${freegift.allYn} == 'Y'">
-						<th:block th:each="freegiftGoods, k : ${freegiftGoodsList}">
-							<th:block th:if="${freegift.freegiftSq} == ${freegiftGoods.freegiftSq}">
-								<div class="gift">
-									<input type="hidden" th:name="'rdi-gift'+${i.count}" th:id="'rdi-gift'+${i.count}+${k.count}" class="chk_img freegiftRdo" th:value="${freegiftGoods.freegiftValSq}" usepoint="0" allYn="Y">
-									<label th:for="'rdi-gift'+${i.count}+${k.count}"> 
-										<span class="thumb"><img src="http://ts5000.ipdisk.co.kr:89/images/pc/thumb/tmp_gift1.jpg" width="" alt=""></span>
-										<span class="name" th:text="${freegiftGoods.goodsNm}"></span> 
-										<span class="deduct">무료</span>
-									</label>
-								</div>
-							</th:block>
+		<div class="gift_box">
+			<p class="txt">
+				<th:block th:if="${freegift.allYn} == 'Y'">
+					<span th:text="'사은품필수' + ${i.count} + ' ' + ${freegift.freegiftNm}"></span>
+				</th:block>
+				<th:block th:if="${freegift.allYn} == 'N'">
+					<span th:text="'사은품선택' + ${i.count} + ' ' + ${freegift.freegiftNm}"></span>
+				</th:block>
+			</p>
+			<div class="form_field">
+				<!-- 전체지급 사음품(필수) -->
+				<th:block th:if="${freegift.allYn} == 'Y'">
+					<th:block th:each="freegiftGoods, k : ${freegiftGoodsList}">
+						<th:block th:if="${freegift.freegiftSq} == ${freegiftGoods.freegiftSq}">
+							<div class="gift">
+								<input type="hidden" th:name="'rdi-gift'+${i.count}" th:id="'rdi-gift'+${i.count}+${k.count}" class="chk_img freegiftRdo" th:value="${freegiftGoods.freegiftValSq}" usepoint="0" allYn="Y">
+								<label th:for="'rdi-gift'+${i.count}+${k.count}"> 
+									<span class="thumb"><img src="http://ts5000.ipdisk.co.kr:89/images/pc/thumb/tmp_gift1.jpg" width="" alt=""></span>
+									<span class="name" th:text="${freegiftGoods.goodsNm}"></span> 
+									<span class="deduct">무료</span>
+								</label>
+							</div>
 						</th:block>
 					</th:block>
-					<!-- 선택지급 사음품(선택) -->
-					<th:block th:if="${freegift.allYn} == 'N'">
-						<th:block th:each="freegiftGoods, k : ${freegiftGoodsList}">
-							<th:block th:if="${freegift.freegiftSq} == ${freegiftGoods.freegiftSq}">
-								<div class="gift">
-									<input type="radio" th:name="'rdi-gift'+${i.count}" th:id="'rdi-gift'+${i.count}+${k.count}" class="chk_img freegiftRdo" th:value="${freegiftGoods.freegiftValSq}" th:usepoint="${freegiftGoods.usePoint}"  allYn="N"> 
-									<label th:for="'rdi-gift'+${i.count}+${k.count}"> 
-										<span class="thumb"><img src="http://ts5000.ipdisk.co.kr:89/images/pc/thumb/tmp_gift1.jpg" width="" alt=""></span>
-										<span class="name" th:text="${freegiftGoods.goodsNm}"></span> 
-										<span th:if="${freegiftGoods.usePoint} < 1" class="deduct" th:text="무료"></span>
-										<span th:if="${freegiftGoods.usePoint} > 0" class="deduct" th:text="|- ${freegiftGoods.usePoint} P|"></span>
-									</label>
-								</div>
-							</th:block>
+				</th:block>
+				
+				<!-- 선택지급 사음품(선택) -->
+				<th:block th:if="${freegift.allYn} == 'N'">
+					<th:block th:each="freegiftGoods, k : ${freegiftGoodsList}">
+						<th:block th:if="${freegift.freegiftSq} == ${freegiftGoods.freegiftSq}">
+							<div class="gift">
+								<input type="radio" th:name="'rdi-gift'+${i.count}" th:id="'rdi-gift'+${i.count}+${k.count}" class="chk_img freegiftRdo" th:value="${freegiftGoods.freegiftValSq}" th:usepoint="${freegiftGoods.usePoint}"  allYn="N"> 
+								<label th:for="'rdi-gift'+${i.count}+${k.count}"> 
+									<span class="thumb"><img src="http://ts5000.ipdisk.co.kr:89/images/pc/thumb/tmp_gift1.jpg" width="" alt=""></span>
+									<span class="name" th:text="${freegiftGoods.goodsNm}"></span> 
+									<span th:if="${freegiftGoods.usePoint} < 1" class="deduct" th:text="무료"></span>
+									<span th:if="${freegiftGoods.usePoint} > 0" class="deduct" th:text="|- ${freegiftGoods.usePoint} P|"></span>
+								</label>
+							</div>
 						</th:block>
-						<div class="gift">
-							<input type="radio" th:name="'rdi-gift'+${i.count}" th:id="${i.count}+'0'" class="chk_img freegiftRdo" value="noSel" usepoint="0" allYn="N"> 
-							<label th:for="${i.count}+'0'">
-								<span class="thumb"><img src="/images/pc/thumb/tmp_gift_empty.jpg" width=""alt=""></span> 
-								<span class="name">사은품 수령안함</span>
-								<span class="deduct">수령거부</span>
-							</label>
-						</div>
 					</th:block>
-				</div>
+					<div class="gift">
+						<input type="radio" th:name="'rdi-gift'+${i.count}" th:id="${i.count}+'0'" class="chk_img freegiftRdo" value="noSel" usepoint="0" allYn="N"> 
+						<label th:for="${i.count}+'0'">
+							<span class="thumb"><img src="/images/pc/thumb/tmp_gift_empty.jpg" width=""alt=""></span> 
+							<span class="name">사은품 수령안함</span>
+							<span class="deduct">수령거부</span>
+						</label>
+					</div>
+				</th:block>
 			</div>
-		</th:block>
+		</div>
+		
 		<div class="form_field">
 			<div class="agree_gift">
 				<p>
-					<input id="chk-agree_gift" type="checkbox">
-					<label for="chk-agree_gift"><span>동의합니다</span></label>
+					<input id="chk-agree_gift" type="checkbox"><label for="chk-agree_gift"><span>동의합니다</span></label>
 				</p>
 				<p class="txt">
 					사은품 지금에 대한 내용을 확인하였으며, 이에 동의합니다.
-					<button type="button" class="btn_link_popup" id="btn_infoGift_pop">
+					<button type="button" class="btn_underline"
+						id="btn_infoGift_pop">
 						<span>보기</span>
 					</button>
 				</p>
 			</div>
 		</div>
 	</div>
-</div> 
+</div> <!-- //사은품선택 -->
 
 <script th:inline="javascript">
 //할인관련정보 변수선언

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

@@ -13,257 +13,96 @@
  * 1.0  2021.02.01   jsh77b     최초 작성
  *******************************************************************************
  -->
+ <!-- 결제수단 선택 -->
 <div class="fold_head">
 	<a href="javascript:void(0)">
 		<div>
-			<div class="fold_tit"><span>결제수단 선택</span></div>
-			<div class="data"><span>STYLE24 간편결제</span></div>
+			<div class="fold_tit">
+				<span>결제수단 선택</span>
+			</div>
+			<div class="data">
+				<span>신용카드</span>
+			</div>
 		</div>
 	</a>
 </div>
 <div class="fold_cont" style="display: none;">
 	<div class="area_paymethod">
 		<div class="form_field">
-			<div class="radio_blk">
-				<div class="paymethod_radio">
-					<input type="radio" name="rdi-paymethod" id="rdi-paymethod-quick" value=""> 
-					<label for="rdi-paymethod-quick"><span>STYLE24 간편결제</span></label>
-					<div class="quickpay_bnr">
-						<span>3초면 결제 끝! 추가 혜택 할인과 함께 만나는 STYLE24 간편결제! 지금 바로 등록하세요!</span>
-						<button type="button" class="btn_close_bnr">
-							<span class="sr-only">닫기</span>
-						</button>
-					</div>
-				</div>
-				<div class="paymethod_box" style="display: none;">
-					<div class="card_quickpay">
-						<!-- 등록카드 없을때 -->
-						<div class="empty">
-							<button type="button" class="btn_addcard">
-								<span>결제수단 등록</span>
-							</button>
-						</div>
-						<!-- //등록카드 없을때 -->
-						
-						<!-- 등록카드 있을때 -->
-						<div class="list_card swiper-container">
-							<div class="swiper-wrapper">
-								<div class="swiper-slide">
-									<!-- 등록된 카드 -->
-									<div class="card">
-										<span class="logo_samsung">삼성카드</span>
-										<p class="number">
-											<span>9410</span> <span>09**</span> <span>****</span>
-											<span>1287</span>
-										</p>
-										<p class="name">삼성개인특별카드</p>
-										<select name="" id="" class="select_month">
-											<option value="">일시불</option>
-											<option value="">2개월 무이자</option>
-											<option value="">3개월 무이자</option>
-											<option value="">4개월 무이자</option>
-											<option value="">5개월 무이자</option>
-											<option value="">6개월 무이자</option>
-											<option value="">7개월</option>
-											<option value="">8개월</option>
-											<option value="">9개월</option>
-											<option value="">10개월</option>
-											<option value="">11개월</option>
-											<option value="">12개월</option>
-										</select>
-										<div class="etc">
-											<button type="button" class="btn_favorcard">
-												<span><i class="ico ico_star"></i><em class="sr-only">즐겨찾기</em></span>
-											</button>
-											<button type="button" class="btn_delcard">
-												<span><i class="ico ico_trash_wh"></i><em class="sr-only">카드삭제</em></span>
-											</button>
-										</div>
-									</div>
-									<!-- //등록된 카드 -->
-								</div>
-								<div class="swiper-slide">
-									<!-- 등록된 카드 -->
-									<div class="card">
-										<span class="logo_hyundai">현대카드</span>
-										<p class="number">
-											<span>9410</span> <span>09**</span> <span>****</span>
-											<span>1287</span>
-										</p>
-										<p class="name">현대 M3 카드</p>
-										<select name="" id="" class="select_month">
-											<option value="">일시불</option>
-											<option value="">2개월 무이자</option>
-											<option value="">3개월 무이자</option>
-											<option value="">4개월 무이자</option>
-											<option value="">5개월 무이자</option>
-											<option value="">6개월 무이자</option>
-											<option value="">7개월</option>
-											<option value="">8개월</option>
-											<option value="">9개월</option>
-											<option value="">10개월</option>
-											<option value="">11개월</option>
-											<option value="">12개월</option>
-										</select>
-										<div class="etc">
-											<button type="button" class="btn_favorcard active">
-												<span><i class="ico ico_star"></i><em class="sr-only">즐겨찾기</em></span>
-											</button>
-											<button type="button" class="btn_delcard">
-												<span><i class="ico ico_trash_wh"></i><em class="sr-only">카드삭제</em></span>
-											</button>
-										</div>
-									</div>
-									<!-- //등록된 카드 -->
-								</div>
-								<div class="swiper-slide">
-									<!-- 카드추가버튼 -->
-									<button type="button" class="btn_addcard">
-										<span>결제수단 등록</span>
-									</button>
-									<!-- //카드추가버튼 -->
-								</div>
-							</div>
-							<div class="swiper-button-next"></div>
-							<div class="swiper-button-prev"></div>
-						</div>
-						<!-- //등록카드 있을때 -->
-					</div>
-					<ul class="info_quick">
-						<li>결제수단 등록 한번으로 간편하게 결제하실 수 있습니다.</li>
-						<li>국내 8개 카드에 대해 이용 가능합니다. (법인카드,기프트카드,해외카드 제외)</li>
-						<li>일반 신용카드의 할인혜택은 적용되지 않습니다.</li>
-					</ul>
-				</div>
-			</div>
-			<div class="radio_blk">
-				<div class="paymethod_radio">
-					<input type="radio" name="rdi-paymethod" id="rdi-paymethod-normal" value=""> 
-					<label for="rdi-paymethod-normal"><span>일반 결제</span></label>
-				</div>
-				<div class="paymethod_box" style="display: none;">
-					<ul class="sel_method">
-						<li>
-							<input type="radio" name="rdi-paynormal" id="rdi-paynormal1" value="KCP|G014_30"> 
-							<label for="rdi-paynormal1"><span>신용카드</span></label>
-						</li>
-						<li>
-							<input type="radio" name="rdi-paynormal" id="rdi-paynormal2" value="KCP|G014_10"> 
-							<label for="rdi-paynormal2"><span>실시간계좌이체</span></label>
-						</li>
-						<li>
-							<input type="radio" name="rdi-paynormal" id="rdi-paynormal3" value="KCP|G014_20"> 
-							<label for="rdi-paynormal3"><span>무통장입금</span></label>
-						</li>
-						<li>
-							<input type="radio" name="rdi-paynormal" id="rdi-paynormal4" value="KCP|G014_60"> 
-							<label for="rdi-paynormal4"><span>휴대폰 결제</span></label>
-						</li>
-						<li>
-							<input type="radio" name="rdi-paynormal" id="rdi-paynormal5" value="KAKAO|G014_99"> 
-							<label for="rdi-paynormal5">
-								<span>
-									<em class="sr-only">카카오페이 결제</em>
-									<em class="payimg kakao"></em>
-								</span>
-							</label>
-						</li>
-						<li>
-							<input type="radio" name="rdi-paynormal" id="rdi-paynormal6" value="NAVER|G014_99"> 
-							<label for="rdi-paynormal6">
-								<span>
-									<em class="sr-only">네이버페이 결제</em>
-									<em class="payimg naver"></em>
-								</span>
-							</label>
-						</li>
-						<li>
-							<input type="radio" name="rdi-paynormal" id="rdi-paynormal7" value="PAYCO|G014_30"> 
-							<label for="rdi-paynormal7">
-								<span>
-									<em class="sr-only">페이코 결제</em>
-									<em class="payimg payco"></em>
-								</span>
-							</label>
-						</li>
-					</ul>
-					<div class="agree_insurance">
-						<input id="chk-insurance" type="checkbox"> 
-						<label for="chk-insurance"> 
-							<span>소비자 피해 보상보험 신청&nbsp;&nbsp;<em class="tmark_optional">(선택)</em></span>
-							<button type="button" class="btn_link_popup" id="">
-								<span>FAQ확인</span>
-							</button>
+			<div class="paymethod_box">
+				<ul class="sel_method">
+					<li>
+						<input type="radio" name="rdi-paynormal" id="payCreditCard" value="KCP|G014_30" checked="checked">
+						<label for="payCreditCard"><span>신용카드</span></label>
+					</li>
+					<li>
+						<input type="radio" name="rdi-paynormal" id="payCellphone" value="KCP|G014_60"> 
+						<label for="payCellphone"><span>휴대폰 결제</span></label>
+					</li>
+					<li>
+						<input type="radio" name="rdi-paynormal" id="payKakao" value="KAKAO|G014_99"> 
+						<label for="payKakao">
+							<span>
+								<em class="sr-only">카카오페이 결제</em>
+								<em class="payimg kakao"></em>
+							</span>
+						</label>
+					</li>
+					<li>
+						<input type="radio" name="rdi-paynormal" id="payNaver" value="NAVER|G014_99"> 
+						<label for="payNaver">
+							<span>
+								<em class="sr-only">네이버페이 결제</em>
+								<em class="payimg naver"></em>
+							</span>
 						</label>
-						<p>
-							‘전자상거래 등에서의 소비자보호에 관한 법률‘에 따라 현금 결제 시 서울보증보험㈜가 제공하는
-							소비자 피해보상보험을<br>신청할 수 있도록 해드리고 있습니다.
-							(2013.11.28부터 시행)
-						</p>
-					</div>
-				</div>
+					</li>
+					<li>
+						<input type="radio" name="rdi-paynormal" id="payPayco" value="PAYCO|G014_30"> 
+						<label for="payPayco">
+							<span>
+								<em class="sr-only">페이코 결제</em>
+								<em class="payimg payco"></em>
+							</span>
+						</label>
+					</li>
+					<li>
+						<input type="radio" name="rdi-paynormal" id="payRealBank" value="KCP|G014_10"> 
+						<label for="payRealBank"><span>실시간계좌이체</span></label>
+					</li>
+					<li>
+						<input type="radio" name="rdi-paynormal" id="payVirtualBank" value="KCP|G014_20"> 
+						<label for="payVirtualBank"><span>무통장입금</span></label>
+					</li>
+				</ul>
 			</div>
 		</div>
 		<div class="form_field">
 			<div class="agree_paymethod">
 				<input id="chk-agree_paymethod" type="checkbox">
-				<label for="chk-agree_paymethod"> 
-					<span>선택한 결제수단으로 향후 결제 이용에 동의합니다.&nbsp;&nbsp;<em class="tmark_optional">(선택)</em>
-				</span>
+				<label for="chk-agree_paymethod">
+					 <span>선택한 결제수단으로 향후 결제 이용에 동의합니다.&nbsp;&nbsp;
+						<em class="tmark_optional">(선택)</em>
+					</span>
 				</label>
 			</div>
 		</div>
-	</div>
-	<div class="area_paymentinfo">
-		<div class="paymentinfo">
-			<div class="payinfo_blk on">
-				<a href=""> 개인정보 제공에 대한 동의 <span>닫기</span>
-				</a>
-				<div class="infotxt">개인정보제공에 대한 동의 내용입니다.개인정보제공에
-					대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의
-					내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에
-					대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의
-					내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에
-					대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의
-					내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에
-					대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의
-					내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에
-					대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의
-					내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에
-					대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의
-					내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에
-					대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의
-					내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.</div>
-			</div>
-			<div class="payinfo_blk">
-				<a href=""> 결제대행 서비스 약관 동의 <span>보기</span>
-				</a>
-				<div class="infotxt">결제대행서비스 약관 동의 내용입니다.결제대행서비스
-					약관 동의 내용입니다.결제대행서비스 약관 동의 내용입니다.결제대행서비스 약관 동의
-					내용입니다.결제대행서비스 약관 동의 내용입니다.결제대행서비스 약관 동의 내용입니다.결제대행서비스
-					약관 동의 내용입니다.결제대행서비스 약관 동의 내용입니다.결제대행서비스 약관 동의
-					내용입니다.결제대행서비스 약관 동의 내용입니다.결제대행서비스 약관 동의 내용입니다.결제대행서비스
-					약관 동의 내용입니다.결제대행서비스 약관 동의 내용입니다.결제대행서비스 약관 동의
-					내용입니다.결제대행서비스 약관 동의 내용입니다.결제대행서비스 약관 동의 내용입니다.결제대행서비스
-					약관 동의 내용입니다.결제대행서비스 약관 동의 내용입니다.결제대행서비스 약관 동의
-					내용입니다.결제대행서비스 약관 동의 내용입니다.결제대행서비스 약관 동의 내용입니다.결제대행서비스
-					약관 동의 내용입니다.결제대행서비스 약관 동의 내용입니다.결제대행서비스 약관 동의
-					내용입니다.결제대행서비스 약관 동의 내용입니다.결제대행서비스 약관 동의 내용입니다.결제대행서비스
-					약관 동의 내용입니다.결제대행서비스 약관 동의 내용입니다.결제대행서비스 약관 동의
-					내용입니다.결제대행서비스 약관 동의 내용입니다.결제대행서비스 약관 동의 내용입니다.결제대행서비스
-					약관 동의 내용입니다.결제대행서비스 약관 동의 내용입니다.결제대행서비스 약관 동의
-					내용입니다.결제대행서비스 약관 동의 내용입니다.결제대행서비스 약관 동의 내용입니다.</div>
-			</div>
-		</div>
-
-		<div class="agree_payment">위 주문내역을 확인 하였으며, 회원 본인은 결제에 동의합니다.</div>
-	</div>
-	<div class="area_paybtn">
 		<div class="form_field">
-			<button type="button" class="btn btn_primary btn_block" id="btn_payment">동의 후 123,456,789원 결제하기</button>
+			<div class="agree_insurance">
+				<input id="chk-insurance" type="checkbox"> 
+					<label for="chk-insurance"> 
+						<span>소비자 피해 보상보험 신청&nbsp;&nbsp;<em class="tmark_optional">(선택)</em></span> 
+						<a href="" class="btn_underline"><span>FAQ확인</span></a>
+				</label>
+				<p>
+					‘전자상거래 등에서의 소비자보호에 관한 법률‘에 따라 현금 결제 시 서울보증보험㈜가 제공하는 소비자
+					피해보상보험을<br>신청할 수 있도록 해드리고 있습니다. (2013.11.28부터 시행)
+				</p>
+			</div>
 		</div>
 	</div>
-</div> 
+</div> <!-- //결제수단 선택 -->
+
 
 <script th:inline="javascript">
 var dispYn = [[${order.dispYn}]]; // 노출여부
@@ -275,10 +114,8 @@ $(document).ready( function() {
 	// 화면펼침
 	if (dispYn == "Y") {
 		$("#paymentInfo .fold_head").addClass("on");
-		$("#paymentInfo .fold_cont").css("display", "block");
+		//$("#paymentInfo .fold_cont").css("display", "block");
 		$("#rdi-paymethod-normal").attr("checked", "checked");
-		$(".radio_blk").eq(1).addClass("on");
-		$(".radio_blk").eq(1).find(".paymethod_box").show();
 	}
 });
 </script>

src/main/webapp/WEB-INF/views/web/planning/PlanningMainFormWeb.html

@@ -18,7 +18,7 @@
  -->
 <body>
 <th:block layout:fragment="content">
-	<!--  container -->
+<!--  container -->
 	<div id="container" class="container dp">
 		<div class="breadcrumb"> 
 			<ul>
@@ -37,85 +37,76 @@
                     </div>
 				</div>
 				<div class="cont_body">
-                    <div class="best_nav">
-                        <ul>
-                            <li><button th:class="${cateNo == null ? 'active' : ''}" onclick="cfnGoToPage(_PAGE_PLANNING_MAIN);">전체</button></li>
-                             <th:block th:each="CategoryData, CategoryStat : ${categoryList}">
-                             <li><button th:class="${CategoryData.cate1No == cateNo ? 'active' : '' }" th:onclick="|cfnGoToPage(_PAGE_PLANNING_MAIN+'?cateNo=*{CategoryData.cate1No}');|">[[${CategoryData.cate1Nm}]]</button></li>
-						    </th:block>
-						    	
-                        </ul>
+                    <div class="taps">
+                        <div>
+                            <ul>
+                                 <li th:class="${cateNo == null ? 'active' : ''}"><a href="javascript:;" onclick="cfnGoToPage(_PAGE_PLANNING_MAIN);">전체</a></li>
+                            	 <th:block th:each="CategoryData, CategoryStat : ${categoryList}">
+                            	 <li th:class="${CategoryData.cate1No == cateNo ? 'active' : '' }" ><a href="javascript:;" th:onclick="|cfnGoToPage(_PAGE_PLANNING_MAIN+'?cateNo=*{CategoryData.cate1No}');|">[[${CategoryData.cate1Nm}]]</a></li>
+						    	</th:block>
+                            </ul>
+                        </div>
                     </div>
                     <div class="ui_row">
                         <div class="ui_col_12">
                             <div class="form_count">
-                                <p><span>[[${planCount}]]</span>개의 기획전</p>
+                                <p><span th:text="${planCount}"></span>개의 기획전</p>
                             </div>
                         </div>
-                    </div>
-                    <!-- 기획전 0개 -->
-                  	<th:block th:if="${planCount == 0}">
-                   	 <div class="list_content nodata"> <!-- 데이터 없을시 클래스 nodata 추가 -->
-                    </th:block>
-                     <!-- 기획전 1개 이상 -->
-                  	<th:block th:if="${planCount != 0}">
-                   	 <div class="list_content"> <!-- 데이터 없을시 클래스 nodata 추가 -->
-                    </th:block>
-                        <div class="list_defult">
-                            <div>
-                                <img src="/images/pc/ico_content_find.png" alt="">
-                                <p>등록된 기획전이 없습니다.</p>
-                            </div>
-                            <div class="ui_row">
-                                <button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_MAIN);"><span>홈으로 가기</span></button>
-                            </div>
+                    </div> 
+                    <div class="exhi_list"> <!-- 데이터 없을시 클래스 nodata 추가 -->
+                    	<th:block th:if="${planCount < 1}">
+                    	 <div class="list_content nodata">
+	                     	 <div class="list_defult">
+	                            <div>
+	                                <img src="/images/pc/ico_content_find.png" alt="">
+	                                <p>등록된 기획전이 없습니다.</p>
+	                            </div>
+	                            <div class="ui_row">
+	                                <button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_PLANNING_MAIN);"><span>홈으로 가기</span></button>
+	                            </div>
+	                        </div>
                         </div>
-                        
-                        
-                        <div class="itemsGrp">
-                        <th:block th:each="PlanData, PlanStat : ${planList}">
+                       </th:block>
+                        <div class="itemsGrp" id="planListDiv">
+                       	  <th:block th:each="PlanData, PlanStat : ${planList}">
                             <div class="exhi_item">
-                             
                                 <div class="exhi_item_img">
-                                    <a href="javascript:void(0);" th:onclick="cfnGoToPage(_PAGE_PLANNING_DETAIL + '?planSq=' + [[${PlanData.planSq}]]);">
-                                    	<th:block th:if="${PlanData.newPlan != null}">
-                                        <div class="shape ranker"><span>NEW</span></div>
-                                        </th:block>
-                                        <img th:src="${@environment.getProperty('domain.image')+'/planning/'+PlanData.mainPimg}" style="width: 100%;" alt=""> <!-- 430x430 사이즈 최적 -->
+                                    <a th:onclick="planDetailSearch([[${PlanData.planSq}]])">
+                                        <div class="shape ranker" th:if="${PlanData.newPlan != null}"><span>NEW</span></div>
+                                        <img th:src="${@environment.getProperty('domain.image')+'/planning/'+PlanData.mainPimg}"  alt=""> <!-- 430x430 사이즈 최적 -->
                                         <div class="exhi_detail">
-                                        	<th:block th:if="${PlanData.cnt > 1}">
-                                            <p class="brand">[[${PlanData.brand}]] 외</p>
-                                            </th:block>
-                                            <th:block th:if="${PlanData.cnt <= 1}">
-                                            <p class="brand">[[${PlanData.brand}]]</p>
-                                            </th:block>
-                                            <h3 class="tit">[[${PlanData.planNm}]]</h3>
-                                            <p class="sale">[[${PlanData.dtlTitle1}]]</p>
+                                            <p class="brand" th:if="${PlanData.cnt > 1}" th:text="${PlanData.brand}+' 외'"></p>
+                                            <p class="brand" th:unless="${PlanData.cnt > 1}" th:text="${PlanData.brand}"></p>
+                                            <h3 class="tit" th:text="${PlanData.planNm}"></h3>
+                                            <p class="sale" th:text="${PlanData.dtlTitle1}"></p>
                                         </div>
                                     </a>
                                 </div>
-                             	
                                 <div class="exhi_item_pr">
                                     <ul class="prod_list clear">
-                                    <th:block th:each="goodsList, k : ${goodsList}">
-										<th:block th:if="${PlanData.planSq} == ${goodsList.planSq} and ${goodsList.goodsCd} != null">
+                                     <th:block th:each="goodsList, k : ${goodsList}">
+                                      <th:block th:if="${PlanData.planSq} == ${goodsList.planSq} and ${goodsList.goodsCd} != null">
                                         <li>
-                                            <a href="">
-                                                <div class="img">
-                                                   <img th:src="${@environment.getProperty('upload.goods.view') + '/' + goodsList.sysImgNm}"  style="width: 100%;" alt="">
+                                            <div class="item_prod">
+                                                <div class="item_state">
+                                                    <a href="#none" class="itemLink">
+                                                        <div class="itemPic">
+                                                            <img alt="" class="vLHTC pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + goodsList.sysImgNm}">
+                                                        </div>
+                                                        <div class="itemName" th:text="${goodsList.goodsNm}"></div>
+                                                        <p class="itemPrice" th:text="${#numbers.formatInteger(goodsList.currPrice, 0,'COMMA')} + '원'"></p>
+                                                    </a>
                                                 </div>
-                                                <div class="txt">
-                                                    <p class="pr_tit">[[${goodsList.goodsNm}]]</p>
-                                                    <p class="price"><span th:text="${#numbers.formatInteger(goodsList.currPrice, 0,'COMMA')}"></span>원</p>
-                                                </div>
-                                            </a>
+                                            </div>
                                         </li>
+                                       </th:block>
+                                     </th:block>
+                                   
                                     </ul>
                                 </div>
                             </div>
                             </th:block>
-             		
-             				
                         </div>
                     </div>
                 </div>
@@ -123,9 +114,21 @@
         </div>
     </div>
 	<!-- // container -->	
-
 <script th:inline="javascript">
+function planDetailSearch(obj) {
+	console.log("gkgk");
+	var planSq = obj;
+	let data = {planSq : planSq};
+	var jsonData = JSON.stringify(data);
+
+	
+	gagajf.ajaxJsonSubmit(
+			'/planning/detail/form', jsonData,
+			function() {
+				cfnGoToPage(_PAGE_PLANNING_DETAIL);
+			});
 
+}
 </script>
 
 </th:block>

src/main/webapp/ux/pc/css/common.css

@@ -806,6 +806,7 @@ content: "〉";font-size: 12px;padding-left: 8px;
 .itemPrice_original {position: relative;margin-left: 5px;line-height: 16px;font-size: 14px;font-weight: 300;color: rgb(204, 204, 204);}
 .itemPrice_original::after{content: '';display: inline-block;width: 100%;height: 1px;background: rgb(204, 204, 204);position: absolute;top: 50%;left: 0;bottom:auto;right:auto;transform: translateY(-50%);}
 .itemPercent {position: absolute;top: 0px;right: 0px;bottom: auto;left: auto;margin-left: 15px;line-height: 16px;font-size: 16px;font-weight: 300;color: #fd4802;}
+.itemViewCount {display:inline-block; height:30px; margin-top:20px; padding:7px 14px; border:2px solid #fd4802; color:#fd4802; font-size:14px; font-weight:300; line-height:1; border-radius:15px;}
 
 /* items Ellipsis */
 .itemBrand {position: relative;overflow: hidden;white-space: normal;overflow-wrap: break-word;display: block; max-width:95%;}
@@ -1171,6 +1172,10 @@ input[type="file"] {
   color: #bbb;
   background-color: #f5f5f5 !important;
 } 
+.select_custom[disabled] .combo .select > div {
+  position:relative;
+  z-index:1;
+}
 .select_custom .combo .list>li[aria-disabled="true"] {
 	text-decoration: line-through;
   /*background: #f5f5f5;*/

src/main/webapp/ux/pc/css/layout.css

@@ -2335,7 +2335,7 @@ dp_banner_slide03
 	.od .od_cont button.btn_sm {height:34px; min-width:70px; padding:9px 13px; font-size:14px; font-weight:200;}
 	.od .od_cont button.btn_dark {font-weight:200;}
 	.od .od_cont button.btn_default {border-color:#a7a7a7; color:#222;}
-	.od .od_cont .form_control {min-width:400px; height:42px; padding-left:18px; font-size:14px;} 
+	.od .od_cont .form_control {min-width:400px; height:42px; padding-left:18px; color:#222; font-size:14px;} 
 	.od .od_cont .sec_head {margin-bottom:60px;}
 	.od .od_cont .sec_head .tbl .number {color:#fd4802; font-weight:500;}
 	.od .od_cont .sec_head .tbl td {text-align:left;}
@@ -2373,7 +2373,7 @@ dp_banner_slide03
 	.od .od_side {float:right; width:320px;}
 	.od .od_side h3 {color:#222; font-size:24px; font-weight:500;}
 	.od .od_side h4 {font-size:18px; font-weight:500; margin-bottom:20px;}
-	.od .od_side .item_gd figure {position:relative; height:150px;}
+	.od .od_side .item_gd figure {position:relative; min-height:150px;}
 	.od .od_side .item_gd figure::after {content: ''; display: block; clear: both;}
 	.od .od_side .item_gd figure .thumb {float:left; width:100px; height:150px; padding-top:0;} 
 	.od .od_side .item_gd figure figcaption {display:table-cell; width:178px; height:150px; vertical-align:middle; padding-left:20px}
@@ -2424,6 +2424,7 @@ dp_banner_slide03
 	.od .od_side .area_order .totalprice_box dl dd span {font-size:24px;}
 	.od .od_side .area_order .totalprice_box .info_point {margin-top:12px; color:#888; font-size:14px; font-weight:300; text-align:right; line-height:16px;}
 	.od .od_side .area_order .totalprice_box .info_point .save_point {display:inline-block; padding-left:22px; height:16px; background:url('/images/pc/ico_point.png') no-repeat 0 50%; color:#fd4802;}
+	.od .od_side .area_order .totalprice_box .info_extra {margin-top:12px; color:#888; font-size:14px; font-weight:300; text-align:left; line-height:16px;}
 	.od .od_side .area_order .btn_box {padding:0px 30px 35px;}
 	.od .od_side .area_order .btn_box .btn {height:60px; font-weight:300; padding:20px}
 	.od .od_side .area_salecoupon {margin-top:35px}
@@ -2450,6 +2451,8 @@ dp_banner_slide03
 	.od .shopping_bag  {}
 	.od .shopping_bag table th,
 	.od .shopping_bag table td {vertical-align:middle;}
+	.shopping_bag .nodata {padding-top:110px;}
+	.shopping_bag .nodata .txt_box::before {background-image:url('/images/pc/ico_cart_empty.png');}
 	.shopping_bag .sec_head table .form_field > div {display:inline-block; margin-left:30px;}
 	.shopping_bag .sec_head table .form_field span {display:inline-block; height:22px; line-height:22px;}
 	.shopping_bag .sec_head table .form_field span .tag {margin-right:5px}
@@ -2458,8 +2461,35 @@ dp_banner_slide03
 	.shopping_bag .sec_body .sec_select > div .btn {position:absolute; right:0; top:50%; transform:translateY(-50%); height:34px; padding:10px; font-size:14px; font-weight:200;}
 	.shopping_bag .sec_body .sec_part {margin-bottom:60px;}
 	.shopping_bag .sec_body .sec_part:last-child {margin-bottom:0;}
-	.shopping_bag .sec_body .sec_part h3 {margin-bottom:30px}
+	/* .shopping_bag .sec_body .sec_part h3 {margin-bottom:30px} */
+	.shopping_bag .sec_body .sec_part h3{padding-bottom: 30px;border-bottom: 1px solid #ddd;}
 	.shopping_bag .sec_body .sec_part h3 .tit_info {margin-left:15px; color:#666; font-size:16px; font-weight:300;}
+	.shopping_bag .sec_body .sec_part h4 .tit_info {margin-left:10px;color: #666;font-size: 16px;font-weight: 300;}
+	.shopping_bag .area_part {border-top: 0;}
+	.shopping_bag .area_part {padding-top: 40px;}
+	.shopping_bag .area_part + .area_part{margin-top: 0px;padding-top: 0px;}
+	.shopping_bag .area_part + .area_part h4{padding-top: 0px;}
+	.shopping_bag .area_part + .area_part .part_goods .goods_cont:last-child{padding-bottom: 0px;}
+	.shopping_bag .area_part + .area_part .part_goods .goods_cont .goods_info:last-child {padding-bottom:0px;}
+	.shopping_bag .area_part + .area_part .part_goods .goods_cont .goods_info:last-child{border-bottom: 0px;}
+	.shopping_bag .part_goods .goods_cont .goods_info:last-child{margin-bottom: 0px;padding-bottom: 40px;border-bottom: 1px dashed #ddd;}
+	
+
+	/* od_shopping_Bag 실시간조회상품 */
+	.container .wrap .content.od_realtime {position:relative; max-width:1460px; margin-top:120px;}
+	.od .od_realtime {}
+	.od_realtime .swiper-container {padding:0px;}
+	.od_realtime .swiper-container .swiper-wrapper {}
+	.od_realtime .swiper-container .swiper-wrapper .swiper-slide .item_prod {width:100%}
+	.od_realtime .swiper-container .swiper-wrapper .swiper-slide .item_state {padding:0;}
+	.od_realtime .swiper-button-prev {left:-70px; top:275px}
+	.od_realtime .swiper-button-next {right:-70px; top:275px}
+	.od_realtime .swiper-button-prev::after,
+	.od_realtime .swiper-button-next::after {content: ''; display:inline-block; width:27.5px; height:50px; background:url(/images/pc/ico_arr_lg.png) no-repeat;}
+	.od_realtime .swiper-button-prev::after {background-position:0 50%;}
+	.od_realtime .swiper-button-next::after {background-position:100% 50%;}
+	.od_realtime .swiper-container .swiper-pagination {position:relative; display:block; left:auto; right:auto; bottom:auto; margin-top:60px}
+	@media screen and (max-width:1460px) {}
 
 	/* od_shopping_Bag 추천상품 */
 	.container .wrap .content.od_recommend {position:relative; max-width:1460px; margin-top:120px;}
@@ -2482,6 +2512,7 @@ dp_banner_slide03
 	.odPayment .icon_tag {display:inline-block; vertical-align:top;}
 	.odPayment .icon_tag::after {content:''; clear:both; display:inline-block; font-weight:300;}
 	.odPayment .icon_tag .tag {float:left; margin-left:6px}
+	.odPayment .input_wrap > .btn.btn_dark.btn_sm {height:42px; min-width:70px; padding:13px; font-size:14px; font-weight:300;}
 	.odPayment .foldGroup .fold_head .data .total_gift,
 	.odPayment .foldGroup .fold_head .data .total_deduct {color:#fd4802; font-weight:500;}
 	.odPayment .foldGroup .fold_head .data .maxdisc_amount {padding:0; margin:0; color:#fd4802;}
@@ -2490,6 +2521,8 @@ dp_banner_slide03
 	.odPayment .fold_cont .area_overseas,
 	.odPayment .fold_cont .area_customitem,
 	.odPayment .fold_cont .area_selpoint {padding-top:30px; margin-top:30px; border-top:1px dashed #ddd;}
+	.odPayment .fold_cont .area_selpoint input[type="text"]:read-only,
+	.odPayment .fold_cont .area_selpoint input[type="text"]:disabled {background:#fff;}
 	.odPayment .fold_cont .area_overseas .info_txt,
 	.odPayment .fold_cont .area_customitem .info_txt {margin-top:25px;}
 
@@ -2547,7 +2580,7 @@ dp_banner_slide03
 	.odPayment .gift_box .form_field .gift label > span {display:inline-block; width:100%;}
 	.odPayment .gift_box .form_field .gift label .thumb {position:absolute; left:50px; top:10px; width:77px; height:98px; background-color:#eee;}
 	.odPayment .gift_box .form_field .gift label .thumb img {width:100%;}
-	.odPayment .gift_box .form_field .gift label .name {width:160px; color:#666; font-size:14px; line-height:1.4; font-weight:200;}
+	.odPayment .gift_box .form_field .gift label .name {width:100%; color:#666; font-size:14px; line-height:1.4; font-weight:200;}
 	.odPayment .gift_box .form_field .gift label .deduct {margin-top:5px;color:#fd4802; font-weight:300; font-size:14px;}
 	.odPayment .form_field .agree_gift {display:block; width:100%; padding-top:30px; margin-top:30px; border-top:1px dashed #ddd; text-align:center;}
 	.odPayment .form_field .agree_gift .btn_underline {display:inline-block; margin-left:10px; padding:0px; border-bottom-color:#888;}
@@ -2560,7 +2593,6 @@ dp_banner_slide03
 	.odPayment .area_seldiscount dl > div dt {width:170px; margin-right:0;}
 	.odPayment .area_seldiscount dl > div dd {width:485px;}
 	.odPayment .area_seldiscount .sale_coupon_box {}
-	.odPayment .area_seldiscount .sale_coupon_box button.btn_sm {height:42px; min-width:70px; padding:13px; font-size:14px; font-weight:300;}
 	.odPayment .area_seldiscount .sale_coupon_box .btn_default {width:80px; margin-left:14px; margin-top:-13px; vertical-align:top;}
 	.odPayment .area_seldiscount .sale_coupon_box .maxdisc_amount {color:#fd4802; font-weight:300;}
 	.odPayment .area_seldiscount .sale_coupon_box .form_field {margin-top:18px}
@@ -2591,8 +2623,8 @@ dp_banner_slide03
 	.odPayment .area_selpoint .form_field .useable_point em {font-weight:500;}
 	.odPayment .area_selpoint .form_field .remain_point {margin-right:10px; color:#fd4802; font-size:14px; font-weight:200;}
 	.odPayment .area_selpoint .form_field p {margin-top:15px; color:#888; font-size:14px;}
-	.odPayment .area_selpoint .form_field .agree_receipt {margin-top:20px;}
-	.odPayment .area_selpoint .form_field .agree_receipt .info_box {margin-top:10px;}
+	/*.odPayment .area_selpoint .form_field .agree_receipt {margin-top:20px;}
+	.odPayment .area_selpoint .form_field .agree_receipt .info_box {margin-top:10px;}*/
 
 	.odPayment .fold_paymethod .fold_cont {margin-top:-10px;}
 	.odPayment .area_paymethod {}
@@ -2685,6 +2717,12 @@ dp_banner_slide03
 	.odPayment .area_paybtn .btn {height:80px; font-size:20px; font-weight:300;}
 	.odPayment .area_paybtn .btn em {font-weight:500;}
 
+	.odPayment .extra_pay {padding:0px 30px 40px; margin-bottom: 20px; border-top:1px solid #222; border-bottom:1px solid #ddd;}
+	.odPayment .extra_pay .tit_pay {padding:30px 0px; line-height:1; font-size:24px; font-weight:500;}
+	.odPayment .extra_pay .area_paymethod {}
+	.odPayment .extra_pay .area_paymethod .paymethod_box .sel_method li {width:50%;}
+
+
 	/* od_completed */
 	.od .completed {}
 	.completed .tbl table td .btn.btn_sm.btn_default {color:#222; border:1px solid #a7a7a7;}
@@ -2822,6 +2860,15 @@ dp_banner_slide03
 	.modal.opt_modify_pop .area_order .opt_count .number_count .plus::after {content:''; background-position:100% 0;}
 	.modal.opt_modify_pop .area_order .opt_count .number_count .minus::after {content:''; background-position:0 0;}
 	.modal.opt_modify_pop .area_order .opt_count .number_count input[type='text'] {width:44px; height:40px; padding:0; text-align:center; color:#222; font-size:15px; font-weight:200; border:none;}
+	
+	/* moresale_pop */
+	.modal.moresale_pop .area_benefit {margin-bottom:30px; padding-top:4px; color:#fd4802; font-size:14px;}
+	.modal.moresale_pop .area_benefit::after {clear:both; display:block;}
+	.modal.moresale_pop .area_benefit .tag {float:left; width:55px; margin-top:-4px;}
+	.modal.moresale_pop .area_benefit p {float:left;}
+	.modal.moresale_pop .area_benefit p span {float:left;  position:relative; padding:0px 12px;}
+	.modal.moresale_pop .area_benefit p span::before {content:''; position:absolute; width:1px; height:14px; left:0px; top:50%; transform:translateY(-50%); background:#ddd;}
+	.modal.moresale_pop .area_benefit p span:first-child::before {display:none;}
 
 	/**** od_odPayment_popup ****/
 	/* couponModify_pop */	

src/main/webapp/ux/pc/js/common-ui.js

@@ -394,17 +394,6 @@ $(document).ready( function() {
 		$("#rdi-paymethod-quick").trigger("click");
 		return false;
 	});
-
-	/* 상품상세 > 상품문의 _accordion */
-	$(document).on('click','.pd_qnalist .foldGroup .fold_head',function(e){
-		if($(this).parent().hasClass('secret_qna')){
-			alert('비밀글은 열람하실 수 없습니다.');
-		}else {
-			$(this).parents('.foldGroup li').find('.fold_cont').slideToggle(100);
-			$(this).toggleClass('on');
-		}
-	});
-	
 	
 	/* 아이디/비밀번호 찾기_accordion:open */
 	$(document).on('click','.mb .foldGroup.checkcase .fold_head',function(e){	
@@ -442,6 +431,7 @@ $(document).ready( function() {
 		return false;
 	});
 
+
 	/* 같은 데이터 노출시 동일 영역끼리 병합 */
 	$(".merge_row").each(function() {
 		var txtcont = $(this).text();
@@ -494,6 +484,156 @@ $(document).ready( function() {
 });
 
 
+/* * * * * * * * * * * * * * * * * * * * * * * 
+
+6. Content (상품상세)
+
+* * * * * * * * * * * * * * * * * * * * * */
+$(document).ready( function() {
+
+	//팝업 - 상품썸네일 크게보기
+	$(document).on('click','.pd_detail .area_pic .thumb_list_wrap ul li',function(e){
+		$('body').addClass('lock');
+		$("#pdItemThumbPop .full_pop_container").empty();
+		var thumbIndex = $(this).index() + 1;
+		var thumbImglength = $('.pd_detail .area_pic .thumb_list_wrap ul li').length;
+		var popThumbImgHtml = "";
+		for (i = 1; i <= thumbImglength; i++) {
+			//var thumbImg = $(this).find('img');
+			var thumbContentHtml = $('.pd_detail .area_pic .thumb_list_wrap ul li:nth-child('+i+') a .thumb').html();
+			popThumbImgHtml += "<div id=popThumb"+i+" class='scaleview'>" + thumbContentHtml + "</div>";
+		}
+		$("#pdItemThumbPop .full_pop_container").append(popThumbImgHtml);
+		$("#pdItemThumbPop").show(); 
+	
+		var scrollThumbPop = $('#popThumb'+thumbIndex).offset().top;
+		var currentTop = $(window).scrollTop();
+		$('#pdItemThumbPop').animate({scrollTop : scrollThumbPop - currentTop}, 1000);
+		return false;
+	}).on('click','#btn_close_itemThumbPop, .pd_itemthumb_pop .scaleview img',function(e){
+		$("#pdItemThumbPop").scrollTop(0);
+		$("#pdItemThumbPop").hide(); 
+		$('body').removeClass('lock');
+		return false;
+	});			                
+
+	// 상품 대표설명 > 좌측 상품썸네일 navi, 우측 상품정보 고정 
+	$(window).scroll(function(){
+		var scrollTop= $(window).scrollTop();
+		var headerH =  $('#header .hd_top_banner').outerHeight() + $('#header .area').outerHeight();
+		var miniGnbH = $('#header.minify .gnb').outerHeight();
+		var firstFixed =  headerH + miniGnbH;
+		var thumbListWrap_h = $('.pd_detail .thumb_list_wrap').outerHeight();
+		var descWrap_h = $('.pd_detail .desc_wrap').outerHeight();
+		var secondFixed_left =  firstFixed + $('.pd_detail').outerHeight() - $('.pd_detail .thumb_nav_wrap').outerHeight();
+		var secondFixed_right =  firstFixed + $('.pd_detail .desc_wrap').outerHeight() - $(window).outerHeight();
+		var secondFixed_right2 =  firstFixed + $('.pd_detail').outerHeight() - $(window).outerHeight();
+
+		var pdDetail_t = firstFixed + $('.pd_detail').outerHeight() + 100;
+		var pdDescWrap_t = pdDetail_t + $('.pd_desc_wrap').outerHeight();
+		var optionFixed_right =  pdDetail_t + $('.pd_desc_wrap').outerHeight() - $('.area_option .opt_wrap').outerHeight();
+
+		/* 좌측 상품썸네일 navi 고정 */
+		if (scrollTop > firstFixed){  
+			$('.pd_detail .area_pic .thumb_nav_wrap').removeClass('fixbottom').addClass('fixtop');
+		}
+		else if (scrollTop < firstFixed){
+			$('.pd_detail .area_pic .thumb_nav_wrap').removeClass('fixtop');
+		}
+		if (scrollTop > secondFixed_left){
+			$('.pd_detail .area_pic .thumb_nav_wrap').removeClass('fixtop').addClass('fixbottom');
+		} 
+		
+		/* 우측 상품정보 고정 */
+		if (thumbListWrap_h > descWrap_h && scrollTop > secondFixed_right) {
+			$('.pd_detail .area_desc .desc_wrap').removeClass('absbottom').addClass('fixbottom');
+		}
+		else if (thumbListWrap_h > descWrap_h && scrollTop < secondFixed_right) {
+			$('.pd_detail .area_desc .desc_wrap').removeClass('fixbottom');
+		}
+		if (thumbListWrap_h > descWrap_h && scrollTop > secondFixed_right2) {
+			$('.pd_detail .area_desc .desc_wrap').removeClass('fixbottom').addClass('absbottom');
+		}
+
+		/* 딜 - 상세정보 탭 고정 */
+		if (scrollTop > pdDetail_t && scrollTop < pdDescWrap_t){
+			$('.tab_detail_nav').addClass('fix');
+		} else {
+			$('.tab_detail_nav').removeClass('fix');
+		}
+
+		/* 딜 - 우측옵션 고정 */
+		if (scrollTop > pdDetail_t){
+			$('.area_option .opt_wrap').removeClass('absbottom').addClass('fixtop');
+		} else if (scrollTop < pdDetail_t) {
+			$('.area_option .opt_wrap').removeClass('fixtop');
+		}		
+		if (scrollTop > optionFixed_right){
+			$('.area_option .opt_wrap').removeClass('fixtop').addClass('absbottom');
+		}
+
+	});
+
+	//슬라이드 - 상품 대표설명 > 좌측 상품썸네일 navi
+	var thumbNavSwiper = new Swiper('.pd_detail .area_pic .thumb_nav_wrap .swiper-container', {
+		direction: 'vertical',
+		allowTouchMove: false,
+		slidesPerView: 6,
+		slidesPerGroup : 6,
+		spaceBetween: 10,
+		navigation: {
+			nextEl: '.area_pic .thumb_nav_wrap .swiper-button-next',
+			prevEl: '.area_pic .thumb_nav_wrap .swiper-button-prev',
+		},
+	});
+
+	//상품 대표설명 > 상품썸네일 1개일때
+	var thumblist = $('.pd_detail .area_pic .thumb_list_wrap li');    
+	var thumblistLength = thumblist.length;
+	if (thumblistLength == 1) {
+		thumblist.parents('.area_pic').addClass('onlyitem');
+	} else {
+		thumblist.parents('.area_pic').removeClass('onlyitem');
+	}
+
+	//상품 대표설명 > 좌측 상품썸네일 6개 이하일때
+	var thumbnavSlide = $('.pd_detail .area_pic .thumb_nav_wrap .swiper-container .swiper-slide');    
+	var thumbnavLength = thumbnavSlide.length;
+	if (thumbnavLength < 7) {
+		thumbnavSlide.parents('.thumbnav').addClass('disabled');
+	} else {
+		thumbnavSlide.parents('.thumbnav').removeClass('disabled');
+	}
+
+	//상품 대표설명 > 좌측 상품썸네일 navi 선택시 해당 대표 썸네일 위치로 이동
+	$(document).on('click','.pd_detail .area_pic .thumbnav .swiper-slide a',function(e){
+		e.preventDefault();
+		var hdHeight = $('#header').outerHeight();
+		var targetThumb = $($(this).attr('href'));
+		var topThumb = targetThumb.offset().top - hdHeight;
+		$(this).parents('.thumbnav').find('.swiper-slide').removeClass('on');
+		$(this).parent('.swiper-slide').addClass('on');
+		targetThumb.siblings('li').removeClass('on');
+		targetThumb.addClass('on');
+		$('html,body').animate({scrollTop : topThumb}, 500);
+		return false;
+	});
+
+
+	/* 상품상세 > 상품문의 _accordion */
+	$(document).on('click','.pd_qnalist .foldGroup .fold_head',function(e){
+		if($(this).parent().hasClass('secret_qna')){
+			alert('비밀글은 열람하실 수 없습니다.');
+		}else {
+			$(this).parents('.foldGroup li').find('.fold_cont').slideToggle(100);
+			$(this).toggleClass('on');
+		}
+	});
+	
+
+
+});
+
 /////////////////////////////////////////////////////// 
 // 이하  미사용 스크립트 정리예정
 //$( document ).ready(function() {

src/main/webapp/ux/pc/js/mypage.js

@@ -4,6 +4,12 @@ var fnGoToOrderDetail = function(param) {
 	cfnGoToPage(_PAGE_MYPAGE_ORDER_DETAIL + ordNo);
 }
 
+// 상품상세 페이지 이동 처리
+var fnGoToGoodsDetail = function(param) {
+	let goodsCd = $(param).attr('goodsCd');
+	cfnGoToPage(_PAGE_GOODS_DETAIL + goodsCd);
+}
+
 // 배송조회 버튼 클릭 이벤트
 var fnGetDeliveryInfo = function(param) {
 	let invoiceNo = $(param).attr('invoiceNo');
@@ -15,21 +21,17 @@ var fnGetDeliveryInfo = function(param) {
 
 // 구매확정 버튼 클릭 이벤트
 var fnDecideOrder = function(param) {
-	let ordDtlNoArr = $(param).parent().parent().find('input[name=ordDtlNo]');
-	let ordDtlStatArr = $(param).parent().parent().find('input[name=ordDtlStat]');
-	
 	let orderDecisionArr = [];
-	$.each(ordDtlNoArr, function(idx, item) {
-		if (ordDtlStatArr[idx].value == 'G013_60') {
-			orderDecisionArr.push(item.value);
-		}
-	});
-	
+	let ordNo = $(param).attr('ordNo');
+	let ordDtlNo = $(param).attr('ordDtlNo');
+
+	orderDecisionArr.push(ordDtlNo);
+
 	if (orderDecisionArr.length == 0) {
 		mcxDialog.alert('구매확정 가능한 상품이 없습니다.');
 		return false;
 	}
-	
+
 	mcxDialog.confirm('구매확정 처리를 하시겠습니까?', {
 		cancelBtnText: "취소",
 		sureBtnText: "확인",
@@ -54,78 +56,29 @@ var fnDecideOrder = function(param) {
 }
 
 // 리뷰작성 버튼 클릭 이벤트
-var fnCreateReview = function(param, bannerYn) {
-	let ordDtlNoArr;
-	let ordDtlStatArr;
-	let reviewSqArr;
-
-	if (bannerYn == 'Y') {
-		ordDtlNoArr = $(param).parent().parent().find('input[name=ordDtlNo]');
-		ordDtlStatArr = $(param).parent().parent().find('input[name=ordDtlStat]');
-		reviewSqArr = $(param).parent().parent().find('input[name=reviewSq]');
-	} else {
-		ordDtlNoArr = $(param).parent().parent().parent().parent().find('input[name=ordDtlNo]');
-		ordDtlStatArr = $(param).parent().parent().parent().parent().find('input[name=ordDtlStat]');
-		reviewSqArr = $(param).parent().parent().parent().parent().find('input[name=reviewSq]');
-	}
-	
-	let canReviewSqArr = [];
-	$.each(ordDtlNoArr, function(idx, item) {
-		if (ordDtlStatArr[idx].value == 'G013_70' && reviewSqArr[idx].value == 0) {
-			canReviewSqArr.push(item.value);
-		}
-	});
-	
-	if (canReviewSqArr.length == 0) {
-		mcxDialog.alert('리뷰작성 가능한 상품이 없습니다.');
-		return false;
-	}
-	
+var fnCreateReview = function(param) {
+	let ordNo = $(param).attr('ordNo');
+	let ordDtlNo = $(param).attr('ordDtlNo');
+
 	// TODO
 	// 리뷰 작성페이지 이동
 	let data = {};
-	
+
 	data.ordNo = ordNo;
-	data.ordDtlNoArr = canReviewSqArr;
-	
+	data.ordDtlNo = ordDtlNo;
+
 	var jsonData = JSON.stringify(data);
 	
-	//gagajf.ajaxJsonSubmit('/mypage/order/decision'
-	//	, jsonData
-	//	, function() {
-	//		cfnGoToPage(_PAGE_MYPAGE_ORDER_DETAIL + ordNo);
-	//	});
-	
 }
 
 // 장바구니 담기 버튼 클릭 이벤트
-var fnCreateCart = function(param, bannerYn) {
-	let ordDtlNoArr = '';
-	let ordDtlStatArr = '';
-	let reviewSqArr = '';
-
-	if (bannerYn == 'Y') {
-		ordDtlNoArr = $(param).parent().parent().find('input[name=ordDtlNo]');
-		ordDtlStatArr = $(param).parent().parent().find('input[name=ordDtlStat]');
-		reviewSqArr = $(param).parent().parent().find('input[name=reviewSq]');
-	} else {
-		ordDtlNoArr = $(param).parent().parent().parent().parent().parent().find('input[name=ordDtlNo]');
-		ordDtlStatArr = $(param).parent().parent().parent().parent().parent().find('input[name=ordDtlStat]');
-		reviewSqArr = $(param).parent().parent().parent().parent().parent().find('input[name=reviewSq]');
-	}
-	
+var fnCreateCart = function(param) {
 	let cartArr = [];
-	$.each(ordDtlNoArr, function(idx, item) {
-		if (bannerYn != 'Y' || (bannerYn == 'Y' && ordDtlStatArr[idx].value == 'G013_70' && reviewSqArr[idx].value > 0)) {
-			cartArr.push(item.value);
-		}
-	});
-	
-	if (cartArr.length == 0) {
-		mcxDialog.alert('장바구니에 담을 상품이 없습니다.');
-		return false;
-	}
-	
+	let ordNo = $(param).attr('ordNo');
+	let ordDtlNo = $(param).attr('ordDtlNo');
+
+	cartArr.push(ordDtlNo);
+
 	// TODO
 	// 장바구니 담기 처리
 	let data = {};
@@ -135,11 +88,6 @@ var fnCreateCart = function(param, bannerYn) {
 	
 	var jsonData = JSON.stringify(data);
 	
-	//gagajf.ajaxJsonSubmit('/mypage/order/decision'
-	//	, jsonData
-	//	, function() {
-	//		cfnGoToPage(_PAGE_MYPAGE_ORDER_DETAIL + ordNo);
-	//	});
 }
 
 // 선물하기 SMS 재전송 버튼 클릭 이벤트
@@ -152,25 +100,24 @@ var fnReSendSms = function(param) {
 
 // 반품/취소/교환 버튼 클릭 이벤트
 var fnCreateChange = function(param, gubun) {
-	if (ordNo == null) {
-		ordNo = $(param).attr('ordNo');
-	}
-	
-	let ordDtlNoArr = $(param).parent().parent().parent().parent().find('input[name=ordDtlNo]');
-	
-	let changeArr = [];
-	$.each(ordDtlNoArr, function(idx, item) {
-		changeArr.push(item.value);
-	})
-	
+	let ordNo = $(param).attr('ordNo');
+	let ordDtlNo = $(param).attr('ordDtlNo');
+
 	$('#' + gubun + 'Form input[name=ordNo]').val(ordNo);
-	$('#' + gubun + 'Form input[name=ordDtlNoArr]').val(changeArr);
+	$('#' + gubun + 'Form input[name=ordDtlNo]').val(ordDtlNo);
+	mcxDialog.alertC(gubun,  {
+		sureBtnText: "확인",
+		sureBtnClick: function() {
+			if (gubun == 'cancel') {
+				document.cancelForm.submit();
+			} else if (gubun == 'return') {
+				document.returnForm.submit();
+			} else if (gubun == 'exchange') {
+				document.exchangeForm.submit();
+			}
+		}
+	});
 	
-	if (gubun == 'cancel') {
-		document.cancelForm.submit();
-	} else {
-		document.exchangeForm.submit();
-	}
 }
 
 // 주문 내역 삭제 처리
@@ -180,15 +127,13 @@ var fnDeleteOrder = function() {
 		sureBtnText: "확인",
 		sureBtnClick: function(){
 			let data = {};
-			
+
 			data.ordNo = ordNo;
-			
+
 			var jsonData = JSON.stringify(data);
-			gagajf.ajaxJsonSubmit('/mypage/order/delete'
-				, jsonData
-				, function() {
-					cfnGoToPage(_PAGE_MYPAGE);
-				});
+			gagajf.ajaxJsonSubmit('/mypage/order/delete', jsonData, function() {
+				cfnGoToPage(_PAGE_MYPAGE);
+			});
 		}
 	});
 };

src/main/webapp/ux/style24_link.js

@@ -509,11 +509,11 @@ function cfGoodsInstockAlarmInfo(goodsCd, colorCd) {
 * @access : public
 * @desc   : 상품평- 베스트 리뷰 보기
 * <pre>
-*		cfGoodsBestReviewInfo(goodsCd);
+*		cfGoodsReviewDetail(goodsCd, bestYn, photoYn, reviewSq);
 * </pre>
 */
-function cfGoodsReviewDetail(goodsCd, bestYn, reviewSq) {
-	var str = '<div class="modal fade pd_pop pd_bestreviewdetail_pop" id="layer_review_best" tabindex="-1" role="dialog" aria-labelledby="pdBestReviewLabel" aria-hidden="true"></div>';
+function cfGoodsReviewDetail(goodsCd, bestYn, photoYn, reviewSq) {
+	var str = '<div class="modal fade pd_pop pd_photoreviewdetail_pop" id="layer_review_best" tabindex="-1" role="dialog" aria-labelledby="pdBestReviewLabel" aria-hidden="true"></div>';
 
 	if ($('#layer_review_best').length == 0) {
 		$('body').append(str);
@@ -522,6 +522,7 @@ function cfGoodsReviewDetail(goodsCd, bestYn, reviewSq) {
 	var params = new Object();
 	params.goodsCd = goodsCd;
 	params.bestYn = bestYn;
+	params.photoYn = photoYn;
 	params.reviewSq = reviewSq;
 	cfOpenLayer(_PAGE_GOODS_REVIEW_DETAIL_LAYER, 'layer_review_best' ,params );
 }