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

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

@@ -103,15 +103,26 @@ public class TsfCartService {
 		cart.setRegNo(0);
 		cart.setCustNo(0);
 		cart.setUpdNo(0);
+		cart.setJsessionId(TscSession.getSessionId());
 
+		// 장바구니 보유 CART_SQ 쿼리
+		int i = 1;
 		for(Cart param : params) {
-			sb.append("UNION ALL SELECT '").append(param.getGoodsCd()).append("' AS GOODS_CD, '")
-					.append(param.getItemCd()).append("' AS ITEM_CD, '")
-					.append(param.getOptCd()).append("' AS OPT_CD\n");
+			sb.append("SELECT CD.CART_SQ \n FROM TB_CART_DETAIL CD \n INNER JOIN TB_CART C \n ON CD.CART_SQ = C.CART_SQ \n WHERE C.CUST_NO = ");
+			// TODO 로그인 정보 확인
+			if(cart.getCustNo() == 0) {
+				sb.append(cart.getCustNo()).append("\n AND JSESSION_ID = '").append(cart.getJsessionId()).append("'");
+			} else {
+				sb.append(cart.getCustNo());
+			}
+			sb.append("\n AND CD.ITEM_CD = '").append(param.getItemCd()).append("' \n AND CD.OPT_CD = '").append(param.getOptCd()).append("'");
+			if(i < params.size()) {
+				i++;
+				sb.append("\n UNION ALL \n");
+			}
 		}
 
 		// cart 정보 세팅
-		cart.setJsessionId(TscSession.getSessionId());
 		cart.setContentsLoc(params.iterator().next().getContentsLoc());
 		cart.setAfLinkCd(params.iterator().next().getAfLinkCd());
 		cart.setIthrCd(params.iterator().next().getIthrCd());

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

@@ -1,6 +1,7 @@
 package com.style24.front.biz.web;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.gagaframework.web.parameter.GagaMap;
 import com.gagaframework.web.rest.server.GagaResponse;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.core.support.session.TscSession;
@@ -65,7 +66,7 @@ public class TsfCartController extends TsfBaseController {
 	 */
 	@ResponseBody
 	@PostMapping("/save")
-	public String freeGoodsPromotionSave(@RequestBody Collection<Cart> params) {
+	public String createCart(@RequestBody Collection<Cart> params) {
 		try {
 			String result = cartService.saveCartInfo(params);
 		} catch (Exception e) {
@@ -75,4 +76,14 @@ public class TsfCartController extends TsfBaseController {
 
 		return message.getMessage("SUCC_0001");
 	}
+
+	@ResponseBody
+	@PostMapping("/goods/list")
+	public GagaMap freeGoodsPromotionSave(@RequestBody Collection<Cart> params) {
+		GagaMap result = new GagaMap();
+
+
+
+		return result;
+	}
 }

src/main/java/com/style24/front/support/config/TsfMybatisShopConfig.java

@@ -35,7 +35,7 @@ public class TsfMybatisShopConfig {
 		sessionFactoryBean.setDataSource(dataSource);
 		sessionFactoryBean.setTypeAliasesPackage(TscConstants.DOMAIN_PACKAGE);
 		sessionFactoryBean.setConfigLocation(applicationContext.getResource("classpath:persistence/mybatis-shop-config.xml"));
-		sessionFactoryBean.setMapperLocations(applicationContext.getResources(TscConstants.MAPPER_LOCATION_PATH + "/*.xml"));
+		sessionFactoryBean.setMapperLocations(applicationContext.getResources(TscConstants.MAPPER_LOCATION_PATH + "/shop/*.xml"));
 
 		return sessionFactoryBean.getObject();
 	}

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

@@ -14,7 +14,6 @@
 		WHERE  NUMB BETWEEN #{pageable.startRow} AND #{pageable.endRow}
 	</sql>
 	
-	
 
 	<!-- 등록 상품 장바구니 수량 조회 -->
 	<select id="getHasGoodsCartCnt" parameterType="Cart" resultType="int">
@@ -37,38 +36,23 @@
 	<!-- 장바구니 등록 세트 상품 확인 -->
 	<select id="selectHasSetItemCartList" parameterType="Cart" resultType="int">
 		/* TsfCart.selectHasSetItemCartList : 장바구니 등록 세트 상품 확인 */
-		SELECT C.CART_SQ
-		  FROM (SELECT GROUP_CONCAT(C.GOODS_CD, CD.ITEM_CD, CD.OPT_CD) AS SIZE_OPTION
-				     , C.CART_SQ
-			      FROM TB_CART C
-				 INNER JOIN (SELECT CD.ITEM_CD, CD.OPT_CD, CD.CART_SQ
-				    		   FROM TB_GOODS_COMPOSE GC
-				     		  INNER JOIN TB_CART_DETAIL CD
-				    			 ON GC.COMPS_GOODS_CD = CD.ITEM_CD
-				 				AND GC.GOODS_CD = #{goodsCd}
-				     		  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}
-					AND C.CUST_NO = 0
-				</when>
-				<otherwise>
-					AND C.REG_NO = #{regNo}
-				</otherwise>
-			</choose>
-				   AND C.CART_GB = 'G026_BC'
-				   AND C.GOODS_CD = #{goodsCd}
-			     GROUP BY C.CART_SQ) C
-		 WHERE 1=1
-		   AND C.SIZE_OPTION = (SELECT GROUP_CONCAT(A.GOODS_CD, A.ITEM_CD, A.OPT_CD)
-							      FROM (SELECT NULL AS GOODS_CD, NULL AS ITEM_CD, NULL AS OPT_CD
-										${itemCdSql}
-							           ) A
-							     WHERE A.ITEM_CD IS NOT NULL)
+		SELECT CART_SQ
+		  FROM (SELECT COUNT(1) AS CNT
+					 , CART_SQ
+					 , #{goodsCd} AS GOODS_CD
+				  FROM (
+					  ${itemCdSql}
+				       ) 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 딜 상품 확인 -->

src/main/java/com/style24/persistence/mybatis/TsfOrder.xml → src/main/java/com/style24/persistence/mybatis/shop/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

@@ -30,7 +30,7 @@
         <div class="wrap">
             <div class="content shopping_bag"> <!-- 페이지특정 클래스 = shop_bag -->
                 <div class="cont_head">
-                    <h2 class="t_c mb60">쇼핑백<button onclick="save();">이거이거</button></h2>
+                    <h2 class="t_c mb60">쇼핑백</h2>
                 </div>
                 <div class="cont_body">
                     <!-- CONT-BODY -->
@@ -1201,6 +1201,28 @@
     <!-- // container -->
 
     <script type="text/javascript">
+        /* xodud1202 수정 */
+
+        $(document).ready(function() {
+            // 장바구니 상품 정보 select
+
+        });
+
+        function selectCartList() {
+            $.ajax( {
+                type: "POST",
+                url : '/cart/goods/list',
+                dataType : 'json',
+                success : function(result) {
+                    alert(1);
+                }
+            });
+        }
+
+        /* // xodud1202 수정 */
+
+
+
 
         $(function(){
             // 추천상품 슬라이드
@@ -1224,74 +1246,6 @@
                 $(this).toggleClass('active');
             });
         });
-
-        function save() {
-            // 일반 & deal 상품 장바구니 등록 (일반&딜 상품도 배열에 담아서 전송해주세요.)let compsList = [];
-            /*let temp = new Object;
-            let compsList = [];
-            temp.goodsCd = "14373703";
-            temp.optCd = "블랙140";
-            temp.goodsQty = 1;
-            temp.goodsType = "G056_D";
-            temp.dealGoodsCd = "STY"
-            temp.cartGb = "C";
-            temp.afLinkCd = "afLinkCd";
-            temp.ithrCd = "G027_ZZZ";
-            temp.contentsLoc = "G028_YYY";
-            temp.planDtlSq = "123";
-            compsList.push(temp);
-            addCart(compsList);*/
-
-            // 세트상품 장바구니  (정렬순서는 TB_GOODS_COMPOSE.DISP_ORD ASC로 입력해주세요.)
-            /*let length = 2;
-            let compsList = [];
-            for(let j = 0 ; j < length ; j++) {
-                if(j == 0) {
-                    let temp = new Object;
-                    temp.goodsCd = "STYS000000016";
-                    temp.itemCd = '14373757';
-                    temp.optCd = "핑크120";
-                    temp.goodsQty = 9;
-                    temp.goodsType = "G056_S";
-                    temp.cartGb = "C";
-                    temp.afLinkCd = "afLinkCd";
-                    temp.ithrCd = "G027_ZZZ";
-                    temp.contentsLoc = "G028_YYY";
-                    temp.planDtlSq = "123";
-                    compsList.push(temp);
-                } else if (j == 1) {
-                    let temp = new Object;
-                    temp.goodsCd = "STYS000000016";
-                    temp.itemCd = '14373758';
-                    temp.optCd = "블랙100";
-                    temp.goodsQty = 9;
-                    temp.goodsType = "G056_S";
-                    temp.cartGb = "C";
-                    temp.afLinkCd = "afLinkCd2";
-                    temp.ithrCd = "G027_ZZZ2";
-                    temp.contentsLoc = "G028_YYY2";
-                    temp.planDtlSq = "1232";
-                    compsList.push(temp);
-                }
-            }
-
-            addCart(compsList);*/
-        }
-
-        function addCart(cartList) {
-            let jsonData = JSON.stringify(cartList);
-
-            $.ajax( {
-                type: "POST",
-                url : '/cart/save',
-                data : jsonData,
-                contentType: 'application/json',
-                dataType : 'text',
-                success : function(result) {
-                    alert(result);
-                }
-            });
-        }
     </script>
 </th:block>
 </body>