이태영 - 20210208 장바구니 임시커밋

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

@@ -225,11 +225,10 @@ public class TsfCartService {
 	}
 
 	// 장바구니 상품 리스트 조회 서비스
-	public GagaMap getCartGoodsList() {
+	public Order getCartGoodsList(Order order) {
 		//ModelAndView result = new ModelAndView();
 		GagaMap result = new GagaMap();							// return
 		List<Integer> cartSqs = new ArrayList<Integer>();		// 품절 제외 장바구니 리스트
-		Order order = new Order();								// 조회 조건
 
 		// Device check
 		order.setFrontGb(TsfSession.getFrontGb());
@@ -269,23 +268,23 @@ public class TsfCartService {
 
 		// 다다익선 할인 상품 조회
 		Collection<Order> moreBetterAmtList = getMoreBetterAmtList(order);
-		for(Order cart : moreBetterAmtList) {
-			if(cart.getItemNm().contains("!@!")) {
-				cart.setItemNmArr(cart.getItemNm().split("!@!"));
-				cart.setOptCdArr(cart.getOptCd().split(","));
-				cart.setItemQtyArr(cart.getItemQtyr().split(","));
-			} else {
-				String[] arr = {cart.getItemNm()}, arr2 = {cart.getOptCd()},arr3 = {cart.getItemQtyr()};
-				cart.setItemNmArr(arr);
-				cart.setOptCdArr(arr2);
-				cart.setItemQtyArr(arr3);
-			}
-		}
 
+		order = coreOrderService.getCartDelvGoodsCntList(moreBetterAmtList);
+
+		/*delvOrder.setWmsCnt(wmsCnt);					// 자사몰 일반배송건수
+		delvOrder.setResCnt(resCnt);					// 자사몰 예약배송건수
+		delvOrder.setDelvCnt(delvCnt);					// 입점업체 배송건수
+		delvOrder.setDelvTotCnt(delvTotCnt);			// 배송유형건수
+		delvOrder.setDelvFeeTotCnt(delvFeeTotCnt);		// 전체배송건수
+		delvOrder.setWmsCartList(wmsCartList);			// 자사 일반상품 목록
+		delvOrder.setResCartList(resCartList);			// 자사 예약상품 목록
+		delvOrder.setDelvCartList(delvCartList);		// 입점업체 상품 목록*/
 
-		result.put("cartList", moreBetterAmtList);
+		/*result.put("wmsCartList", order.getWmsCartList());
+		result.put("resCartList", order.getResCartList());
+		result.put("delvCartList", order.getDelvCartList());*/
 
-		return result;
+		return order;
 	}
 
 	/**

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

@@ -88,9 +88,12 @@ public class TsfCartController extends TsfBaseController {
 
 	// @ResponseBody
 	@PostMapping("/goods/list")
-	public String selecCartGoodsList(Order order, Model model) {
-		GagaMap gaga = cartService.getCartGoodsList();
-		model.addAttribute("cartList", gaga.get("cartList"));
+	public String selecCartGoodsList(Order param, Model model) {
+		Order order = cartService.getCartGoodsList(param);
+
+		model.addAttribute("wmsCartList", order.getWmsCartList());
+		model.addAttribute("resCartList", order.getResCartList());
+		model.addAttribute("delvCartList", order.getDelvCartList());
 		model.addAttribute("IMG_PATH", env.getProperty("upload.goods.view"));
 
 		return super.getDeviceViewName("cart/cartListAjaxForm");

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

@@ -7,7 +7,7 @@
         <col width="*">
     </colgroup>
     <tbody>
-<th:block th:each="cart, status : ${cartList}">
+<th:block th:each="cart, status : ${wmsCartList}">
     <tr>
         <td class="t_l">
             <div class="info_item">