Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.front.git into develop

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

@@ -1,67 +0,0 @@
-package com.style24.front.biz.service;
-
-import com.gagaframework.web.parameter.GagaMap;
-import com.style24.core.biz.service.TscCustomerService;
-import com.style24.core.biz.thirdparty.SsgKakaoSender;
-import com.style24.core.support.env.TscConstants;
-import com.style24.persistence.domain.CustContactHst;
-import com.style24.persistence.domain.Customer;
-import com.style24.persistence.domain.SsgDirectMessage;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-
-/**
- * 카카오알림톡 Service. 모든 카카오알림톡 발송은 여기에서 처리한다.
- *
- * @author gagamel
- * @since 2021. 02. 19
- */
-@Service
-@Slf4j
-public class TsfKakaoService {
-
-	@Autowired
-	private SsgKakaoSender kakaoSender;
-
-	@Autowired
-	private TscCustomerService coreCustomerService;
-
-	public static final String siteNm = "STYLE24";
-
-	/**
-	 * 가입축하 알림톡
-	 *
-	 * @param customer - 고객 정보
-	 * @author jsshin
-	 * @since 2021. 02. 19
-	 */
-	@Transactional("shopTxnManager")
-	public void sendJoinCongrat(Customer customer) {
-		SsgDirectMessage dm = new SsgDirectMessage();
-		dm.setFdestine(customer.getCellPhnno());
-		dm.setFkkoresendtype("LMS");
-
-		GagaMap replaceInfo = new GagaMap();
-		replaceInfo.setString("siteNm", siteNm);
-		replaceInfo.setString("custNm", customer.getCustNm());
-		kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.JoinCongrat.value(), dm, replaceInfo);
-
-		try {
-			// 고객접촉이력 정보
-			CustContactHst custContactHst = new CustContactHst();
-			custContactHst.setContactType(TscConstants.ContactType.CONGRATULATIONS.value());
-			custContactHst.setContactMethod(TscConstants.ContactMethod.KAKAOTALK.value()); // 접촉방법:알림톡+문자(공통코드G055)
-			custContactHst.setReceiverNo(customer.getCustNo());
-			custContactHst.setContactContents("회원가입축하");
-			coreCustomerService.createCustomerContactHistory(custContactHst);
-		} catch (Exception e) {
-			log.error("error", e);
-			// Do nothing
-		}
-	}
-
-
-}

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

@@ -1156,7 +1156,7 @@ public class TsfOrderService {
 			sb.append("<order>\n");
 			sb.append("\t<merchantId>").append(shopId).append("</merchantId>\n");								//<!-- 상점ID -->
 			sb.append("\t<certiKey>").append(certificationKey).append("</certiKey>\n");	//<!-- 인증키 -->
-			sb.append("\t<backUrl>").append(param.getBackUrl()).append("</backUrl>\n");	//<!-- 이전페이지 -->
+			sb.append("\t<backUrl>").append("<![CDATA[").append(param.getBackUrl()).append("]]>").append("</backUrl>\n");	//<!-- 이전페이지 -->
 			sb.append("\t<merchantCustomCode1>").append(param.getOrdNo()).append("</merchantCustomCode1>\n");
 			sb.append("\t<interface>\n");
 			sb.append("\t\t<cpaInflowCode>").append(cpaInflowCode).append("</cpaInflowCode>\n");
@@ -1169,11 +1169,11 @@ public class TsfOrderService {
 				sb.append("\t<product>\n");
 				sb.append("\t\t<id>").append(item.getGoodsCd()).append("</id>\n");								//<!-- 상품코드 -->
 				sb.append("\t\t<ecMallProductId>").append(item.getGoodsCd()).append("</ecMallProductId>\n");	//<!-- 상품코드 -->
-				sb.append("\t\t<name>").append(item.getGoodsNm()).append("</name>\n");	//<!-- 상품명 -->
+				sb.append("\t\t<name>").append("<![CDATA[").append(item.getGoodsNm()).append("]]>").append("</name>\n");	//<!-- 상품명 -->
 				sb.append("\t\t<basePrice>").append(item.getCurrPrice() + item.getOptAddPrice()).append("</basePrice>\n");		//<!-- 상품금액 -->
 				// TODO http: 부분 운영 프로토콜 확인 후 수정 필요(운영 상품상세가 HTTPS일 경우 분기처리 필요(개발서버, 운영 구분))
-				sb.append("\t\t<infoUrl>").append("http:" + (param.getGoodsUrl() + item.getGoodsCd())).append("</infoUrl>\n");	//<!-- 상품상세페이지 URL -->
-				sb.append("\t\t<imageUrl>").append("http:" + goodsImgUrl + "/" + item.getSysImgNm()).append("</imageUrl>\n");	//<!-- 상품원본이미지 URL -->
+				sb.append("\t\t<infoUrl>").append("<![CDATA[https:").append(param.getGoodsUrl()).append(item.getGoodsCd()).append("]]>").append("</infoUrl>\n");	//<!-- 상품상세페이지 URL -->
+				sb.append("\t\t<imageUrl>").append("<![CDATA[https:").append(goodsImgUrl).append("/").append(item.getSysImgNm()).append("]]>").append("</imageUrl>\n");	//<!-- 상품원본이미지 URL -->
 				if(TscConstants.GoodsType.SET.value().equals(item.getGoodsType())) {		// 세트상품
 					// 구성상품 옵션정보 split
 					String[] itemNms  = item.getItemNm().split("!@!");		// 구성상품명
@@ -1544,10 +1544,11 @@ public class TsfOrderService {
 					sb.append("\t\t\t<optionItem>\n");
 					sb.append("\t\t\t\t<type>SELECT</type>\n");
 					sb.append("\t\t\t\t<name>색상</name>\n");
+					int j = 0;
 					for (String color : colorList) {
 						sb.append("\t\t\t\t<value>\n");
 						sb.append("\t\t\t\t\t<id>").append(color).append("</id>\n");
-						sb.append("\t\t\t\t\t<text>").append(color).append("</text>\n");
+						sb.append("\t\t\t\t\t<text>").append(colorNmList[j++]).append("</text>\n");
 						sb.append("\t\t\t\t</value>\n");
 					}
 					sb.append("\t\t\t</optionItem>\n");

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

@@ -1,23 +1,28 @@
 package com.style24.front.biz.web;
 
-import com.gagaframework.web.rest.server.GagaResponse;
-import com.style24.core.biz.service.TscEnvsetService;
-import com.style24.core.support.env.TscConstants;
-import com.style24.core.support.message.TscMessageByLocale;
-import com.style24.front.biz.service.TsfCustomerService;
-import com.style24.front.support.controller.TsfBaseController;
-import com.style24.front.support.security.session.TsfSession;
-import com.style24.persistence.domain.Customer;
-import lombok.extern.slf4j.Slf4j;
 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.servlet.ModelAndView;
 
+import com.style24.core.biz.service.TscEnvsetService;
+import com.style24.core.biz.service.TscKakaotalkService;
+import com.style24.core.support.env.TscConstants;
+import com.style24.core.support.message.TscMessageByLocale;
+import com.style24.front.biz.service.TsfCustomerService;
+import com.style24.front.support.controller.TsfBaseController;
+import com.style24.front.support.security.session.TsfSession;
+import com.style24.persistence.domain.Customer;
+
+import lombok.extern.slf4j.Slf4j;
+
+import com.gagaframework.web.rest.server.GagaResponse;
+
 /**
  * 앱 관련 Controller
  *
@@ -38,6 +43,8 @@ public class TsfAppController extends TsfBaseController {
 	@Autowired
 	private TscEnvsetService envsetService;
 
+	@Autowired
+	private TscKakaotalkService kakaoService;
 
 	/**
 	 * 앱 설정 화면
@@ -51,9 +58,9 @@ public class TsfAppController extends TsfBaseController {
 
 		// 정책에 등록된 앱버전
 		if (TsfSession.getAttribute("osType").equals("I")) {
-			mav.addObject("regAppVersion",envsetService.getIosAppVersion(TscConstants.Site.STYLE24.value()));
+			mav.addObject("regAppVersion", envsetService.getIosAppVersion(TscConstants.Site.STYLE24.value()));
 		} else if (TsfSession.getAttribute("osType").equals("A")) {
-			mav.addObject("regAppVersion",envsetService.getAosAppVersion(TscConstants.Site.STYLE24.value()));
+			mav.addObject("regAppVersion", envsetService.getAosAppVersion(TscConstants.Site.STYLE24.value()));
 		}
 
 		// 앱푸시수신동의 가져오기
@@ -92,8 +99,7 @@ public class TsfAppController extends TsfBaseController {
 		return super.ok(message.getMessage("SUCC_0004"));
 	}
 
-
-		/**
+	/**
 	 * 앱 설정 화면
 	 *
 	 * @author jsshin
@@ -108,4 +114,31 @@ public class TsfAppController extends TsfBaseController {
 
 		return mav;
 	}
+
+	/**
+	 * 스플래시이미지URL 조회
+	 * @return
+	 * @author gagamel
+	 * @since 2021. 5. 21
+	 */
+	@GetMapping("/splash/image/url")
+	@ResponseBody
+	public String getSplashImageUrl() {
+		return envsetService.getSplashImageUrl(TscConstants.Site.STYLE24.value());
+	}
+
+	/**
+	 * 앱다운로드URL 전송
+	 * @param cellPhnno - 휴대전화번호
+	 * @return
+	 * @author gagamel
+	 * @since 2021. 5. 21
+	 */
+	@PostMapping("/download/url/send")
+	@ResponseBody
+	public GagaResponse sendAppDownloadUrl(@RequestParam(value = "cellPhnno") String cellPhnno) {
+		kakaoService.sendAppDownloadUrl(cellPhnno);
+		return super.ok(message.getMessage("SUCC_0005"));
+	}
+
 }

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

@@ -364,6 +364,7 @@ public class TsfCartController extends TsfBaseController {
 
 		// 장바구니 상품목록
 		cart = cartService.getCartGoodsList(cart);
+		log.info("CHECK LENGTH :::: {}", cart.getDelvAllCartList().size());
 		cart.setImgPath1(env.getProperty("upload.goods.view"));
 
 		// 현재 주문 가능 수량순으로 정렬
@@ -396,6 +397,12 @@ public class TsfCartController extends TsfBaseController {
 			}
 		}
 
+		for(Order oneData : cart.getDelvAllCartList()) {
+			if(oneData.getOrdCanQty() < 1) {
+				cartList.add(oneData);
+			}
+		}
+
 		cart.setDelvAllCartList(cartList);
 
 		return cart;

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

@@ -16,10 +16,10 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.style24.core.biz.service.TscClauseService;
+import com.style24.core.biz.service.TscKakaotalkService;
 import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.front.biz.service.TsfCustomerService;
-import com.style24.front.biz.service.TsfKakaoService;
 import com.style24.front.biz.thirdparty.NiceCertify;
 import com.style24.front.biz.thirdparty.Yes24Login;
 import com.style24.front.support.controller.TsfBaseController;
@@ -53,7 +53,7 @@ public class TsfCustomerController extends TsfBaseController {
 	private TscClauseService clauseService;
 
 	@Autowired
-	private TsfKakaoService kakaoService;
+	private TscKakaotalkService kakaotalkService;
 
 	@Autowired
 	private NiceCertify niceCertify;
@@ -607,7 +607,7 @@ public class TsfCustomerController extends TsfBaseController {
 			// 4.알림톡 발송
 			try {
 				if (StringUtils.isNotBlank(customer.getCellPhnno())) {
-					kakaoService.sendJoinCongrat(customer);
+					kakaotalkService.sendJoinCongrat(customer, customer.getCustNo());
 				}
 			} catch (Exception e) {
 				log.error("error", e);

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

@@ -8,7 +8,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import com.style24.front.biz.thirdparty.GoogleReCaptcha;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
@@ -16,7 +15,6 @@ 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.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
@@ -25,6 +23,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.front.biz.service.TsfCustomerService;
+import com.style24.front.biz.thirdparty.GoogleReCaptcha;
 import com.style24.front.biz.thirdparty.KaKaoLogin;
 import com.style24.front.biz.thirdparty.NaverLogin;
 import com.style24.front.biz.thirdparty.Yes24Login;
@@ -71,57 +70,6 @@ public class TsfIndexController extends TsfBaseController {
 	@Autowired
 	private ObjectMapper objectMapper;
 
-//	/**
-//	 * 에러 페이지
-//	 * @return
-//	 * @author gagamel
-//	 * @throws IOException
-//	 * @since 2020. 3. 18
-//	 */
-//	@GetMapping("/error")
-//	public ModelAndView error(HttpServletRequest request, HttpServletResponse response) throws HttpRequestMethodNotSupportedException, IOException {
-//		ModelAndView mav = new ModelAndView();
-//
-//		Object status = request.getAttribute(RequestDispatcher.ERROR_STATUS_CODE);
-//
-//		if (status != null) {
-//			Integer statusCode = Integer.valueOf(status.toString());
-//			log.info("statusCode: {}", statusCode);
-//
-//			if (statusCode == GagaResponseStatus.NOT_FOUND.getCode()) {
-//				mav.addObject("status", GagaResponseStatus.NOT_FOUND.getCode());
-//
-//				// 404 오류 시 잘못된 링크 유입 시 몰메인으로 이동 처리
-//				String prevRequestUri = (String)request.getAttribute(RequestDispatcher.FORWARD_REQUEST_URI);
-//				log.info("prevRequestUri: {}", prevRequestUri);
-//				if (prevRequestUri.startsWith("/m")) {
-//					response.sendRedirect("/");
-//				}
-//
-//				String profiles = env.getProperty("spring.profiles.active").toLowerCase();
-//				if ("locd".equals(profiles) || "locp".equals(profiles) || "dev".equals(profiles)) {
-//					mav.addObject("message", "No mapping found for HTTP request with URI ["
-//						+ String.valueOf(request.getAttribute(RequestDispatcher.FORWARD_REQUEST_URI)) + "]");
-//				}
-//
-//				mav.setViewName(super.getDeviceViewName("error/404"));
-//
-//				return mav;
-//			}
-//		}
-//
-//		mav.addObject("status", GagaResponseStatus.INTERNAL_SERVER_ERROR.getCode());
-//
-//		String profiles = env.getProperty("spring.profiles.active").toLowerCase();
-//		if ("locd".equals(profiles) || "locp".equals(profiles) || "dev".equals(profiles)) {
-//			mav.addObject("message", String.valueOf(request.getAttribute(RequestDispatcher.ERROR_MESSAGE)));
-//		}
-//
-//		mav.setViewName(super.getDeviceViewName("error/500"));
-//
-//		return mav;
-//	}
-
 	/**
 	 * 시스템점검중 페이지
 	 * @return
@@ -237,8 +185,7 @@ public class TsfIndexController extends TsfBaseController {
 	 * @since 2021. 02. 23
 	 */
 	@GetMapping("/signin/yes24login")
-	public String signinYes24Login(@RequestParam(value = "rememberMe", required = false) String rememberMe
-			, @RequestParam(value = "requestGb", required = false) String requestGb) {
+	public String signinYes24Login(@RequestParam(value = "rememberMe", required = false) String rememberMe, @RequestParam(value = "requestGb", required = false) String requestGb) {
 
 		if (StringUtils.isNotBlank(rememberMe)) {
 			// RememberMe 세션 저장
@@ -265,9 +212,7 @@ public class TsfIndexController extends TsfBaseController {
 	 * @since 2021. 02. 23
 	 */
 	@RequestMapping("/signin/snsLoginCallback")
-	public ModelAndView signinSnsLoginCallback(@RequestParam(value = "snsType", required = false) String snsType, HttpSession session
-			, @RequestParam(value = "code", required = false) String code, @RequestParam(value = "state", required = false) String state
-			, @RequestParam(value = "error", required = false) boolean isError, HttpServletRequest request) {
+	public ModelAndView signinSnsLoginCallback(@RequestParam(value = "snsType", required = false) String snsType, HttpSession session, @RequestParam(value = "code", required = false) String code, @RequestParam(value = "state", required = false) String state, @RequestParam(value = "error", required = false) boolean isError, HttpServletRequest request) {
 
 		ModelAndView mav = new ModelAndView();
 
@@ -352,9 +297,8 @@ public class TsfIndexController extends TsfBaseController {
 	 * @author jsshin
 	 * @since 2021. 02. 23
 	 */
-	@RequestMapping( "/signin/yes24LoginCallback")
-	public ModelAndView yes24LoginCallback(@RequestParam(value = "ipin", required = false) String ipin
-			, @RequestParam(value = "ipn", required = false) String ipn, HttpSession session) {
+	@RequestMapping("/signin/yes24LoginCallback")
+	public ModelAndView yes24LoginCallback(@RequestParam(value = "ipin", required = false) String ipin, @RequestParam(value = "ipn", required = false) String ipn, HttpSession session) {
 		ModelAndView mav = new ModelAndView();
 		boolean isSnsLoing = false;
 		GagaMap userInfo = new GagaMap();

src/main/webapp/WEB-INF/views/mob/common/fragments/FooterMob.html

@@ -181,12 +181,14 @@
 						
 						let allCate = [[${allCateList}]];
 						$.each(result, function(idx, item) {
-							if (item.contentsType == 'C' || item.contentsType == 'O') { // 컨텐츠유형: 카테고리, 아울렛
+							if (item.contentsType == 'C') { // 컨텐츠유형: 카테고리
 								$.each(allCate, function(allCateIdx, allCateItem) {
 									if (item.cate1No == allCateItem.cate1No) {
 										$('#ulQuickMenuCate').append(fnGetQuickMenuCategory(allCateItem));
 									}
 								});
+							} else if (item.contentsType == 'O') { // 컨텐츠유형: 아울렛
+								$('#ulQuickContents').append('<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_OUTLET_MAIN);"><span>' + item.gtabNm + '</span></a></li>\n');
 							} else if (item.contentsType == 'L') { // 컨텐츠유형:링크
 								$('#ulQuickContents').append('<li><a href="' + item.linkUrl + '"><span>' + item.gtabNm + '</span></a></li>\n');
 							}

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

@@ -43,14 +43,14 @@
 					<!-- 장바구니 내용 -->
 				</div>
 			</div>
-			<div class="content od_recommend">
+			<div class="content od_recommend od_recommend_area">
 				<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="swiper-container swiper-container-initialized swiper-container-horizontal">
+						<div class="swiper-wrapper" style="transform: translate3d(0px, 0px, 0px);">
+							<div class="swiper-slide swiper-slide-active" style="width: 276px; margin-right: 20px;">
 								<div class="item_prod">
 									<div class="item_state">
 										<button type="button" class="itemLike">관심상품 추가</button>
@@ -74,7 +74,7 @@
 									</div>
 								</div>
 							</div>
-							<div class="swiper-slide">
+							<div class="swiper-slide swiper-slide-next" style="width: 276px; margin-right: 20px;">
 								<div class="item_prod">
 									<div class="item_state">
 										<button type="button" class="itemLike">관심상품 추가</button>
@@ -98,7 +98,7 @@
 									</div>
 								</div>
 							</div>
-							<div class="swiper-slide">
+							<div class="swiper-slide" style="width: 276px; margin-right: 20px;">
 								<div class="item_prod">
 									<div class="item_state">
 										<button type="button" class="itemLike">관심상품 추가</button>
@@ -122,7 +122,7 @@
 									</div>
 								</div>
 							</div>
-							<div class="swiper-slide">
+							<div class="swiper-slide" style="width: 276px; margin-right: 20px;">
 								<div class="item_prod">
 									<div class="item_state">
 										<button type="button" class="itemLike">관심상품 추가</button>
@@ -146,7 +146,7 @@
 									</div>
 								</div>
 							</div>
-							<div class="swiper-slide">
+							<div class="swiper-slide" style="width: 276px; margin-right: 20px;">
 								<div class="item_prod">
 									<div class="item_state">
 										<button type="button" class="itemLike">관심상품 추가</button>
@@ -170,7 +170,7 @@
 									</div>
 								</div>
 							</div>
-							<div class="swiper-slide">
+							<div class="swiper-slide" style="width: 276px; margin-right: 20px;">
 								<div class="item_prod">
 									<div class="item_state">
 										<button type="button" class="itemLike">관심상품 추가</button>
@@ -195,7 +195,7 @@
 									</div>
 								</div>
 							</div>
-							<div class="swiper-slide">
+							<div class="swiper-slide" style="width: 276px; margin-right: 20px;">
 								<div class="item_prod">
 									<div class="item_state">
 										<button type="button" class="itemLike">관심상품 추가</button>
@@ -220,7 +220,7 @@
 									</div>
 								</div>
 							</div>
-							<div class="swiper-slide">
+							<div class="swiper-slide" style="width: 276px; margin-right: 20px;">
 								<div class="item_prod">
 									<div class="item_state">
 										<button type="button" class="itemLike">관심상품 추가</button>
@@ -246,6 +246,193 @@
 							</div>
 						</div>
 						<!-- Add Pagination -->
+						<div class="swiper-pagination swiper-pagination-clickable swiper-pagination-bullets"><span class="swiper-pagination-bullet swiper-pagination-bullet-active" tabindex="0" role="button" aria-label="Go to slide 1"></span><span class="swiper-pagination-bullet" tabindex="0" role="button" aria-label="Go to slide 2"></span><span class="swiper-pagination-bullet" tabindex="0" role="button" aria-label="Go to slide 3"></span><span class="swiper-pagination-bullet" tabindex="0" role="button" aria-label="Go to slide 4"></span></div>
+						<span class="swiper-notification" aria-live="assertive" aria-atomic="true"></span></div>
+					<!-- Add Arrows -->
+					<div class="swiper-button-next" tabindex="0" role="button" aria-label="Next slide" aria-disabled="false"></div>
+					<div class="swiper-button-prev swiper-button-disabled" tabindex="0" role="button" aria-label="Previous slide" aria-disabled="true"></div>
+				</div>
+			</div>
+
+			<div class="content od_recommend od_realtime">
+				<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/prod5.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="itemViewCount">
+												<span>304</span>명 보는중
+											</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/prod5.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="itemViewCount">
+												<span>304</span>명 보는중
+											</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/prod5.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="itemViewCount">
+												<span>304</span>명 보는중
+											</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/prod5.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="itemViewCount">
+												<span>304</span>명 보는중
+											</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/prod5.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="itemViewCount">
+												<span>304</span>명 보는중
+											</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/prod5.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="itemViewCount">
+												<span>304</span>명 보는중
+											</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/prod5.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="itemViewCount">
+												<span>304</span>명 보는중
+											</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/prod5.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="itemViewCount">
+												<span>304</span>명 보는중
+											</div>
+										</a>
+									</div>
+								</div>
+							</div>
+						</div>
+						<!-- Add Pagination -->
 						<div class="swiper-pagination"></div>
 					</div>
 					<!-- Add Arrows -->
@@ -400,18 +587,32 @@
 
     $(function(){
         //추천상품 슬라이드
-        var rcmdItemSwiper = new Swiper('.od_recommend .swiper-container', {
+        var rcmdItemSwiper = new Swiper('.od_recommend_area .swiper-container', {
             slidesPerView: 5,
-            spaceBetween: 0,
+            spaceBetween: 20,
             navigation: {
-                nextEl: '.od_recommend .swiper-button-next',
-                prevEl: '.od_recommend .swiper-button-prev',
+                nextEl: '.od_recommend_area .swiper-button-next',
+                prevEl: '.od_recommend_area .swiper-button-prev',
             },
             pagination: {
-                el: '.od_recommend .swiper-pagination',
+                el: '.od_recommend_area .swiper-pagination',
                 clickable: true,
             },
         });
+
+		//지금 많이 보고 있어요 슬라이드
+		var realtimeItemSwiper = new Swiper('.od_realtime .swiper-container', {
+			slidesPerView: 5,
+			spaceBetween: 20,
+			navigation: {
+				nextEl: '.od_realtime .swiper-button-next',
+				prevEl: '.od_realtime .swiper-button-prev',
+			},
+			pagination: {
+				el: '.od_realtime .swiper-pagination',
+				clickable: true,
+			},
+		});
     });
 </script>
 </th:block>

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

@@ -1113,7 +1113,7 @@
 					quickShoppingBagHtml += '</div>';
 					quickShoppingBagHtml += '<button type="button" class="btn btn_default purchase_btn" onclick="cfnGoToPage(_PAGE_CART);"><span>쇼핑백 바로가기</span></button>';
 
-					$("#quick_menu #quick02 .count").text(ordCanCnt);
+					$("#quick_menu #quick02 .count").text(order.delvAllCartList.length);
 				} else {
 					if(!$("#quick_menu .shopingbag.quick_con.quick02 .quick_body").hasClass("nodata")) {
 						$("#quick_menu .shopingbag.quick_con.quick02 .quick_body").addClass("nodata");

src/main/webapp/WEB-INF/views/web/popup/RefundAccountAddPopupFormWeb.html

@@ -93,12 +93,23 @@
 
 	// 계좌인증 버튼 클릭 이벤트
 	$('#btnAccountCheck').click(function() {
+		// 승인된 계좌 정보
+		let confirmedAccountNm = $('#refundAccountForm input[name=confirmedAccountNm]').val();
+		let confirmedAccountNo = $('#refundAccountForm input[name=confirmedAccountNo]').val();
+		let confirmedBankCd = $('#refundAccountForm input[name=confirmedBankCd]').val();
+
+		// 계좌정보
+		let accountNm = $('#refundAccountForm input[name=accountNm]').val();
+		let accountNo = $('#refundAccountForm input[name=accountNo]').val();
+		let bankCd = $('#refundAccountForm input[name=bankCd]').val();
+
+		if (accountNm != confirmedAccountNm || accountNo != confirmedAccountNo || bankCd != confirmedBankCd) {
+			isValid = false;
+		}
+
 		if (!isValid) {
 			let url = '/mypage/account/check';
-			let accountNm = $('#refundAccountForm input[name=accountNm]').val();
-			let accountNo = $('#refundAccountForm input[name=accountNo]').val();
-			let bankCd = $('#refundAccountForm input[name=bankCd]').val();
-			
+
 			let data = {};
 			data.accountNm = accountNm;
 			data.accountNo = accountNo;