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

# Conflicts:
#	src/main/java/com/style24/persistence/mybatis/TsfOrder.xml

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

@@ -49,8 +49,6 @@
 				     		  ORDER BY CD.CART_SQ, GC.DISP_ORD) CD
 					ON C.CART_SQ = CD.CART_SQ
 			     WHERE 1=1
-				   AND C.CUST_NO = #{custNo}
-				   AND C.JSESSION_ID = #{jsessionId}
 			<choose>
 				<when test="regNo == 0">
 					AND C.JSESSION_ID = #{jsessionId}
@@ -71,6 +69,59 @@
 							     WHERE A.ITEM_CD IS NOT NULL)
 	</select>
 
+	<!-- 장바구니 등록 세트 상품 확인 -->
+	<select id="selectHasSetItemCartList" parameterType="Cart" resultType="int">
+		/* TsfCart.selectHasSetItemCartList : 장바구니 등록 세트 상품 확인 */
+		SELECT CART_SQ
+		  FROM (SELECT COUNT(1) AS CNT
+					 , CART_SQ
+					 , #{goodsCd} AS GOODS_CD
+				  FROM (SELECT CD.CART_SQ
+						  FROM TB_CART_DETAIL CD
+						 INNER JOIN TB_CART C
+						    ON CD.CART_SQ = C.CART_SQ
+						 WHERE C.GOODS_CD = #{goodsCd}
+						   AND CD.ITEM_CD = #{itemCd}
+						   AND CD.OPT_CD = #{optCd}
+						<choose>
+							<when test="custNo == 0">
+						   AND C.JSESSION_ID = #{jsessionId}
+						   AND C.CUST_NO = 0
+							</when>
+							<otherwise>
+						   AND C.CUST_NO = #{custNo}
+							</otherwise>
+						</choose>
+						 UNION ALL
+						SELECT CD.CART_SQ
+						  FROM TB_CART_DETAIL CD
+						 INNER JOIN TB_CART C
+						    ON CD.CART_SQ = C.CART_SQ
+						 WHERE C.GOODS_CD = #{goodsCd}
+						   AND CD.ITEM_CD = #{itemCd}
+						   AND CD.OPT_CD = #{optCd}
+						<choose>
+							<when test="custNo == 0">
+						   AND C.JSESSION_ID = #{jsessionId}
+						   AND C.CUST_NO = 0
+							</when>
+							<otherwise>
+						   AND C.CUST_NO = #{custNo}
+							</otherwise>
+						</choose>
+				       ) A
+				 WHERE 1=1
+				 GROUP BY CART_SQ ) AS A
+		  INNER JOIN (SELECT GC.GOODS_CD
+						   , COUNT(1) AS CNT
+						FROM TB_GOODS_COMPOSE GC
+					   WHERE GC.GOODS_CD = #{goodsCd}
+						 AND GC.USE_YN = 'Y'
+					   GROUP BY GC.GOODS_CD ) B
+			 ON A.GOODS_CD = B.GOODS_CD
+			AND A.CNT = B.CNT
+	</select>
+
 	<!-- 장바구니 등록 일반 or 딜 상품 확인 -->
 	<select id="selectHasNormalDealItemCartList" parameterType="Cart" resultType="int">
 		/* TsfCart.selectHasNormalDealItemCartList : 장바구니 등록 일반 or 딜 상품 확인 */

src/main/java/com/style24/persistence/mybatis/TsfOrder.xml

@@ -7,12 +7,12 @@
 		SELECT *
 		FROM   (
 	</sql>
-	<!--// Paging -->
 
 	<!-- 페이징을 위한 select절 하단 -->
 	<sql id="selectForPagingFooter">
 		       ) ORIGINAL
 		WHERE  NUMB BETWEEN #{pageable.startRow} AND #{pageable.endRow}
 	</sql>
-	
-</mapper>
+	<!--// Paging -->
+
+</mapper>

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

@@ -1243,7 +1243,7 @@
             addCart(compsList);*/
 
             // 세트상품 장바구니  (정렬순서는 TB_GOODS_COMPOSE.DISP_ORD ASC로 입력해주세요.)
-            /*let length = 2;
+            let length = 2;
             let compsList = [];
             for(let j = 0 ; j < length ; j++) {
                 if(j == 0) {
@@ -1275,7 +1275,7 @@
                 }
             }
 
-            addCart(compsList);*/
+            addCart(compsList);
         }
 
         function addCart(cartList) {