Merge remote-tracking branch 'origin/xodud1202' into jsh77b

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

@@ -220,7 +220,7 @@ public class TsfCartService {
 		}
 	}
 
-	public GagaMap selecCartGoodsList() {
+	public GagaMap getCartGoodsList() {
 		GagaMap result = new GagaMap();							// return
 		List<Integer> cartSqs = new ArrayList<Integer>();		// 품절 제외 장바구니 리스트
 		Order order = new Order();								// 조회 조건
@@ -260,7 +260,7 @@ public class TsfCartService {
 		order.setCartSqs(cartSqs.stream().mapToInt(Integer::intValue).toArray());
 
 		// 다다익선 할인 상품 조회
-		Collection<Order> moreBetterAmtList = selecMoreBetterAmtList(order);
+		Collection<Order> moreBetterAmtList = getMoreBetterAmtList(order);
 
 		result.put("cartGoodsList", cartGoodsList);
 
@@ -275,7 +275,7 @@ public class TsfCartService {
 	 * @author xodud1202
 	 * @since 2021. 01. 28
 	 */
-	public Collection<Order> selecMoreBetterAmtList(Order param) {
+	public Collection<Order> getMoreBetterAmtList(Order param) {
 		Collection<Order> result = new ArrayList<Order>();
 
 		// 장바구니 상품 조회
@@ -290,8 +290,10 @@ public class TsfCartService {
 			for(Order apply : tmtbApplyList) {
 				if(cart.getCartSq() == apply.getCartSq() && TscConstants.GoodsType.SET.value().equals(cart.getGoodsType())) {
 					apply.setCurrPrice(cart.getCurrPrice());
+					apply.setOptAddPrice(cart.getOptAddPrice());
 				} else if(cart.getCartSq() == apply.getCartSq() && !TscConstants.GoodsType.SET.value().equals(cart.getGoodsType())) {
 					apply.setCurrPrice(cart.getCurrPrice() + cart.getOptAddPrice());
+					apply.setOptAddPrice(cart.getOptAddPrice());
 				}
 			}
 		}
@@ -331,14 +333,18 @@ public class TsfCartService {
 								applyInfo.setApplyQtySectionVal(section.getTmtbSumQty());
 								applyInfo.setApplyAmtSectionVal(section.getTmtbSumAmt());
 								applyInfo.setApplyQtySectionYn("Y");
+								applyInfo.setDcWay(section.getDcWay());
+								applyInfo.setDcVal(section.getDcVal());
 							}
 						}
 					} else if (TscConstants.ApplyGb.AMT.value().equals(applyInfo.getApplyGb())) {
-						if(section.getSectionVal() < applyInfo.getTmtbSumQty()) {				// 장바구니 수량 할인 기준 달성시
-							if(applyInfo.getSectionVal() < section.getSectionVal()) {	// 기존 달성된 기준치보다 할인폭이 클 경우 기준할인 수정
+						if(section.getSectionVal() < applyInfo.getTmtbSumAmt()) {				// 장바구니 수량 할인 기준 달성시
+							if(applyInfo.getSectionVal() < section.getSectionVal()) {			// 기존 달성된 기준치보다 할인폭이 클 경우 기준할인 수정
 								applyInfo.setSectionVal(section.getSectionVal());
 								applyInfo.setApplyAmtSectionVal(section.getSectionVal());
 								applyInfo.setApplyAmtSectionYn("Y");
+								applyInfo.setDcWay(section.getDcWay());
+								applyInfo.setDcVal(section.getDcVal());
 							}
 						}
 					}
@@ -352,19 +358,36 @@ public class TsfCartService {
 		// resultAmt.getApplyQtySectionVal = 다다익선 등록 상품 총합계수량 (수량만)
 		// resultAmt.getApplyAmtSectionYn() = 다다익선 금액할인 만족 여부
 		// resultAmt.getApplyQtySectionYn() = 다다익선 수량할인 만족 여부
+		int leftAmt = 0;
+		int i = 0;
+		boolean check = true;
 		for(Order resultAmt : tmtbApplyList) {
 			if("Y".equals(resultAmt.getApplyQtySectionYn())) {
+				i++;
 				if(TscConstants.DcWay.AMT.value().equals(resultAmt.getDcWay())) {		// 할인 방식 금액일경우
+					if(i == 1) {
+						leftAmt = resultAmt.getDcVal();
+						check = false;
+					}
 
-				} else {		// 할인 방식 할인율일 경우
-
+					if(i == resultAmt.getTmtbCnt()) {
+						check = true;
+						i = 0;
+						resultAmt.setTmtbDcAmt(leftAmt);
+					} else {
+						int tempAmt = resultAmt.getDcVal() * (((resultAmt.getCurrPrice() + resultAmt.getOptAddPrice()) * resultAmt.getGoodsQty()) / resultAmt.getTmtbSumAmt());
+						leftAmt -= tempAmt;
+						resultAmt.setTmtbDcAmt(tempAmt);
+					}
+				} else {																// 할인 방식 할인율일 경우
+					leftAmt = 0;
 				}
 			}
-
 		}
 
 		// 할인 cartGoodsList에 할인 금액 세팅
-		// 장바구니 등록 상품 중 tmtbSq는 이제 존재하나 setApplyAmtSectionYn가 없는 경우 N으로 등록해주어야함 >> 장바구니 화면에서 추천상품 보여주기 위함
+		// 장바구니 등록 상품 중 tmtbSq는 존재하나 setApplyAmtSectionYn가 없는 경우 N으로 등록해주어야함 >> 장바구니 화면에서 추천상품 보여주기 위함
+		// (기본상품만 N처리해주면될듯함.)
 
 
 		return result;

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

@@ -87,7 +87,7 @@ public class TsfCartController extends TsfBaseController {
 	public GagaMap selecCartGoodsList() {
 		GagaMap result = new GagaMap();
 
-		result.putAll(cartService.selecCartGoodsList());
+		result.putAll(cartService.getCartGoodsList());
 
 		return result;
 	}

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

@@ -255,12 +255,27 @@
 			 , T.APPLY_GB
 		     , TAG.GOODS_CD
 		     , TAG.GOODS_GB
+		     , TAG2.TMTB_CNT
 			 , T.TMTB_NM
 			 , C.GOODS_QTY
 		FROM   TB_CART C
 		INNER  JOIN TB_TMTB_APPLY_GOODS TAG
 		ON	   C.GOODS_CD = TAG.GOODS_CD
 		AND	   TAG.DEL_YN = 'N'
+		INNER  JOIN (SELECT TAG.TMTB_SQ
+						  , COUNT(1) AS TMTB_CNT
+					 FROM   TB_TMTB_APPLY_GOODS TAG
+					 INNER  JOIN TB_CART C
+					 ON     TAG.GOODS_CD = C.GOODS_CD
+					 WHERE  TAG.DEL_YN = 'N'
+					<if test="cartSqs != null and cartSqs.length > 0">
+					AND     C.CART_SQ IN
+						<foreach collection="cartSqs" item="item" index="index"  open="(" close=")" separator=",">
+								#{item}
+						</foreach>
+					</if>
+					 GROUP  BY TAG.TMTB_SQ) AS TAG2
+		ON     TAG.TMTB_SQ = TAG2.TMTB_SQ
 		INNER  JOIN TB_TMTB T
 		ON	   T.TMTB_SQ = TAG.TMTB_SQ
 		AND	   T.TMTB_STAT = 'G232_11' /*진행*/
@@ -270,6 +285,7 @@
 		ON     T.TMTB_SQ = NOT_APPLY.TMTB_SQ
 		AND    C.GOODS_CD = NOT_APPLY.GOODS_CD
 		AND    NOT_APPLY.GOODS_GB = 'G800_30'   /* 제외상품 */
+		AND    NOT_APPLY.DEL_YN = 'N'
 		WHERE  1=1
 		AND    NOT_APPLY.TMTB_SQ IS NULL
 		AND    T.TMTB_ST_DT <![CDATA[<=]]> NOW()
@@ -278,11 +294,12 @@
 		AND    G.GOODS_STAT = 'G008_90'
 		AND    G.SELF_MALL_YN = 'Y'
 		<if test="cartSqs != null and cartSqs.length > 0">
-		AND   C.CART_SQ IN
+		AND    C.CART_SQ IN
 			<foreach collection="cartSqs" item="item" index="index"  open="(" close=")" separator=",">
 				#{item}
 			</foreach>
 		</if>
+		ORDER BY TAG.TMTB_SQ, TAG.GOODS_GB
 	</select>
 
 	<!-- 다다익선 적용 상품 SUM DATA 조회 -->
@@ -366,12 +383,14 @@
 		SELECT TC.SECTION_GB
 			 , TC.SECTION_VAL
 			 , TC.TMTB_SQ
-			 , TV.
+			 , TV.DC_WAY
+			 , TV.DC_VAL
 		FROM   TB_TMTB_SECTION TC
 		INNER  JOIN TB_TMTB_VAL TV
 		ON     TC.TMTB_SECTION_SQ = TV.TMTB_SECTION_SQ
 		WHERE  1=1
 		AND    TC.DEL_YN = 'N'
+		AND    TV.DEL_YN = 'N'
 		<if test="list != null and list.size() > 0">
 		AND    TC.TMTB_SQ IN
 			<foreach collection="list" item="item" index="index"  open="(" close=")" separator=",">

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

@@ -72,9 +72,9 @@
                                     <span class="ml10">오늘 자정까지 도착</span>
                                 </h3>
                                 <div class="btn_area">
-                                    <button type="button" class="btn btn_default"><span><i class="ico ico_trash"></i>전체 삭제</span></button>
+                                    <button type="button" class="btn btn_default"><span><i class="ico ico_trash"></i>전체삭제</span></button>
                                 </div>
-                                <div class="tbl type2">
+                                <div id="dlvrList1" class="tbl type2">
                                     <table>
                                         <colgroup>
                                             <col width="710">
@@ -92,13 +92,13 @@
                                                     </div>
                                                     <div class="thumb_box">
                                                         <a href="">
-                                                            <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
+                                                            <img src="../ux/images/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
                                                         </a>
                                                     </div>
                                                     <div class="info_box">
                                                         <p class="od_name">
                                                             <a href="">
-                                                                <span class="brand">나이키 키즈</span>
+                                                                <span class="brand">Mollimelli 몰리멜리</span>
                                                                 <span class="name">몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트 몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트</span>
                                                             </a>
                                                         </p>
@@ -124,7 +124,7 @@
                                                     </p>
                                                     <p class="util">
                                                         <span>
-                                                            <button type="button" class="btn_favorite"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
+                                                            <button type="button" class="btn_favorite active"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
                                                         </span>
                                                         <span>
                                                             <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
@@ -149,13 +149,13 @@
                                                     </div>
                                                     <div class="thumb_box">
                                                         <a href="">
-                                                            <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
+                                                            <img src="../ux/images/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
                                                         </a>
                                                     </div>
                                                     <div class="info_box">
                                                         <p class="od_name">
                                                             <a href="">
-                                                                <span class="brand">페르지노 몬티</span>
+                                                                <span class="brand">Mollimelli 몰리멜리</span>
                                                                 <span class="name">몰리겨울상하복 균일가 택1 </span>
                                                             </a>
                                                         </p>
@@ -181,7 +181,7 @@
                                                     </p>
                                                     <p class="util">
                                                         <span>
-                                                            <button type="button" class="btn_favorite"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
+                                                            <button type="button" class="btn_favorite active"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
                                                         </span>
                                                         <span>
                                                             <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
@@ -189,7 +189,7 @@
                                                     </p>
                                                 </div>
                                             </td>
-                                            <td class="merge_row"> <!-- 같은 데이터 노출시 동일 영역끼리 병합 : 클래스명 merge_row 추가 -->
+                                            <td class="merge_row">
                                                 <div class="info_dlvr">
                                                     <span class="dlvr_fee">3,000원</span>
                                                     <a href="#" target="_blank">배송비 SAVE 상품 보기</a>
@@ -206,7 +206,7 @@
                                                     </div>
                                                     <div class="thumb_box">
                                                         <a href="">
-                                                            <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
+                                                            <img src="../ux/images/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
                                                         </a>
                                                     </div>
                                                     <div class="info_box">
@@ -237,16 +237,16 @@
                                                         <button type="button" class="btn btn_primary btn_sm"><span>즉시구매</span></button>
                                                     </p>
                                                     <p class="util">
-                                                            <span>
-                                                                <button type="button" class="btn_favorite"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
-                                                            </span>
                                                         <span>
-                                                                <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
-                                                            </span>
+                                                            <button type="button" class="btn_favorite active"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
+                                                        </span>
+                                                        <span>
+                                                            <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
+                                                        </span>
                                                     </p>
                                                 </div>
                                             </td>
-                                            <td class="merge_row"> <!-- 같은 데이터 노출시 동일 영역끼리 병합 : 클래스명 merge_row 추가 -->
+                                            <td class="merge_row">
                                                 <div class="info_dlvr">
                                                     <span class="dlvr_fee">3,000원</span>
                                                     <a href="#" target="_blank">배송비 SAVE 상품 보기</a>
@@ -264,9 +264,9 @@
                                     STYLE24 일반배송
                                 </h3>
                                 <div class="btn_area">
-                                    <button type="button" class="btn btn_default"><span><i class="ico ico_trash"></i>전체 삭제</span></button>
+                                    <button type="button" class="btn btn_default"><span><i class="ico ico_trash"></i>전체삭제</span></button>
                                 </div>
-                                <div class="tbl type2">
+                                <div id="dlvrList2" class="tbl type2">
                                     <table>
                                         <colgroup>
                                             <col width="710">
@@ -284,7 +284,7 @@
                                                     </div>
                                                     <div class="thumb_box">
                                                         <a href="">
-                                                            <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
+                                                            <img src="../ux/images/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
                                                         </a>
                                                     </div>
                                                     <div class="info_box">
@@ -301,24 +301,13 @@
                                                         <p class="od_modify">
                                                             <button type="button"><span>옵션/수량변경</span></button>
                                                         </p>
-                                                        <div class="od_moresale">
-                                                            <a href="" class="btn_moresale">
-                                                                <i class="ico ico_saletag"></i><span class="c_primary">다다익선 적용내역</span>
-                                                            </a>
-                                                            <div class="li_moresale">
-                                                                <ul>
-                                                                    <li>트러커 자켓 3개 이상 구매시 10% 할인</li>
-                                                                    <li>TBJ상품 2만원 이상 구매시 10% 할인</li>
-                                                                </ul>
-                                                            </div>
-                                                        </div>
                                                     </div>
                                                 </div>
                                             </td>
                                             <td>
                                                 <div class="info_calc">
                                                     <p class="price">
-                                                        <span class="selling_price c_primary">61,200원</span> <!-- 다다익선 할인적용된 가격 표기 시 클래스 c_primary 추가 -->
+                                                        <span class="selling_price">61,200원</span>
                                                         <del>100,000원</del>
                                                     </p>
                                                     <p class="point"><span>49</span>p 적립예정</p>
@@ -327,7 +316,7 @@
                                                     </p>
                                                     <p class="util">
                                                         <span>
-                                                            <button type="button" class="btn_favorite"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
+                                                            <button type="button" class="btn_favorite active"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
                                                         </span>
                                                         <span>
                                                             <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
@@ -335,9 +324,10 @@
                                                     </p>
                                                 </div>
                                             </td>
-                                            <td class="merge_row"> <!-- 같은 데이터 노출시 동일 영역끼리 병합 : 클래스명 merge_row 추가 -->
+                                            <td class="merge_row">
                                                 <div class="info_dlvr">
-                                                    <span class="dlvr_fee">배송비 무료</span>
+                                                    <span class="dlvr_fee">3,000원</span>
+                                                    <a href="#" target="_blank">배송비 SAVE 상품 보기</a>
                                                 </div>
                                             </td>
                                         </tr>
@@ -351,7 +341,7 @@
                                                     </div>
                                                     <div class="thumb_box">
                                                         <a href="">
-                                                            <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
+                                                            <img src="../ux/images/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
                                                         </a>
                                                     </div>
                                                     <div class="info_box">
@@ -368,17 +358,6 @@
                                                         <p class="od_modify">
                                                             <button type="button"><span>옵션/수량변경</span></button>
                                                         </p>
-                                                        <div class="od_moresale">
-                                                            <a href="" class="btn_moresale">
-                                                                <i class="ico ico_saletag"></i><span class="c_primary">다다익선 대상 상품</span>
-                                                            </a>
-                                                            <div class="li_moresale">
-                                                                <ul>
-                                                                    <li>3개이상 구매시 10% 할인 <a href="">대상 상품 보기</a></li>
-                                                                    <li>TBJ 상품 2만원 이상 구매시 10% 할인 <a href="">대상 상품 보기</a></li>
-                                                                </ul>
-                                                            </div>
-                                                        </div>
                                                     </div>
                                                 </div>
                                             </td>
@@ -393,18 +372,19 @@
                                                         <button type="button" class="btn btn_primary btn_sm"><span>즉시구매</span></button>
                                                     </p>
                                                     <p class="util">
-                                                            <span>
-                                                                <button type="button" class="btn_favorite"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
-                                                            </span>
                                                         <span>
-                                                                <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
-                                                            </span>
+                                                            <button type="button" class="btn_favorite active"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
+                                                        </span>
+                                                        <span>
+                                                            <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
+                                                        </span>
                                                     </p>
                                                 </div>
                                             </td>
-                                            <td class="merge_row"> <!-- 같은 데이터 노출시 동일 영역끼리 병합 : 클래스명 merge_row 추가 -->
+                                            <td class="merge_row">
                                                 <div class="info_dlvr">
-                                                    <span class="dlvr_fee">배송비 무료</span>
+                                                    <span class="dlvr_fee">3,000원</span>
+                                                    <a href="#" target="_blank">배송비 SAVE 상품 보기</a>
                                                 </div>
                                             </td>
                                         </tr>
@@ -418,7 +398,7 @@
                                                     </div>
                                                     <div class="thumb_box">
                                                         <a href="">
-                                                            <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
+                                                            <img src="../ux/images/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
                                                         </a>
                                                     </div>
                                                     <div class="info_box">
@@ -449,18 +429,18 @@
                                                         <button type="button" class="btn btn_primary btn_sm"><span>즉시구매</span></button>
                                                     </p>
                                                     <p class="util">
-                                                            <span>
-                                                                <button type="button" class="btn_favorite"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
-                                                            </span>
                                                         <span>
-                                                                <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
-                                                            </span>
+                                                            <button type="button" class="btn_favorite active"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
+                                                        </span>
+                                                        <span>
+                                                            <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
+                                                        </span>
                                                     </p>
                                                 </div>
                                             </td>
-                                            <td class="merge_row"> <!-- 같은 데이터 노출시 동일 영역끼리 병합 : 클래스명 merge_row 추가 -->
+                                            <td class="merge_row">
                                                 <div class="info_dlvr">
-                                                    <span class="dlvr_fee">3,000원</span>
+                                                    <span class="dlvr_fee">2,000원</span>
                                                     <a href="#" target="_blank">배송비 SAVE 상품 보기</a>
                                                 </div>
                                             </td>
@@ -476,7 +456,7 @@
                                     업체직배송
                                 </h3>
                                 <div class="btn_area">
-                                    <button type="button" class="btn btn_default"><span><i class="ico ico_trash"></i>전체 삭제</span></button>
+                                    <button type="button" class="btn btn_default"><span><i class="ico ico_trash"></i>전체삭제</span></button>
                                 </div>
                                 <div class="tbl type2">
                                     <table>
@@ -496,13 +476,13 @@
                                                     </div>
                                                     <div class="thumb_box">
                                                         <a href="">
-                                                            <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
+                                                            <img src="../ux/images/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
                                                         </a>
                                                     </div>
                                                     <div class="info_box">
                                                         <p class="od_name">
                                                             <a href="">
-                                                                <span class="brand">TBJ</span>
+                                                                <span class="brand">업체명1</span>
                                                                 <span class="name">몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트 몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트</span>
                                                             </a>
                                                         </p>
@@ -513,24 +493,13 @@
                                                         <p class="od_modify">
                                                             <button type="button"><span>옵션/수량변경</span></button>
                                                         </p>
-                                                        <div class="od_moresale">
-                                                            <a href="" class="btn_moresale">
-                                                                <i class="ico ico_saletag"></i><span class="c_primary">다다익선 적용내역</span>
-                                                            </a>
-                                                            <div class="li_moresale">
-                                                                <ul>
-                                                                    <li>트러커 자켓 3개 이상 구매시 10% 할인</li>
-                                                                    <li>TBJ상품 2만원 이상 구매시 10% 할인</li>
-                                                                </ul>
-                                                            </div>
-                                                        </div>
                                                     </div>
                                                 </div>
                                             </td>
                                             <td>
                                                 <div class="info_calc">
                                                     <p class="price">
-                                                        <span class="selling_price c_primary">61,200원</span> <!-- 다다익선 할인적용된 가격 표기 시 클래스 c_primary 추가 -->
+                                                        <span class="selling_price">61,200원</span>
                                                         <del>100,000원</del>
                                                     </p>
                                                     <p class="point"><span>49</span>p 적립예정</p>
@@ -539,7 +508,7 @@
                                                     </p>
                                                     <p class="util">
                                                         <span>
-                                                            <button type="button" class="btn_favorite"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
+                                                            <button type="button" class="btn_favorite active"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
                                                         </span>
                                                         <span>
                                                             <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
@@ -547,10 +516,9 @@
                                                     </p>
                                                 </div>
                                             </td>
-                                            <td class="merge_row"> <!-- 같은 데이터 노출시 동일 영역끼리 병합 : 클래스명 merge_row 추가 -->
+                                            <td>
                                                 <div class="info_dlvr">
                                                     <span class="dlvr_fee">3,000원</span>
-                                                    <span class="dlvr_shop">TBJ 업체직배송</span>
                                                     <a href="#" target="_blank">배송비 SAVE 상품 보기</a>
                                                 </div>
                                             </td>
@@ -565,13 +533,13 @@
                                                     </div>
                                                     <div class="thumb_box">
                                                         <a href="">
-                                                            <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
+                                                            <img src="../ux/images/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
                                                         </a>
                                                     </div>
                                                     <div class="info_box">
                                                         <p class="od_name">
                                                             <a href="">
-                                                                <span class="brand">TBJ</span>
+                                                                <span class="brand">업체명2</span>
                                                                 <span class="name">몰리겨울상하복 균일가 택1 </span>
                                                             </a>
                                                         </p>
@@ -596,77 +564,18 @@
                                                         <button type="button" class="btn btn_primary btn_sm"><span>즉시구매</span></button>
                                                     </p>
                                                     <p class="util">
-                                                            <span>
-                                                                <button type="button" class="btn_favorite"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
-                                                            </span>
                                                         <span>
-                                                                <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
-                                                            </span>
-                                                    </p>
-                                                </div>
-                                            </td>
-                                            <td class="merge_row"> <!-- 같은 데이터 노출시 동일 영역끼리 병합 : 클래스명 merge_row 추가 -->
-                                                <div class="info_dlvr">
-                                                    <span class="dlvr_fee">3,000원</span>
-                                                    <span class="dlvr_shop">TBJ 업체직배송</span>
-                                                    <a href="#" target="_blank">배송비 SAVE 상품 보기</a>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="t_l">
-                                                <div class="info_item">
-                                                    <div class="form_box">
-                                                        <p class="form_field">
-                                                            <input id="od_item33" type="checkbox" checked=""><label for="od_item33"><span class="sr-only">상품선택</span></label>
-                                                        </p>
-                                                    </div>
-                                                    <div class="thumb_box">
-                                                        <a href="">
-                                                            <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
-                                                        </a>
-                                                    </div>
-                                                    <div class="info_box">
-                                                        <p class="od_name">
-                                                            <a href="">
-                                                                <span class="brand">ZIOZIA</span>
-                                                                <span class="name">몰리겨울상하복 균일가 택1 </span>
-                                                            </a>
-                                                        </p>
-                                                        <p class="od_opt">
-                                                            <span class="option">옵션:<em>01_루돌프융기모상하복_D오렌지/110</em></span>
-                                                            <span class="count">수량:<em>100</em>개</span>
-                                                        </p>
-                                                        <p class="od_modify">
-                                                            <button type="button"><span>옵션/수량변경</span></button>
-                                                        </p>
-                                                    </div>
-                                                </div>
-                                            </td>
-                                            <td>
-                                                <div class="info_calc">
-                                                    <p class="price">
-                                                        <span class="selling_price">61,200원</span>
-                                                        <del>100,000원</del>
-                                                    </p>
-                                                    <p class="point"><span>49</span>p 적립예정</p>
-                                                    <p>
-                                                        <button type="button" class="btn btn_primary btn_sm"><span>즉시구매</span></button>
-                                                    </p>
-                                                    <p class="util">
-                                                            <span>
-                                                                <button type="button" class="btn_favorite"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
-                                                            </span>
+                                                            <button type="button" class="btn_favorite active"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
+                                                        </span>
                                                         <span>
-                                                                <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
-                                                            </span>
+                                                            <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
+                                                        </span>
                                                     </p>
                                                 </div>
                                             </td>
-                                            <td class="merge_row"> <!-- 같은 데이터 노출시 동일 영역끼리 병합 : 클래스명 merge_row 추가 -->
+                                            <td>
                                                 <div class="info_dlvr">
                                                     <span class="dlvr_fee">3,000원</span>
-                                                    <span class="dlvr_shop">ZIOZIA 업체직배송</span>
                                                     <a href="#" target="_blank">배송비 SAVE 상품 보기</a>
                                                 </div>
                                             </td>
@@ -676,18 +585,18 @@
                                                 <div class="info_item">
                                                     <div class="form_box">
                                                         <p class="form_field">
-                                                            <input id="od_item34" type="checkbox" checked=""><label for="od_item34"><span class="sr-only">상품선택</span></label>
+                                                            <input id="od_item33" type="checkbox" checked=""><label for="od_item33"><span class="sr-only">상품선택</span></label>
                                                         </p>
                                                     </div>
                                                     <div class="thumb_box">
                                                         <a href="">
-                                                            <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
+                                                            <img src="../ux/images/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
                                                         </a>
                                                     </div>
                                                     <div class="info_box">
                                                         <p class="od_name">
                                                             <a href="">
-                                                                <span class="brand">로엠</span>
+                                                                <span class="brand">업체명2</span>
                                                                 <span class="name">몰리겨울상하복 균일가 택1 </span>
                                                             </a>
                                                         </p>
@@ -711,100 +620,9 @@
                                                     <p>
                                                         <button type="button" class="btn btn_primary btn_sm"><span>즉시구매</span></button>
                                                     </p>
-                                                    <p class="util">
-                                                            <span>
-                                                                <button type="button" class="btn_favorite"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
-                                                            </span>
-                                                        <span>
-                                                                <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
-                                                            </span>
-                                                    </p>
-                                                </div>
-                                            </td>
-                                            <td class="merge_row"> <!-- 같은 데이터 노출시 동일 영역끼리 병합 : 클래스명 merge_row 추가 -->
-                                                <div class="info_dlvr">
-                                                    <span class="dlvr_fee">3,000원</span>
-                                                    <span class="dlvr_shop">로엠 업체직배송</span>
-                                                    <a href="#" target="_blank">배송비 SAVE 상품 보기</a>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                            <!-- //업체직배송 -->
-                            <!-- 예약배송 -->
-                            <div class="part_dlvr mt100">
-                                <h3 class="subH2 mb20">
-                                    예약배송
-                                </h3>
-                                <div class="btn_area">
-                                    <button type="button" class="btn btn_default"><span><i class="ico ico_trash"></i>전체 삭제</span></button>
-                                </div>
-                                <div class="tbl type2">
-                                    <table>
-                                        <colgroup>
-                                            <col width="710">
-                                            <col width="190">
-                                            <col width="*">
-                                        </colgroup>
-                                        <tbody>
-                                        <tr>
-                                            <td class="t_l">
-                                                <div class="info_item">
-                                                    <div class="form_box">
-                                                        <p class="form_field">
-                                                            <input id="od_item_21" type="checkbox" checked=""><label for="od_item_21"><span class="sr-only">상품선택</span></label>
-                                                        </p>
-                                                    </div>
-                                                    <div class="thumb_box">
-                                                        <a href="">
-                                                            <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
-                                                        </a>
-                                                    </div>
-                                                    <div class="info_box">
-                                                        <p class="od_name">
-                                                            <a href="">
-                                                                <span class="brand">TBJ</span>
-                                                                <span class="reserv_date">2020.12.25 배송예정</span>
-                                                                <span class="name">몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트 몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트</span>
-                                                            </a>
-                                                        </p>
-                                                        <p class="od_opt">
-                                                            <span class="option">옵션:<em>01_루돌프융기모상하복_D오렌지/110</em></span>
-                                                            <span class="count">수량:<em>99</em>개</span>
-                                                        </p>
-                                                        <p class="od_modify">
-                                                            <button type="button"><span>옵션/수량변경</span></button>
-                                                        </p>
-                                                        <div class="od_moresale">
-                                                            <a href="" class="btn_moresale">
-                                                                <i class="ico ico_saletag"></i><span class="c_primary">다다익선 적용내역</span>
-                                                            </a>
-                                                            <div class="li_moresale">
-                                                                <ul>
-                                                                    <li>트러커 자켓 3개 이상 구매시 10% 할인</li>
-                                                                    <li>TBJ상품 2만원 이상 구매시 10% 할인</li>
-                                                                </ul>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </td>
-                                            <td>
-                                                <div class="info_calc">
-                                                    <p class="price">
-                                                        <span class="selling_price c_primary">61,200원</span> <!-- 다다익선 할인적용된 가격 표기 시 클래스 c_primary 추가 -->
-                                                        <del>100,000원</del>
-                                                    </p>
-                                                    <p class="point"><span>49</span>p 적립예정</p>
-                                                    <p>
-                                                        <button type="button" class="btn btn_primary btn_sm"><span>즉시구매</span></button>
-                                                    </p>
                                                     <p class="util">
                                                         <span>
-                                                            <button type="button" class="btn_favorite"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
+                                                            <button type="button" class="btn_favorite active"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
                                                         </span>
                                                         <span>
                                                             <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
@@ -812,10 +630,9 @@
                                                     </p>
                                                 </div>
                                             </td>
-                                            <td class="merge_row"> <!-- 같은 데이터 노출시 동일 영역끼리 병합 : 클래스명 merge_row 추가 -->
+                                            <td>
                                                 <div class="info_dlvr">
                                                     <span class="dlvr_fee">3,000원</span>
-                                                    <span class="dlvr_shop">TBJ 업체직배송</span>
                                                     <a href="#" target="_blank">배송비 SAVE 상품 보기</a>
                                                 </div>
                                             </td>
@@ -825,19 +642,18 @@
                                                 <div class="info_item">
                                                     <div class="form_box">
                                                         <p class="form_field">
-                                                            <input id="od_item22" type="checkbox" checked=""><label for="od_item22"><span class="sr-only">상품선택</span></label>
+                                                            <input id="od_item34" type="checkbox" checked=""><label for="od_item34"><span class="sr-only">상품선택</span></label>
                                                         </p>
                                                     </div>
                                                     <div class="thumb_box">
                                                         <a href="">
-                                                            <img src="/images/pc/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
+                                                            <img src="../ux/images/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
                                                         </a>
                                                     </div>
                                                     <div class="info_box">
                                                         <p class="od_name">
                                                             <a href="">
-                                                                <span class="brand">TBJ</span>
-                                                                <span class="reserv_date">2020.12.25 배송예정</span>
+                                                                <span class="brand">업체명3</span>
                                                                 <span class="name">몰리겨울상하복 균일가 택1 </span>
                                                             </a>
                                                         </p>
@@ -863,7 +679,7 @@
                                                     </p>
                                                     <p class="util">
                                                             <span>
-                                                                <button type="button" class="btn_favorite"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
+                                                                <button type="button" class="btn_favorite active"><span><i class="ico ico_like"></i><em class="sr-only">관심상품 추가</em></span></button>
                                                             </span>
                                                         <span>
                                                                 <button type="button" class="btn_delete"><span><i class="ico ico_trash"></i><em class="sr-only">상품삭제</em></span></button>
@@ -871,10 +687,9 @@
                                                     </p>
                                                 </div>
                                             </td>
-                                            <td class="merge_row"> <!-- 같은 데이터 노출시 동일 영역끼리 병합 : 클래스명 merge_row 추가 -->
+                                            <td>
                                                 <div class="info_dlvr">
                                                     <span class="dlvr_fee">3,000원</span>
-                                                    <span class="dlvr_shop">TBJ 업체직배송</span>
                                                     <a href="#" target="_blank">배송비 SAVE 상품 보기</a>
                                                 </div>
                                             </td>
@@ -882,8 +697,9 @@
                                         </tbody>
                                     </table>
                                 </div>
+
                             </div>
-                            <!-- //예약배송 -->
+                            <!-- //업체직배송 -->
                         </div>
                     </section>
                     <section class="od_side fr">
@@ -906,7 +722,7 @@
                                     </div>
                                     <div>
                                         <dt>할인금액</dt>
-                                        <dd><span class="c_primary">-1,746,500원</span></dd>
+                                        <dd>-1,746,500원</dd>
                                     </div>
                                 </dl>
                             </div>
@@ -947,7 +763,7 @@
                                 <div class="item_gd">
                                     <figure>
                                         <a href="">
-                                            <span class="thumb"><img src="/images/pc/thumb/tmp_odSide2.jpg" alt=""></span>
+                                            <span class="thumb"><img src="../ux/images/thumb/tmp_odSide2.jpg" alt=""></span>
                                         </a>
                                         <figcaption>
                                             <a href="">
@@ -965,7 +781,7 @@
                                 <div class="item_gd">
                                     <figure>
                                         <a href="">
-                                            <span class="thumb"><img src="/images/pc/thumb/tmp_odSide2.jpg" alt=""></span>
+                                            <span class="thumb"><img src="../ux/images/thumb/tmp_odSide2.jpg" alt=""></span>
                                         </a>
                                         <figcaption>
                                             <a href="">
@@ -1002,7 +818,7 @@
                             <div class="item_gd">
                                 <figure>
                                     <a href="">
-                                        <span class="thumb"><img src="/images/pc/thumb/od_shopping_slide01.png" alt=""></span>
+                                        <span class="thumb"><img src="../ux/images/thumb/od_shopping_slide01.png" alt=""></span>
                                     </a>
                                     <figcaption>
                                         <a href="">
@@ -1026,7 +842,7 @@
                             <div class="item_gd">
                                 <figure>
                                     <a href="">
-                                        <span class="thumb"><img src="/images/pc/thumb/od_shopping_slide01.png" alt=""></span>
+                                        <span class="thumb"><img src="../ux/images/thumb/od_shopping_slide01.png" alt=""></span>
                                     </a>
                                     <figcaption>
                                         <a href="">
@@ -1050,7 +866,7 @@
                             <div class="item_gd">
                                 <figure>
                                     <a href="">
-                                        <span class="thumb"><img src="/images/pc/thumb/od_shopping_slide01.png" alt=""></span>
+                                        <span class="thumb"><img src="../ux/images/thumb/od_shopping_slide01.png" alt=""></span>
                                     </a>
                                     <figcaption>
                                         <a href="">
@@ -1074,7 +890,7 @@
                             <div class="item_gd">
                                 <figure>
                                     <a href="">
-                                        <span class="thumb"><img src="/images/pc/thumb/od_shopping_slide01.png" alt=""></span>
+                                        <span class="thumb"><img src="../ux/images/thumb/od_shopping_slide01.png" alt=""></span>
                                     </a>
                                     <figcaption>
                                         <a href="">
@@ -1098,7 +914,7 @@
                             <div class="item_gd">
                                 <figure>
                                     <a href="">
-                                        <span class="thumb"><img src="/images/pc/thumb/od_shopping_slide01.png" alt=""></span>
+                                        <span class="thumb"><img src="../ux/images/thumb/od_shopping_slide01.png" alt=""></span>
                                     </a>
                                     <figcaption>
                                         <a href="">
@@ -1122,7 +938,7 @@
                             <div class="item_gd">
                                 <figure>
                                     <a href="">
-                                        <span class="thumb"><img src="/images/pc/thumb/od_shopping_slide01.png" alt=""></span>
+                                        <span class="thumb"><img src="../ux/images/thumb/od_shopping_slide01.png" alt=""></span>
                                     </a>
                                     <figcaption>
                                         <a href="">
@@ -1146,7 +962,7 @@
                             <div class="item_gd">
                                 <figure>
                                     <a href="">
-                                        <span class="thumb"><img src="/images/pc/thumb/od_shopping_slide01.png" alt=""></span>
+                                        <span class="thumb"><img src="../ux/images/thumb/od_shopping_slide01.png" alt=""></span>
                                     </a>
                                     <figcaption>
                                         <a href="">
@@ -1170,7 +986,7 @@
                             <div class="item_gd">
                                 <figure>
                                     <a href="">
-                                        <span class="thumb"><img src="/images/pc/thumb/od_shopping_slide01.png" alt=""></span>
+                                        <span class="thumb"><img src="../ux/images/thumb/od_shopping_slide01.png" alt=""></span>
                                     </a>
                                     <figcaption>
                                         <a href="">