Commit @26e32878a4798b5e3b447592f268479bfe60e7e3

5e345ca

26e3287

src/main/java/itn/let/mjo/msgagent/service/MjonMsgAgentStsService.java

--- src/main/java/itn/let/mjo/msgagent/service/MjonMsgAgentStsService.java

+++ src/main/java/itn/let/mjo/msgagent/service/MjonMsgAgentStsService.java


 	// 문자타입별 최저/최고 단가
 	public MjonMsgAgentStsVO selectMjonMsgAgentMinMaxInfo(MjonMsgAgentStsVO mjonMsgAgentStsVO) throws Exception;
 	
+	
+	// 전송사 B선 여부 조회
+	public MjonMsgAgentStsVO selectMsgAgentBlineYnInfo(MjonMsgAgentStsVO mjonMsgAgentStsVO) throws Exception;
+	
 	//전송사 상태 정보 수정
 	public int updateMjonMsgAgentStsData(MjonMsgAgentStsVO mjonMsgAgentStsVO) throws Exception;
 

5e345ca

26e3287

src/main/java/itn/let/mjo/msgagent/service/MjonMsgAgentStsVO.java

--- src/main/java/itn/let/mjo/msgagent/service/MjonMsgAgentStsVO.java

+++ src/main/java/itn/let/mjo/msgagent/service/MjonMsgAgentStsVO.java


 	
 	private String selectAgentCode ; 
 	private String searchUseYn ; 
+	private String blineYn;
 	
+	public String getBlineYn() {
+		return blineYn;
+	}
+	public void setBlineYn(String blineYn) {
+		this.blineYn = blineYn;
+	}
 	public double getMinPrice() {
 		return minPrice;
 	}

5e345ca

26e3287

src/main/java/itn/let/mjo/msgagent/service/impl/MjonMsgAgentStsDAO.java

--- src/main/java/itn/let/mjo/msgagent/service/impl/MjonMsgAgentStsDAO.java

+++ src/main/java/itn/let/mjo/msgagent/service/impl/MjonMsgAgentStsDAO.java


 		return  (MjonMsgAgentStsVO) select("mjonMsgAgentStsDAO.selectMjonMsgAgentMinMaxInfo", mjonMsgAgentStsVO);
 	}
 	
+	// 전송사 B선 여부 조회
+	public MjonMsgAgentStsVO selectMsgAgentBlineYnInfo(MjonMsgAgentStsVO mjonMsgAgentStsVO) throws Exception{
+		return  (MjonMsgAgentStsVO) select("mjonMsgAgentStsDAO.selectMsgAgentBlineYnInfo", mjonMsgAgentStsVO);
+	}
+	
 	//전송사 상태 정보 수정
 	public int updateMjonMsgAgentStsData(MjonMsgAgentStsVO mjonMsgAgentStsVO) throws Exception{
 		return update("mjonMsgAgentStsDAO.updateMjonMsgAgentStsData", mjonMsgAgentStsVO);

5e345ca

26e3287

src/main/java/itn/let/mjo/msgagent/service/impl/MjonMsgAgentStsServiceImpl.java

--- src/main/java/itn/let/mjo/msgagent/service/impl/MjonMsgAgentStsServiceImpl.java

+++ src/main/java/itn/let/mjo/msgagent/service/impl/MjonMsgAgentStsServiceImpl.java


 import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
 import itn.let.mjo.msgagent.service.MjonMsgAgentStsService;
 import itn.let.mjo.msgagent.service.MjonMsgAgentStsVO;
+import itn.let.uat.uia.service.impl.MberManageDAO;
 import itn.let.uss.umt.service.MberManageVO;
 
 @Service("mjonMsgAgentStsService")

 
 	@Resource(name="mjonMsgAgentStsDAO")
 	private MjonMsgAgentStsDAO mjonMsgAgentStsDAO;
+	
+	/** mberManageDAO */
+	@Resource(name="mberManageDAO")
+	private MberManageDAO mberManageDAO;
+	
+	@Resource(name = "mjonMsgAgentStsService")
+	private MjonMsgAgentStsService mjonMsgAgentStsService;	
 	
 	@Override
 	public List<MjonMsgAgentStsVO> selectMjonMsgAgentStsList() throws Exception{

 	@Override
 	public MjonMsgAgentStsVO selectMjonMsgAgentMinMaxInfo(MjonMsgAgentStsVO mjonMsgAgentStsVO) throws Exception{
 		return mjonMsgAgentStsDAO.selectMjonMsgAgentMinMaxInfo(mjonMsgAgentStsVO);
+	}
+	
+	
+	// 전송사 B선 여부 조회
+	@Override
+	public MjonMsgAgentStsVO selectMsgAgentBlineYnInfo(MjonMsgAgentStsVO mjonMsgAgentStsVO) throws Exception{
+		return mjonMsgAgentStsDAO.selectMsgAgentBlineYnInfo(mjonMsgAgentStsVO);
 	}
 	
 	//전송사 상태 정보 수정

 			
 			result = mjonMsgAgentStsDAO.updateMberHotlineAgentCodeInfo(mberManageVO);
 			
+			// B선라인 일경우 회원테이블 업데이트
+			int uCnt = mberManageDAO.updateUserBlineCodeByAdm(mberManageVO);
+			
 		} catch (Exception e) {
 			System.out.println("+++++++++++ updateMberHotlineAgentCodeInfo Service Imple Error!!! " + e);
 		}

5e345ca

26e3287

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

5e345ca

26e3287

src/main/resources/egovframework/sqlmap/let/agent/MjonAgent_SQL_mysql.xml

--- src/main/resources/egovframework/sqlmap/let/agent/MjonAgent_SQL_mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/agent/MjonAgent_SQL_mysql.xml


 		LIMIT 1	
 	</select>	
 	
+	<select id="mjonMsgAgentStsDAO.selectMsgAgentBlineYnInfo" parameterClass="mjonMsgAgentStsVO" resultClass="mjonMsgAgentStsVO">
+		SELECT BLINE_YN blineYn FROM MJ_AGENT_SEND_RATE 
+		WHERE AGENT_CODE = #agentCode#
+		AND MSG_TYPE = 'S'
+		ORDER BY BLINE_YN DESC
+		LIMIT 1
+	</select>	
+		
 	<select id="mjonMsgAgentStsDAO.selectMjonMsgAgentStsData" parameterClass="mjonMsgAgentStsVO" resultClass="int">
 		SELECT
 			COUNT(*)

5e345ca

26e3287

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

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

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


 			, prePaymentYn
 			, smishingYn
 			, vipYn
+			, blineCode
+			, recommendId			
 			, DATE_FORMAT(sbscrbDe, '%Y-%m-%d %H:%i') sbscrbDe
 			, DATE_FORMAT(expirePnttm, '%Y-%m-%d %H:%i') expirePnttm
 			, DATE_FORMAT(mberSttusUptPnttm, '%Y-%m-%d %H:%i') mberSttusUptPnttm

 				, PRE_PAYMENT_YN 	prePaymentYn
 				, SMISHING_YN		smishingYn
 				, VIP_YN		vipYn
+				, BLINE_CODE	blineCode
+				, RECOMMEND_ID	recommendId
 				, EXPIRE_PNTTM expirePnttm
 				, MBER_STTUS_UPT_PNTTM mberSttusUptPnttm
 				, ADMIN_SMS_NOTICE_YN AS adminSmsNoticeYn

 			        </isEqual>	          				 		        
 	 		        <isEqual prepend="AND" property="mberSttus" compareValue="VX">
 	 					mberSttus = 'Y' AND vipYn != 'Y'
-			        </isEqual>	          				 		        			        
+			        </isEqual>	          				 		        
+	 		        <isEqual prepend="AND" property="mberSttus" compareValue="BLINE">
+	 					blineCode != 'N'
+			        </isEqual>	          				 		        			        			        
 	  			</isNotEmpty>	
 	     	    <isEmpty prepend="AND" property="mberSttus">
 	  				 ( mberSttus = 'Y' OR mberSttus = 'B' OR vipYn = 'Y')

5e345ca

26e3287

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


 		WHERE MBER_ID = #mberId#
     </update>    
     
+    <update id="mberManageDAO.updateUserBlineCodeByAdm" parameterClass="mberVO">
+		UPDATE lettngnrlmber	 
+		SET 
+			BLINE_CODE =
+			CASE
+				WHEN #hotlineAgentCode# = '08' THEN 'B1'
+				WHEN #hotlineAgentCode# = '09' THEN 'B2'
+				ELSE 'N'
+			END
+		WHERE MBER_ID = #mberId#
+    </update>    
+
+    
     <update id="userManageDAO.updateUserSttusCode" parameterClass="userVO">
 		UPDATE 
 			LETTNEMPLYRINFO 

5e345ca

26e3287

src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserManage.jsp

--- src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserManage.jsp

+++ src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserManage.jsp


                     <option value="Y" <c:if test="${userSearchVO.mberSttus == 'Y'}">selected="selected"</c:if> >일반(VIP포함)</option>
                     <option value="B" <c:if test="${userSearchVO.mberSttus == 'B'}">selected="selected"</c:if> >이용 정지</option>
 					<option value="V" <c:if test="${userSearchVO.mberSttus == 'V'}">selected="selected"</c:if> >VIP</option>
+					<option value="BLINE" <c:if test="${userSearchVO.mberSttus == 'BLINE'}">selected="selected"</c:if> >BLINE</option>
 					<option value="VX" <c:if test="${userSearchVO.mberSttus == 'VX'}">selected="selected"</c:if> >일반(VIP제외)</option>                    
 	            </select>	            
 	            

...	...	@@ -20,6 +20,10 @@
20	20	// 문자타입별 최저/최고 단가
21	21	public MjonMsgAgentStsVO selectMjonMsgAgentMinMaxInfo(MjonMsgAgentStsVO mjonMsgAgentStsVO) throws Exception;
22	22
	23	+
	24	+ // 전송사 B선 여부 조회
	25	+ public MjonMsgAgentStsVO selectMsgAgentBlineYnInfo(MjonMsgAgentStsVO mjonMsgAgentStsVO) throws Exception;
	26	+
23	27	//전송사 상태 정보 수정
24	28	public int updateMjonMsgAgentStsData(MjonMsgAgentStsVO mjonMsgAgentStsVO) throws Exception;
25	29

...	...	@@ -31,7 +31,14 @@
31	31
32	32	private String selectAgentCode ;
33	33	private String searchUseYn ;
	34	+ private String blineYn;
34	35
	36	+ public String getBlineYn() {
	37	+ return blineYn;
	38	+ }
	39	+ public void setBlineYn(String blineYn) {
	40	+ this.blineYn = blineYn;
	41	+ }
35	42	public double getMinPrice() {
36	43	return minPrice;
37	44	}

...	...	@@ -35,6 +35,11 @@
35	35	return (MjonMsgAgentStsVO) select("mjonMsgAgentStsDAO.selectMjonMsgAgentMinMaxInfo", mjonMsgAgentStsVO);
36	36	}
37	37
	38	+ // 전송사 B선 여부 조회
	39	+ public MjonMsgAgentStsVO selectMsgAgentBlineYnInfo(MjonMsgAgentStsVO mjonMsgAgentStsVO) throws Exception{
	40	+ return (MjonMsgAgentStsVO) select("mjonMsgAgentStsDAO.selectMsgAgentBlineYnInfo", mjonMsgAgentStsVO);
	41	+ }
	42	+
38	43	//전송사 상태 정보 수정
39	44	public int updateMjonMsgAgentStsData(MjonMsgAgentStsVO mjonMsgAgentStsVO) throws Exception{
40	45	return update("mjonMsgAgentStsDAO.updateMjonMsgAgentStsData", mjonMsgAgentStsVO);

...	...	@@ -10,6 +10,7 @@
10	10	import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
11	11	import itn.let.mjo.msgagent.service.MjonMsgAgentStsService;
12	12	import itn.let.mjo.msgagent.service.MjonMsgAgentStsVO;
	13	+import itn.let.uat.uia.service.impl.MberManageDAO;
13	14	import itn.let.uss.umt.service.MberManageVO;
14	15
15	16	@Service("mjonMsgAgentStsService")
...	...	@@ -17,6 +18,13 @@
17	18
18	19	@Resource(name="mjonMsgAgentStsDAO")
19	20	private MjonMsgAgentStsDAO mjonMsgAgentStsDAO;
	21	+
	22	+ /** mberManageDAO */
	23	+ @Resource(name="mberManageDAO")
	24	+ private MberManageDAO mberManageDAO;
	25	+
	26	+ @Resource(name = "mjonMsgAgentStsService")
	27	+ private MjonMsgAgentStsService mjonMsgAgentStsService;
20	28
21	29	@Override
22	30	public List<MjonMsgAgentStsVO> selectMjonMsgAgentStsList() throws Exception{
...	...	@@ -42,6 +50,13 @@
42	50	@Override
43	51	public MjonMsgAgentStsVO selectMjonMsgAgentMinMaxInfo(MjonMsgAgentStsVO mjonMsgAgentStsVO) throws Exception{
44	52	return mjonMsgAgentStsDAO.selectMjonMsgAgentMinMaxInfo(mjonMsgAgentStsVO);
	53	+ }
	54	+
	55	+
	56	+ // 전송사 B선 여부 조회
	57	+ @Override
	58	+ public MjonMsgAgentStsVO selectMsgAgentBlineYnInfo(MjonMsgAgentStsVO mjonMsgAgentStsVO) throws Exception{
	59	+ return mjonMsgAgentStsDAO.selectMsgAgentBlineYnInfo(mjonMsgAgentStsVO);
45	60	}
46	61
47	62	//전송사 상태 정보 수정
...	...	@@ -156,6 +171,9 @@
156	171
157	172	result = mjonMsgAgentStsDAO.updateMberHotlineAgentCodeInfo(mberManageVO);
158	173
	174	+ // B선라인 일경우 회원테이블 업데이트
	175	+ int uCnt = mberManageDAO.updateUserBlineCodeByAdm(mberManageVO);
	176	+
159	177	} catch (Exception e) {
160	178	System.out.println("+++++++++++ updateMberHotlineAgentCodeInfo Service Imple Error!!! " + e);
161	179	}

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

...	...	@@ -72,6 +72,14 @@
72	72	LIMIT 1
73	73	</select>
74	74
	75	+ <select id="mjonMsgAgentStsDAO.selectMsgAgentBlineYnInfo" parameterClass="mjonMsgAgentStsVO" resultClass="mjonMsgAgentStsVO">
	76	+ SELECT BLINE_YN blineYn FROM MJ_AGENT_SEND_RATE
	77	+ WHERE AGENT_CODE = #agentCode#
	78	+ AND MSG_TYPE = 'S'
	79	+ ORDER BY BLINE_YN DESC
	80	+ LIMIT 1
	81	+ </select>
	82	+
75	83	<select id="mjonMsgAgentStsDAO.selectMjonMsgAgentStsData" parameterClass="mjonMsgAgentStsVO" resultClass="int">
76	84	SELECT
77	85	COUNT(*)

...	...	@@ -372,6 +372,8 @@
372	372	, prePaymentYn
373	373	, smishingYn
374	374	, vipYn
	375	+ , blineCode
	376	+ , recommendId
375	377	, DATE_FORMAT(sbscrbDe, '%Y-%m-%d %H:%i') sbscrbDe
376	378	, DATE_FORMAT(expirePnttm, '%Y-%m-%d %H:%i') expirePnttm
377	379	, DATE_FORMAT(mberSttusUptPnttm, '%Y-%m-%d %H:%i') mberSttusUptPnttm
...	...	@@ -411,6 +413,8 @@
411	413	, PRE_PAYMENT_YN prePaymentYn
412	414	, SMISHING_YN smishingYn
413	415	, VIP_YN vipYn
	416	+ , BLINE_CODE blineCode
	417	+ , RECOMMEND_ID recommendId
414	418	, EXPIRE_PNTTM expirePnttm
415	419	, MBER_STTUS_UPT_PNTTM mberSttusUptPnttm
416	420	, ADMIN_SMS_NOTICE_YN AS adminSmsNoticeYn
...	...	@@ -502,7 +506,10 @@
502	506	</isEqual>
503	507	<isEqual prepend="AND" property="mberSttus" compareValue="VX">
504	508	mberSttus = 'Y' AND vipYn != 'Y'
505		- </isEqual>
	509	+ </isEqual>
	510	+ <isEqual prepend="AND" property="mberSttus" compareValue="BLINE">
	511	+ blineCode != 'N'
	512	+ </isEqual>
506	513	</isNotEmpty>
507	514	<isEmpty prepend="AND" property="mberSttus">
508	515	( mberSttus = 'Y' OR mberSttus = 'B' OR vipYn = 'Y')

...	...	@@ -1000,6 +1000,19 @@
1000	1000	WHERE MBER_ID = #mberId#
1001	1001	</update>
1002	1002
	1003	+ <update id="mberManageDAO.updateUserBlineCodeByAdm" parameterClass="mberVO">
	1004	+ UPDATE lettngnrlmber
	1005	+ SET
	1006	+ BLINE_CODE =
	1007	+ CASE
	1008	+ WHEN #hotlineAgentCode# = '08' THEN 'B1'
	1009	+ WHEN #hotlineAgentCode# = '09' THEN 'B2'
	1010	+ ELSE 'N'
	1011	+ END
	1012	+ WHERE MBER_ID = #mberId#
	1013	+ </update>
	1014	+
	1015	+
1003	1016	<update id="userManageDAO.updateUserSttusCode" parameterClass="userVO">
1004	1017	UPDATE
1005	1018	LETTNEMPLYRINFO

...	...	@@ -388,6 +388,7 @@
388	388	<option value="Y" <c:if test="${userSearchVO.mberSttus == 'Y'}">selected="selected"</c:if> >일반(VIP포함)</option>
389	389	<option value="B" <c:if test="${userSearchVO.mberSttus == 'B'}">selected="selected"</c:if> >이용 정지</option>
390	390	<option value="V" <c:if test="${userSearchVO.mberSttus == 'V'}">selected="selected"</c:if> >VIP</option>
	391	+ <option value="BLINE" <c:if test="${userSearchVO.mberSttus == 'BLINE'}">selected="selected"</c:if> >BLINE</option>
391	392	<option value="VX" <c:if test="${userSearchVO.mberSttus == 'VX'}">selected="selected"</c:if> >일반(VIP제외)</option>
392	393	</select>
393	394

Delete comment