Merge branch 'develop' into jmh

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

@@ -7,6 +7,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.gagaframework.web.parameter.GagaParameterUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
@@ -2045,33 +2046,33 @@ public class TsfMypageController extends TsfBaseController {
 	/**
 	 * 마이페이지 - 회원정보수정 화면
 	 *
-	 * @param confirmYn - 정보확인여부
+	 * @param
 	 * @return ModelAndView
 	 * @author jsshin
 	 * @since 2021. 03. 15
 	 */
 	@RequestMapping("/customer/modify/form")
-	public ModelAndView getCustomerModifyForm(@RequestParam(required = false) String confirmYn,
-											  @RequestParam(value = "sEncData", required = false) String sEncData ,
+	public ModelAndView getCustomerModifyForm(@RequestParam(value = "sEncData", required = false) String sEncData ,
 											  @RequestParam(value = "authMethod", required = false) String authMethod,
 											  HttpServletRequest request) {
-
 		ModelAndView mav = new ModelAndView();
 		String referer = StringUtils.defaultIfBlank(TsfSession.getHttpServletRequest().getHeader("referer"), "");
 		boolean redirect = false;
 
-		log.info("referer1 ==>  {}", referer);
-		log.info("referer2 ==>  {}", request.getHeader("Referer"));
+		GagaMap custInfoMap = GagaParameterUtil.getParameterMap(request);
+		Customer customer = new Customer();
+		customer.setPasswd(custInfoMap.getString("passwd"));
+		boolean isMatch = customerService.customerPasswordConfirm(customer);
 
 		if (StringUtils.isBlank(referer)) {
 			redirect = true;
 		}
 
-		if (!referer.contains("/mypage/customer/confirm/form")) {
+		if (!isMatch) {
 			redirect = true;
 		}
 
-		if (!"Y".equals(confirmYn)) {
+		if (!referer.contains("/mypage/customer/confirm/form")) {
 			redirect = true;
 		}
 

src/main/java/com/style24/front/support/security/TsfAuthenticationProvider.java

@@ -82,7 +82,7 @@ public class TsfAuthenticationProvider implements AuthenticationProvider {
 
 		if (loginInfo == null) {
 			log.info(String.format("Customer with ID=%s was not found!", loginId));
-			throw new TsfUsernameNotFoundException(message.getMessage("LOGN_0001"));
+			throw new TsfUsernameNotFoundException(message.getMessage("LOGN_0010"));
 		}
 
 		// 로그인 실패누적건수가 5회 이상이면
@@ -97,7 +97,7 @@ public class TsfAuthenticationProvider implements AuthenticationProvider {
 			log.info("Password is match?: {}", isMatch);
 
 			if (!isMatch) {
-				throw new BadCredentialsException(message.getMessage("LOGN_0002"));
+				throw new BadCredentialsException(message.getMessage("LOGN_0010"));
 			}
 		}
 

src/main/resources/i18n/messages/message_ko_KR.properties

@@ -33,7 +33,7 @@ LOGN_0006=\uD734\uBA74 \uD68C\uC6D0\uC785\uB2C8\uB2E4.
 LOGN_0007=\uD0C8\uD1F4 \uD68C\uC6D0\uC785\uB2C8\uB2E4.
 LOGN_0008=\uC774\uBBF8 \uAC00\uC785\uD558\uC2E0 \uC774\uBA54\uC77C\uC774 \uC874\uC7AC\uD569\uB2C8\uB2E4.
 LOGN_0009=\uBCF8\uC778\uC778\uC99D\uC774 \uD544\uC694\uD55C \uD68C\uC6D0\uC785\uB2C8\uB2E4.
-
+LOGN_0010=\uD574\uB2F9 \uACC4\uC815\uC774 \uC5C6\uAC70\uB098 \uBE44\uBC00\uBC88\uD638\uAC00 \uC77C\uCE58\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
 
 ##\uC7A5\uBC14\uAD6C\uB2C8
 CART_0001=\uC7A5\uBC14\uAD6C\uB2C8\uC5D0 \uB2F4\uACBC\uC2B5\uB2C8\uB2E4.

src/main/webapp/WEB-INF/views/mob/display/CategoryMainFormMob.html

@@ -85,9 +85,11 @@
 													<div class="itemComment" th:if="${not #strings.isEmpty(item.goodsTnm)}" th:text="${item.goodsTnm}">#주문 폭주 상품</div>
 													<div class="itemName" th:text="${item.goodsFullNm}">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
 <!--													<p class="itemPrice" th:text="${#numbers.formatInteger(item.currPrice,3,'COMMA')}">80,100</p>-->
-													<p class="itemPrice"><span class="itemPrice_original" th:if="${item.currPrice != item.listPrice}" th:text="${#numbers.formatInteger(item.listPrice,3,'COMMA')}">89,000</span>[[${#numbers.formatInteger(item.currPrice,1,'COMMA')}]]
+													<p th:unless="${item.goodsType=='G056_D'}" class="itemPrice"><span class="itemPrice_original" th:if="${item.currPrice != item.listPrice}" th:text="${#numbers.formatInteger(item.listPrice,3,'COMMA')}">89,000</span>[[${#numbers.formatInteger(item.currPrice,1,'COMMA')}]]
 														<span class=" itemPercent" th:if="${item.currPrice != item.listPrice}" th:text="${(item.listPrice == 0 ? 0 : #numbers.formatDecimal((item.listPrice - item.currPrice) / (item.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 													</p>
+													<p th:if="${item.goodsType=='G056_D'}" class="itemPrice">[[${#numbers.formatInteger(item.currPrice,1,'COMMA')} + ' ~']]
+													</p>
 												</a>
 											</div>
 										</div>
@@ -119,9 +121,11 @@
 												<p class="itemBrand" th:text="${item.brandGroupNm}">BRAND NAME</p>
 												<div class=" itemName" th:text="${item.goodsFullNm}">여성 체인 프린트 큐롯 스커트 프린트 큐롯 스커트</div>
 												<div class="itemComment" th:if="${not #strings.isEmpty(item.goodsTnm)}" th:text="${item.goodsTnm}">#주문 폭주 상품</div>
-												<p class="itemPrice"><span class="itemPrice_original" th:if="${item.currPrice != item.listPrice}" th:text="${#numbers.formatInteger(item.listPrice,3,'COMMA')}">89,000</span>[[${#numbers.formatInteger(item.currPrice,1,'COMMA')}]]
+												<p th:unless="${item.goodsType=='G056_D'}" class="itemPrice"><span class="itemPrice_original" th:if="${item.currPrice != item.listPrice}" th:text="${#numbers.formatInteger(item.listPrice,3,'COMMA')}">89,000</span>[[${#numbers.formatInteger(item.currPrice,1,'COMMA')}]]
 													<span class=" itemPercent" th:if="${item.currPrice != item.listPrice}" th:text="${(item.listPrice == 0 ? 0 : #numbers.formatDecimal((item.listPrice - item.currPrice) / (item.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 												</p>
+												<p th:if="${item.goodsType=='G056_D'}" class="itemPrice">[[${#numbers.formatInteger(item.currPrice,1,'COMMA')} + ' ~']]
+												</p>
 												<div class="itemcolorchip">
 													<th:block th:each="option, idx : ${item.colorArr}" th:with="colorArray=${#strings.arraySplit(idx.current,':')}">
 														<span th:if="${colorArray[1]=='#FFFFFF'}" th:style="${'background-color:'+colorArray[1]+';border:1px solid #aaa;'}" class="chip_color" th:value="${colorArray[0]}"></span>

src/main/webapp/WEB-INF/views/mob/display/OutletMainFormMob.html

@@ -76,11 +76,14 @@
 													</div>
 													<p class="itemBrand" th:text="${item.brandGroupNm}">BRAND NAME</p>
 													<div class="itemName" th:text="${item.goodsFullNm}">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
-													<p class="itemPrice">
+													<p th:unless="${item.goodsType=='G056_D'}" class="itemPrice">
 														<span class="itemPrice_original" th:if="${item.currPrice != item.listPrice}" th:text="${#numbers.formatInteger(item.listPrice,3,'COMMA')}">89,000</span>
 														[[${#numbers.formatInteger(item.currPrice,0,'COMMA')}]]
 														<span class="itemPercent" th:if="${item.currPrice != item.listPrice}" th:text="${(item.listPrice == 0 ? 0 : #numbers.formatDecimal((item.listPrice - item.currPrice) / (item.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 													</p>
+													<p th:if="${item.goodsType=='G056_D'}" class="itemPrice">
+														[[${#numbers.formatInteger(item.currPrice,0,'COMMA')} + ' ~']]
+													</p>
 													<div class="itemComment" th:if="${not #strings.isEmpty(item.goodsTnm)}" th:text="${item.goodsTnm}">#주문 폭주 상품</div>
 												</a>
 											</div>
@@ -112,9 +115,10 @@
 												</div>
 												<p class="itemBrand" th:text="${item.brandGroupNm}">BRAND NAME</p>
 												<div class="itemName" th:text="${item.goodsFullNm}">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
-												<p class="itemPrice"><span class="itemPrice_original" th:if="${item.currPrice != item.listPrice}" th:text="${#numbers.formatInteger(item.listPrice,3,'COMMA')}">89,000</span>[[${#numbers.formatInteger(item.currPrice,0,'COMMA')}]]
+												<p th:unless="${item.goodsType=='G056_D'}" class="itemPrice"><span class="itemPrice_original" th:if="${item.currPrice != item.listPrice}" th:text="${#numbers.formatInteger(item.listPrice,3,'COMMA')}">89,000</span>[[${#numbers.formatInteger(item.currPrice,0,'COMMA')}]]
 													<span class="itemPercent" th:if="${item.currPrice != item.listPrice}" th:text="${(item.listPrice == 0 ? 0 : #numbers.formatDecimal((item.listPrice - item.currPrice) / (item.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 												</p>
+												<p th:if="${item.goodsType=='G056_D'}" class="itemPrice">[[${#numbers.formatInteger(item.currPrice,0,'COMMA')} + ' ~']]</p>
 												<div class="itemcolorchip" th:if="${item.colorArr != null}">
 													<th:block th:each="option, idx : ${item.colorArr}" th:with="colorArray=${#strings.arraySplit(idx.current,':')}">
 														<span th:if="${colorArray[1]=='#FFFFFF'}" th:style="${'background-color:'+colorArray[1]+';border:1px solid #aaa;'}" class="chip_color" th:value="${colorArray[0]}"></span>

src/main/webapp/WEB-INF/views/mob/mypage/MypageCustConfirmFormMob.html

@@ -23,7 +23,7 @@
 		<div class="inner">
 			<div class="pass_confirm">
 				<p class="desc">정보를 안전하게 보호하기 위하여<br>비밀번호를 다시 확인합니다. </p>
-				<form id="confirmForm" class="form_wrap" method="post">
+				<form id="confirmForm" class="form_wrap" action="/mypage/customer/modify/form" method="post">
 					<div class="form_field">
 						<th:block th:if="${snsType == ''}">
 							<input type="text" id="custId" name="custId" th:value="${custId}" class="form_control" readonly="readonly"/>
@@ -92,16 +92,19 @@
 	};
 
 	var fnConfirmCallback = function (result) {
-		let confirmYn = 'Y';
 		let $passwd = $('#confirmForm input[name=passwd]');
 		let $custId = $('#confirmForm input[name=custId]');
 		if (result.isMatch) {
-			confirmYn = 'Y';
-			cfnGoToPage(_PAGE_MYPAGE_CUSTOMER_MODIFY+'?confirmYn='+ confirmYn);
+			$('#confirmForm').submit();
 		} else {
-			mcxDialog.alert('비밀번호가 일치하지 않습니다.');
 			$passwd.val('');
 			$custId.focus();
+			mcxDialog.alertC('비밀번호가 일치하지 않습니다.', {
+				sureBtnText: '확인',
+				sureBtnClick: function() {
+					$passwd.focus();
+				}
+			});
 			return;
 		}
 	};

src/main/webapp/WEB-INF/views/web/display/CategoryMainFormWeb.html

@@ -108,11 +108,14 @@
 												<div class="itemComment" th:if="${not #strings.isEmpty(item.goodsTnm)}" th:text="${item.goodsTnm}">#가을느낌 물씬!</div>
 												<div class="itemName" th:text="${item.goodsFullNm}">스타 착용 여성 퍼 아플리케 오버핏 투마일 웨어링 점퍼</div>
 <!--												<p class="itemPrice" th:text="${#numbers.formatInteger(item.currPrice,3,'COMMA') + '원'}">488,000원</p>-->
-												<p class="itemPrice">
+												<p th:unless="${item.goodsType=='G056_D'}" class="itemPrice">
 													<span th:text="${#numbers.formatInteger(item.currPrice,3,'COMMA') + '원'}">80,100</span>
 													<span class="itemPrice_original" th:if="${item.currPrice != item.listPrice}" th:text="${#numbers.formatInteger(item.listPrice,3,'COMMA') + '원'}">89,000</span>
 													<span class="itemPercent" th:if="${item.currPrice != item.listPrice}" th:text="${(item.listPrice == 0 ? 0 : #numbers.formatDecimal((item.listPrice - item.currPrice) / (item.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 												</p>
+												<p th:if="${item.goodsType=='G056_D'}" class="itemPrice">
+													<span th:text="${#numbers.formatInteger(item.currPrice,3,'COMMA') + '원 ~'}"></span>
+												</p>
 											</a>
 										</div>
 									</div>
@@ -151,11 +154,14 @@
 											<p class="itemBrand" th:text="${item.brandGroupNm}">BRAND NAME</p>
 											<div class="itemName" th:text="${item.goodsFullNm}">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
 											<div class="itemComment" th:if="${not #strings.isEmpty(item.goodsTnm)}" th:text="${item.goodsTnm}">#주문 폭주 상품</div>
-											<p class="itemPrice">
+											<p th:unless="${item.goodsType=='G056_D'}" class="itemPrice">
 												<span th:text="${#numbers.formatInteger(item.currPrice,3,'COMMA') + '원'}">80,100</span>
 												<span class="itemPrice_original" th:if="${item.currPrice != item.listPrice}" th:text="${#numbers.formatInteger(item.listPrice,3,'COMMA') + '원'}">89,000</span>
 												<span class="itemPercent" th:if="${item.currPrice != item.listPrice}" th:text="${(item.listPrice == 0 ? 0 : #numbers.formatDecimal((item.listPrice - item.currPrice) / (item.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 											</p>
+											<p th:if="${item.goodsType=='G056_D'}" class="itemPrice">
+												<span th:text="${#numbers.formatInteger(item.currPrice,3,'COMMA') + '원 ~'}"></span>
+											</p>
 											<div class="itemcolorchip">
 												<th:block th:each="option, idx : ${item.colorArr}" th:with="colorArray=${#strings.arraySplit(idx.current,':')}">
 													<span th:if="${colorArray[1]=='#FFFFFF'}" th:style="${'background-color:'+colorArray[1]+';border:1px solid #aaa;'}" class="chip_color" th:value="${colorArray[0]}"></span>

src/main/webapp/WEB-INF/views/web/display/OutletMainFormWeb.html

@@ -106,10 +106,11 @@
 											</div>
 											<p class="itemBrand" th:text="${item.brandGroupNm}">BRAND NAME</p>
 											<div class="itemName" th:text="${item.goodsFullNm}">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
-											<p class="itemPrice">[[${#numbers.formatInteger(item.currPrice,0,'COMMA')} + 원]]
+											<p  th:unless="${item.goodsType=='G056_D'}" class="itemPrice">[[${#numbers.formatInteger(item.currPrice,0,'COMMA')} + 원]]
 												<span class="itemPrice_original" th:if="${item.currPrice != item.listPrice}" th:text="${#numbers.formatInteger(item.listPrice,3,'COMMA')}">89,000</span>
 												<span class=" itemPercent" th:if="${item.currPrice != item.listPrice}" th:text="${(item.listPrice == 0 ? 0 : #numbers.formatDecimal((item.listPrice - item.currPrice) / (item.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 											</p>
+											<p  th:if="${item.goodsType=='G056_D'}" class="itemPrice">[[${#numbers.formatInteger(item.currPrice,0,'COMMA')} + '원 ~']]</p>
 											<div class="itemComment" th:if="${not #strings.isEmpty(item.goodsTnm)}" th:text="${item.goodsTnm}">#주문 폭주 상품</div>
 										</a>
 									</div>
@@ -149,10 +150,11 @@
 										</div>
 										<p class="itemBrand" th:text="${item.brandGroupNm}">BRAND NAME</p>
 										<div class="itemName" th:text="${item.goodsFullNm}">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
-										<p class="itemPrice">[[${#numbers.formatInteger(item.currPrice,0,'COMMA')} + 원]]
+										<p th:unless="${item.goodsType=='G056_D'}" class="itemPrice">[[${#numbers.formatInteger(item.currPrice,0,'COMMA')} + 원]]
 											<span class="itemPrice_original" th:if="${item.currPrice != item.listPrice}" th:text="${#numbers.formatInteger(item.listPrice,3,'COMMA')}">89,000</span>
 											<span class=" itemPercent" th:if="${item.currPrice != item.listPrice}" th:text="${(item.listPrice == 0 ? 0 : #numbers.formatDecimal((item.listPrice - item.currPrice) / (item.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 										</p>
+										<p th:if="${item.goodsType=='G056_D'}" class="itemPrice">[[${#numbers.formatInteger(item.currPrice,0,'COMMA')} + '원 ~']]</p>
 										<div class="itemcolorchip">
 											<th:block th:each="option, idx : ${item.colorArr}" th:with="colorArray=${#strings.arraySplit(idx.current,':')}">
 												<span th:if="${colorArray[1]=='#FFFFFF'}" th:style="${'background-color:'+colorArray[1]+';border:1px solid #aaa;'}" class="chip_color" th:value="${colorArray[0]}"></span>

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

@@ -35,7 +35,7 @@
 					<h3 class="subH1">내 정보 관리</h3>
 					<p class="text">정보를 안전하게 보호하기 위하여 비밀번호를 다시 확인 합니다.</p>
 				</div>
-				<form id="confirmForm" class="form_wrap" role="form" method="post">
+				<form id="confirmForm" class="form_wrap" role="form" action="/mypage/customer/modify/form" method="post">
 					<div class="sec_body">
 						<div class="tbl type1">
 							<table>
@@ -134,15 +134,19 @@
 	};
 
 	var fnConfirmCallback = function (result) {
-		let confirmYn = 'Y';
 		let $passwd = $('#confirmForm input[name=passwd]');
+		let $custId = $('#confirmForm input[name=custId]');
 		if (result.isMatch) {
-			confirmYn = 'Y';
-			cfnGoToPage(_PAGE_MYPAGE_CUSTOMER_MODIFY+'?confirmYn='+ confirmYn);
+			$('#confirmForm').submit();
 		} else {
-			mcxDialog.alert('비밀번호가 일치하지 않습니다.');
 			$passwd.val('');
-			$passwd.focus();
+			$custId.focus();
+			mcxDialog.alertC('비밀번호가 일치하지 않습니다.', {
+				sureBtnText: '확인',
+				sureBtnClick: function() {
+					$passwd.focus();
+				}
+			});
 			return;
 		}
 	};