마이페이지 취반교 임시 커밋

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

@@ -1,32 +1,12 @@
 package com.style24.front.biz.service;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.Principal;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Enumeration;
 import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.servlet.AsyncContext;
-import javax.servlet.DispatcherType;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.Cookie;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpUpgradeHandler;
-import javax.servlet.http.Part;
 
-import org.apache.catalina.connector.Request;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
@@ -370,8 +350,10 @@ public class TsfOrderService {
 				if(TscConstants.PgGb.KCP.value().equals(param.getPgGb()) || TscConstants.PgGb.PAYCO.value().equals(param.getPgGb())) {
 					coreKcpService.kcpCancel(result);
 				} else if (TscConstants.PgGb.KAKAO.value().equals(param.getPgGb())) {
+					param.setLeftAmt(0);
 					coreKakaoPayService.kakaoPayRollBack(param);
 				} else if (TscConstants.PgGb.NAVER.value().equals(param.getPgGb())) {
+					param.setLeftAmt(0);
 					coreNaverPayService.naverPayRollBack(param);
 				} else {
 					throw new IllegalArgumentException("결제 정보 저장 실패. 새로고침 후 다시 시작해주세요.");

src/main/webapp/WEB-INF/views/web/mypage/MypageCancelFormWeb.html

@@ -363,7 +363,7 @@
 			let goodsCancelAmt = spanCnclRtnAmt;										// 상품취소금액
 			let deliveryFee = sumDeliveryFee - spanTotDeliveryFee;						// 배송비
 			let deductDcAmt = 0 - spanCpnDcAmt - spanTmtbDcAmt - spanPrePntDcAmt;		// 할인금액 차감(쿠폰+다다익선+선포인트)
-			let refundPayAmt = spanRefundAmt - spanTotDeliveryFee;						// 결제금액 환불
+			let refundPayAmt = spanRefundAmt;											// 결제금액 환불
 			let returnAmt = refundPayAmt + refundPoint + refundGiftCard;				// 환불예정금액
 
 			// 추가배송비 영역 설정

src/main/webapp/ux/pc/js/common-ui.js

@@ -311,9 +311,9 @@ $(document).ready( function() {
 	});
 
 	//통합검색 - 레이어 열고닫기
-	$(document).on('click','.common_header .search .promotion_search, .common_header .search .btn_open_search',function(e){
-		$('body').addClass('lock');
-		$("#header .common_search").addClass('active'); 
+	//210420_수정 : 검색창 호출 스크립트 수정.
+	$(document).on('click','.common_header.main_header .search .promotion_search, .common_header.main_header .search .btn_open_search',function(e){
+		location.href='sch_result.html';
 		return false;
 	}).on('click','.common_search .btn_close_search',function(e){
 		$("#header .common_search").removeClass('active'); 
@@ -540,7 +540,7 @@ $(document).ready( function() {
 $(document).ready( function() {
 
 	//팝업 - 상품썸네일 크게보기
-	$(document).on('click','.pd_detail .area_pic .thumb_list_wrap ul li',function(e){
+	$(document).on('click','.pd_detail .area_pic .thumb_list_wrap ul li a',function(e){
 		$('body').addClass('lock');
 		$("#pdItemThumbPop .full_pop_container").empty();
 		var thumbIndex = $(this).index() + 1;
@@ -663,7 +663,7 @@ $(document).ready( function() {
 		$(this).parent('.swiper-slide').addClass('on');
 		targetThumb.siblings('li').removeClass('on');
 		targetThumb.addClass('on');
-		$('html,body').animate({scrollTop : topThumb}, 500);
+		$('html,body').animate({scrollTop : topThumb}, 100);
 		return false;
 	});
 
@@ -671,7 +671,10 @@ $(document).ready( function() {
 	/* 상품상세 > 상품문의 _accordion */
 	$(document).on('click','.pd_qnalist .foldGroup .fold_head',function(e){
 		if($(this).parent().hasClass('secret_qna')){
-			alert('비밀글은 열람하실 수 없습니다.');
+			//210420_수정 : dialog alert 변경.
+			mcxDialog.alert("비밀글은 열람하실 수 없습니다.", {
+				sureBtnText: "확인",
+			});
 		}else {
 			$(this).parents('.foldGroup li').find('.fold_cont').slideToggle(100);
 			$(this).toggleClass('on');