Commit @3c147fac464c611c870ea77c67ad14bf6f9f0f80

a84ee29

3c147fa

src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java

--- src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java

+++ src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java


 		int resultUsr = mberManageDAO.insertMber(mberManageVO);
 		//강제로 일반사용자 권한 등록(USER회원의 승인처리) ( kerinet : 2018-05-17 )
 		
-		// 페스워드 히스토리 등록
+		// BlineCode 업데이트
+		if (null != mberManageVO.getBlineCode() && !mberManageVO.getBlineCode().equals("N")) {
+			mberManageDAO.updateUserBlineCode(mberManageVO);
+		}
+		
+		// 패스워드 히스토리 등록
 		mberManageDAO.insertMberPWLog(mberManageVO);
 		
 		if(resultUsr > 0) {

a84ee29

3c147fa

src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java

--- src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java

+++ src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java


 		return (int)update("mberManageDAO.insertMber", vo);
 	}
 	
+	public int updateUserBlineCode(MberManageVO vo) {
+		return (int)update("mberManageDAO.updateUserBlineCode", vo);
+	}
+	
 	// 이메일 발송용 정상회원 전체목록
 	@SuppressWarnings("unchecked")
 	public List<MberManageVO> selectEmailSendMberList(UserDefaultVO userSearchVO){

a84ee29

3c147fa

src/main/java/itn/let/uat/uia/web/EgovLoginController.java

--- src/main/java/itn/let/uat/uia/web/EgovLoginController.java

+++ src/main/java/itn/let/uat/uia/web/EgovLoginController.java

...	...	@@ -241,6 +241,16 @@
241	241	Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated();
242	242	if (isAuthenticated)
243	243	return "redirect:/";
	244	+
	245	+ // B선라인
	246	+ String blineCode = request.getParameter("blineCode");
	247	+ if (blineCode != null && blineCode.length() != 0){
	248	+ }
	249	+ else {
	250	+ blineCode = "N";
	251	+ }
	252	+ model.addAttribute("blineCode", blineCode);
	253	+
244	254	return "web/login/usrSelectDept";
245	255	}
246	256
...	...	@@ -309,6 +319,15 @@
309	319
310	320	}
311	321
	322	+ // B선라인
	323	+ String blineCode = request.getParameter("blineCode");
	324	+ if (blineCode != null && blineCode.length() != 0){
	325	+ }
	326	+ else {
	327	+ blineCode = "N";
	328	+ }
	329	+ model.addAttribute("blineCode", blineCode);
	330	+
312	331	return "web/login/usrCheckTerms";
313	332	}
314	333
...	...	@@ -446,6 +465,15 @@
446	465	*/
447	466	model.addAttribute("mberManageVO", mberManageVO);
448	467
	468	+ // B선라인
	469	+ String blineCode = request.getParameter("blineCode");
	470	+ if (blineCode != null && blineCode.length() != 0){
	471	+ }
	472	+ else {
	473	+ blineCode = "N";
	474	+ }
	475	+ model.addAttribute("blineCode", blineCode);
	476	+
449	477	return "web/login/usrInsertView";
450	478	}
451	479

a84ee29

3c147fa

src/main/java/itn/let/uss/umt/service/MberManageVO.java

--- src/main/java/itn/let/uss/umt/service/MberManageVO.java

+++ src/main/java/itn/let/uss/umt/service/MberManageVO.java


 	
 	private String hotlineAgentCode; //회원 전용 전송사 코드 정보
 	
+	private String blineCode;		// B라인코드
+	private String recommendId;		// 추천아이디
+
+	public String getBlineCode() {
+		return blineCode;
+	}
+	public void setBlineCode(String blineCode) {
+		this.blineCode = blineCode;
+	}
+	public String getRecommendId() {
+		return recommendId;
+	}
+	public void setRecommendId(String recommendId) {
+		this.recommendId = recommendId;
+	}
+	
 	public int getTodayStopCnt() {
 		return todayStopCnt;
 	}

a84ee29

3c147fa

src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml

--- src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml


        )
 	</insert>
     
+    <update id="mberManageDAO.updateUserBlineCode" parameterClass="mberVO">
+		UPDATE lettngnrlmber	 
+		SET 
+			BLINE_CODE = #blineCode#
+			, RECOMMEND_ID  = #recommendId#
+			, HOTLINE_AGENT_CODE =
+			CASE
+				WHEN #blineCode# = 'B1' THEN '08'
+				WHEN #blineCode# = 'B2' THEN '09'
+				ELSE '00'
+			END
+		WHERE MBER_ID = #mberId#
+    </update>    
     
     <update id="userManageDAO.updateUserSttusCode" parameterClass="userVO">
 		UPDATE 

a84ee29

3c147fa

src/main/webapp/WEB-INF/jsp/web/login/usrCheckTerms.jsp

--- src/main/webapp/WEB-INF/jsp/web/login/usrCheckTerms.jsp

+++ src/main/webapp/WEB-INF/jsp/web/login/usrCheckTerms.jsp


 	<script src="/js/MJUtill.js"></script>
 	
 	<script type="text/javascript">
+	var blineCode = '${blineCode}';
+	
 	$( document ).ready(function() {
-	var type2 = $(".type2") //필수항목, 광고 상위 체크
-	var type3 = $(".type3") //선택항목 - 광고 수신
+		$("input[name='blineCode']").val(blineCode);
+		
+		var type2 = $(".type2") //필수항목, 광고 상위 체크
+		var type3 = $(".type3") //선택항목 - 광고 수신
 		
 		$(".type2").on('change', function(event){
 			changeCheck();

     	<input type="hidden" name="sexdstnCode" value="" />
     	<input type="hidden" id="certCode" name="certCode" value="" />
     	<input type="hidden" id="idx" name="idx" value="" />
-    	
-    	
+    	<input type="hidden" name="blineCode"  value="" />
 </form>
 <form name="reqKMCISForm" method="post" action="#">
     <input type="hidden" name="tr_cert" id="tr_cert"    value = "${tr_cert}">

a84ee29

3c147fa

src/main/webapp/WEB-INF/jsp/web/login/usrInsertView.jsp

--- src/main/webapp/WEB-INF/jsp/web/login/usrInsertView.jsp

+++ src/main/webapp/WEB-INF/jsp/web/login/usrInsertView.jsp


 	src="https://t1.daumcdn.net/mapjsapi/bundle/postcode/prod/postcode.v2.js"></script>
 
 <script type="text/javascript">
+var blineCode = '${blineCode}';
+
 	$( document ).ready(function(){
+		$("input[name='blineCode']").val(blineCode.toUpperCase());
+		
+		// 추천아이디 Show & Hide		
+		if (blineCode.toUpperCase().lastIndexOf("B") > -1) {
+			$("#recommendIdArea").show();	
+		}
+		else {
+			$("#recommendIdArea").hide();
+		}
+		
 		//이미 가입 된 번호인지 체크 - 오픈 후 주석 풀기
 	       /* $.ajax({
 	           url : "<c:url value='/web/user/login/mblDnCheckAjax.do' />", 

 			alert("주소를 입력해주세요.")
 			return false;
 		}	 */
+		
+		
+		// B라인 가입일경우		
+		if (blineCode.toUpperCase().lastIndexOf("B") > -1) {
+			if(frm.recommendId.value == ''){
+				alert("추천 아이디 또는 이름을 입력해주세요.\n없으시면 없음 입력해주세요."); 
+				return false;
+			}			
+		}
+		
 		
 		//기업회원일 경우
 		if(insertType == 'c'){

 		<input type="hidden" name="managerNm" /> 
 		<input type="hidden" name="taxMngEmail" />
 		<input type="hidden" name="cashMngEmail" /> 
-		<input type="hidden" name="idx" id="idx" value="<c:out value='${mberManageVO.idx}' />"/> 
+		<input type="hidden" name="idx" id="idx" value="<c:out value='${mberManageVO.idx}' />"/>
+		<input type="hidden" name="blineCode"  value="" /> 
 		<double-submit:preventer tokenKey="someKey" />
 		<!-- content 영역 -->
 		<div class="loading_layer">

 										</select>
 									</div>
 								</div>
+								
+								<div class="input_list_item" id="recommendIdArea">
+									<div class="input_left"><span class="essential">*</span>추천 아이디/이름</div>
+									<div class="input_right">
+										<label for="recommendId" class="label">추천 아이디/이름</label>
+										<input type="text" class="list_inputType1" id="recommendId" name="recommendId" value="<c:out value='${mberManageVO.recommendId}' />" maxlength="25" />
+									</div>
+								</div>
+																
 								<!-- 22.05.11 주소 삭제 -->
 								<!-- <div class="input_list_item input_list_adres">
 								<%-- 주소 영역 삭제 --%>

a84ee29

3c147fa

src/main/webapp/WEB-INF/jsp/web/login/usrSelectDept.jsp

--- src/main/webapp/WEB-INF/jsp/web/login/usrSelectDept.jsp

+++ src/main/webapp/WEB-INF/jsp/web/login/usrSelectDept.jsp


     <script src="/publish/js/content.js"></script>
 	<script src="/publish/js/popup.js"></script>
 	<script type="text/javascript">
+	var blineCode = '${blineCode}';
 	
 	function goCheckTerms(dept) {
-	        
 	        $("input[name='dept']").val(dept);
+	        $("input[name='blineCode']").val(blineCode);
 	        document.deptForm.action="<c:url value='/web/user/login/checkTerms.do' />";
 	        document.deptForm.submit();
 	}

 <body>
 	<form id="deptForm" name="deptForm" method="post">
 	<input type="hidden" name="dept"  value="" />
+	<input type="hidden" name="blineCode"  value="" />
+	
 	    <!-- content 영역 -->
 	        <div class="inner">
 	            <div class="memberIn">

a84ee29

3c147fa

src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp

--- src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp

+++ src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp


 
 $(document).ready(function() {
 	// http => https 로 이동
-	httpsRedirect();
+	//httpsRedirect();
      
 	// 슬라이드 이미지 변경
 	//setMainSlideImgChange();

...	...	@@ -491,6 +491,22 @@
491	491
492	492	private String hotlineAgentCode; //회원 전용 전송사 코드 정보
493	493
	494	+ private String blineCode; // B라인코드
	495	+ private String recommendId; // 추천아이디
	496	+
	497	+ public String getBlineCode() {
	498	+ return blineCode;
	499	+ }
	500	+ public void setBlineCode(String blineCode) {
	501	+ this.blineCode = blineCode;
	502	+ }
	503	+ public String getRecommendId() {
	504	+ return recommendId;
	505	+ }
	506	+ public void setRecommendId(String recommendId) {
	507	+ this.recommendId = recommendId;
	508	+ }
	509	+
494	510	public int getTodayStopCnt() {
495	511	return todayStopCnt;
496	512	}

...	...	@@ -986,6 +986,19 @@
986	986	)
987	987	</insert>
988	988
	989	+ <update id="mberManageDAO.updateUserBlineCode" parameterClass="mberVO">
	990	+ UPDATE lettngnrlmber
	991	+ SET
	992	+ BLINE_CODE = #blineCode#
	993	+ , RECOMMEND_ID = #recommendId#
	994	+ , HOTLINE_AGENT_CODE =
	995	+ CASE
	996	+ WHEN #blineCode# = 'B1' THEN '08'
	997	+ WHEN #blineCode# = 'B2' THEN '09'
	998	+ ELSE '00'
	999	+ END
	1000	+ WHERE MBER_ID = #mberId#
	1001	+ </update>
989	1002
990	1003	<update id="userManageDAO.updateUserSttusCode" parameterClass="userVO">
991	1004	UPDATE

...	...	@@ -236,7 +236,12 @@
236	236	int resultUsr = mberManageDAO.insertMber(mberManageVO);
237	237	//강제로 일반사용자 권한 등록(USER회원의 승인처리) ( kerinet : 2018-05-17 )
238	238
239		- // 페스워드 히스토리 등록
	239	+ // BlineCode 업데이트
	240	+ if (null != mberManageVO.getBlineCode() && !mberManageVO.getBlineCode().equals("N")) {
	241	+ mberManageDAO.updateUserBlineCode(mberManageVO);
	242	+ }
	243	+
	244	+ // 패스워드 히스토리 등록
240	245	mberManageDAO.insertMberPWLog(mberManageVO);
241	246
242	247	if(resultUsr > 0) {

...	...	@@ -56,6 +56,10 @@
56	56	return (int)update("mberManageDAO.insertMber", vo);
57	57	}
58	58
	59	+ public int updateUserBlineCode(MberManageVO vo) {
	60	+ return (int)update("mberManageDAO.updateUserBlineCode", vo);
	61	+ }
	62	+
59	63	// 이메일 발송용 정상회원 전체목록
60	64	@SuppressWarnings("unchecked")
61	65	public List<MberManageVO> selectEmailSendMberList(UserDefaultVO userSearchVO){

...	...	@@ -22,9 +22,13 @@
22	22	<script src="/js/MJUtill.js"></script>
23	23
24	24	<script type="text/javascript">
	25	+ var blineCode = '${blineCode}';
	26	+
25	27	$( document ).ready(function() {
26		- var type2 = $(".type2") //필수항목, 광고 상위 체크
27		- var type3 = $(".type3") //선택항목 - 광고 수신
	28	+ $("input[name='blineCode']").val(blineCode);
	29	+
	30	+ var type2 = $(".type2") //필수항목, 광고 상위 체크
	31	+ var type3 = $(".type3") //선택항목 - 광고 수신
28	32
29	33	$(".type2").on('change', function(event){
30	34	changeCheck();
...	...	@@ -628,8 +632,7 @@
628	632	<input type="hidden" name="sexdstnCode" value="" />
629	633	<input type="hidden" id="certCode" name="certCode" value="" />
630	634	<input type="hidden" id="idx" name="idx" value="" />
631		-
632		-
	635	+ <input type="hidden" name="blineCode" value="" />
633	636	</form>
634	637	<form name="reqKMCISForm" method="post" action="#">
635	638	<input type="hidden" name="tr_cert" id="tr_cert" value = "${tr_cert}">

...	...	@@ -24,7 +24,19 @@
24	24	src="https://t1.daumcdn.net/mapjsapi/bundle/postcode/prod/postcode.v2.js"></script>
25	25
26	26	<script type="text/javascript">
	27	+var blineCode = '${blineCode}';
	28	+
27	29	$( document ).ready(function(){
	30	+ $("input[name='blineCode']").val(blineCode.toUpperCase());
	31	+
	32	+ // 추천아이디 Show & Hide
	33	+ if (blineCode.toUpperCase().lastIndexOf("B") > -1) {
	34	+ $("#recommendIdArea").show();
	35	+ }
	36	+ else {
	37	+ $("#recommendIdArea").hide();
	38	+ }
	39	+
28	40	//이미 가입 된 번호인지 체크 - 오픈 후 주석 풀기
29	41	/* $.ajax({
30	42	url : "<c:url value='/web/user/login/mblDnCheckAjax.do' />",
...	...	@@ -351,6 +363,16 @@
351	363	alert("주소를 입력해주세요.")
352	364	return false;
353	365	} */
	366	+
	367	+
	368	+ // B라인 가입일경우
	369	+ if (blineCode.toUpperCase().lastIndexOf("B") > -1) {
	370	+ if(frm.recommendId.value == ''){
	371	+ alert("추천 아이디 또는 이름을 입력해주세요.\n없으시면 없음 입력해주세요.");
	372	+ return false;
	373	+ }
	374	+ }
	375	+
354	376
355	377	//기업회원일 경우
356	378	if(insertType == 'c'){
...	...	@@ -695,7 +717,8 @@
695	717	<input type="hidden" name="managerNm" />
696	718	<input type="hidden" name="taxMngEmail" />
697	719	<input type="hidden" name="cashMngEmail" />
698		- <input type="hidden" name="idx" id="idx" value="<c:out value='${mberManageVO.idx}' />"/>
	720	+ <input type="hidden" name="idx" id="idx" value="<c:out value='${mberManageVO.idx}' />"/>
	721	+ <input type="hidden" name="blineCode" value="" />
699	722	<double-submit:preventer tokenKey="someKey" />
700	723	<!-- content 영역 -->
701	724	<div class="loading_layer">
...	...	@@ -865,6 +888,15 @@
865	888	</select>
866	889	</div>
867	890	</div>
	891	+
	892	+ <div class="input_list_item" id="recommendIdArea">
	893	+ <div class="input_left"><span class="essential">*</span>추천 아이디/이름</div>
	894	+ <div class="input_right">
	895	+ <label for="recommendId" class="label">추천 아이디/이름</label>
	896	+ <input type="text" class="list_inputType1" id="recommendId" name="recommendId" value="<c:out value='${mberManageVO.recommendId}' />" maxlength="25" />
	897	+ </div>
	898	+ </div>
	899	+
868	900	<!-- 22.05.11 주소 삭제 -->
869	901	<!-- <div class="input_list_item input_list_adres">
870	902	<%-- 주소 영역 삭제 --%>

...	...	@@ -13,10 +13,11 @@
13	13	<script src="/publish/js/content.js"></script>
14	14	<script src="/publish/js/popup.js"></script>
15	15	<script type="text/javascript">
	16	+ var blineCode = '${blineCode}';
16	17
17	18	function goCheckTerms(dept) {
18		-
19	19	$("input[name='dept']").val(dept);
	20	+ $("input[name='blineCode']").val(blineCode);
20	21	document.deptForm.action="<c:url value='/web/user/login/checkTerms.do' />";
21	22	document.deptForm.submit();
22	23	}
...	...	@@ -27,6 +28,8 @@
27	28	<body>
28	29	<form id="deptForm" name="deptForm" method="post">
29	30	<input type="hidden" name="dept" value="" />
	31	+ <input type="hidden" name="blineCode" value="" />
	32	+
30	33	<!-- content 영역 -->
31	34	<div class="inner">
32	35	<div class="memberIn">

...	...	@@ -14,7 +14,7 @@
14	14
15	15	$(document).ready(function() {
16	16	// http => https 로 이동
17		- httpsRedirect();
	17	+ //httpsRedirect();
18	18
19	19	// 슬라이드 이미지 변경
20	20	//setMainSlideImgChange();

Delete comment