Просмотр исходного кода

로그인 성공시 수정 중

jsshin 5 лет назад
Родитель
Сommit
77485b8cde

+ 13 - 0
src/main/java/com/style24/front/biz/service/TsfCustomerService.java

@@ -972,6 +972,7 @@ public class TsfCustomerService {
 		params.setSiteCd(customer.getSiteCd());
 		Collection<CustGrade> custGradePolicy = customerDao.getCustGradePolicy(params);
 		result.set("custGradePolicy", custGradePolicy);
+
 		CustGrade expctCustGrade;
 		for (CustGrade grade : custGradePolicy) {
 			grade.setCustNo(customer.getCustNo());
@@ -981,6 +982,18 @@ public class TsfCustomerService {
 				return result;
 			}
 		}
+		return result;
+	}
+
+	public GagaMap downloadCustGradeCoupon(Integer custNo) {
+		GagaMap result = new GagaMap();
+		Customer custInfo = getCustomerFindByCustNo(custNo);
+
+
+		// 1. 등급정책 정보
+
+
+
 		return result;
 	}
 }

+ 13 - 1
src/main/java/com/style24/front/biz/web/TsfPlanningController.java

@@ -476,7 +476,7 @@ public class TsfPlanningController extends TsfBaseController {
 			customer.setCustNo(TsfSession.getInfo().getCustNo());
 			customer.setCustStat(TscConstants.CustStat.ACTIVE.value());
 
-			mav.addObject("exptCustGrdeMap", customerService.getExpectedCustGrde(customer));
+			mav.addObject("exptCustGradeMap", customerService.getExpectedCustGrde(customer));
 			mav.addObject("customerInfo", coreCustomerService.getCustomerInfo(customer));
 		}
 
@@ -484,6 +484,18 @@ public class TsfPlanningController extends TsfBaseController {
 		return mav;
 	}
 
+	/**
+	 * 회원등급 쿠폰 다운로드
+	 *
+	 * @return GagaMap
+	 * @author jsshin
+	 * @since 2021. 04. 08
+	 */
+	@GetMapping("/event/custgrade/coupon/down")
+	public GagaMap downCustGradeCoupon() {
+		return customerService.downloadCustGradeCoupon(TsfSession.getInfo().getCustNo());
+	}
+
 	
 	/**
 	 * 출석체크

+ 12 - 2
src/main/java/com/style24/front/support/security/handler/TsfLoginSuccessHandler.java

@@ -118,14 +118,24 @@ public class TsfLoginSuccessHandler implements AuthenticationSuccessHandler {
 
 		// 비밀번호 변경 캠페인 일자
 		if (loginDetails.getLoginInfo().getPwdChgDay() >= CHANG_PWD_CAMPAIGN_DAY) {
-			returnUrl ="/customer/password/campaign/form";
+			returnUrl = "/customer/password/campaign/form";
 		}
 
 		// 임시비밀번호로 로그인 한 경우
 		if (CHANG_TEMP_PWD.equals(loginDetails.getLoginInfo().getTempPasswdYn())) {
-			returnUrl ="/customer/password/change/form?pageGb=temp";
+			returnUrl = "/customer/password/change/form?pageGb=temp";
 		}
 
+		// 상품상세 바로구매 > 로그인 한 경우
+		if ("/goods/detail/form".indexOf(returnUrl) > -1)  {
+			String cartSqArr = TsfSession.getAttribute("cartSqArr");
+			if (StringUtils.isNotBlank(cartSqArr)) {
+				returnUrl = "/order/form?cartSqArr="+ cartSqArr;
+			}
+		}
+
+		// 로그인 성공 쿠키로 저장 (마케팅 스크립트용)
+		GagaCookieUtil.setSecureCookie(response, TsfConstants.CK_PREFIX + "_login_Success", "Y", 1*60);
 
 		GagaMap result = new GagaMap();
 		result.setString("status", "OK");

+ 7 - 3
src/main/webapp/WEB-INF/views/web/planning/PlanningCustGradeBenefitFormWeb.html

@@ -269,11 +269,11 @@
 
 <script th:inline="javascript">
 /*<![CDATA[*/
- 	let exptCustGrdeMap = [[${exptCustGrdeMap}]]
+ 	let exptCustGradeMap = [[${exptCustGradeMap}]]
 	let custGradeNm = [[${customerInfo.custGradeNm}]];
 
  	var fnInit = function () {
-		let expctCustGrade = exptCustGrdeMap.expctCustGrade;	// 예상등급
+		let expctCustGrade = exptCustGradeMap.expctCustGrade;	// 예상등급
 
 		//expctCustGrade.custGradeNo 10:VIP, 20: GOLD, 30:SILVER, 40:BRONZE, 50:WELCOME
 
@@ -290,7 +290,7 @@
 
  	// 다음 등급정책
  	var fnGetNextGradePolicyInfo = function (nextGradeNo) {
-		let custGradePolicy = exptCustGrdeMap.custGradePolicy;	// 등급별정책
+		let custGradePolicy = exptCustGradeMap.custGradePolicy;	// 등급별정책
 		let nextCustGradePolicy;
 		$(custGradePolicy).each(function(idx, item) {
 			if (Number(item.gradeCdNo) === nextGradeNo ) {
@@ -359,6 +359,10 @@
 		}
 	}
 
+	$('#btnDownGradeCoupon').on('click', function () {
+		gagajf.ajaxJsonSubmit('')
+	});
+
 	$(document).ready(function() {
 
 		fnInit();