Commit @e73d58857d530d47267c495639b941c00d7db86d

itn 2023-07-25

등급제 계산기간 관련 로직 수정

@e73d58857d530d47267c495639b941c00d7db86d

ccb1dea

e73d588

src/main/java/itn/let/sym/grd/service/MberGrdService.java

--- src/main/java/itn/let/sym/grd/service/MberGrdService.java

+++ src/main/java/itn/let/sym/grd/service/MberGrdService.java


 	// 회원별 등급 수정
 	public void updateMberGrd(MberGrdVO mberGrdVO)  throws Exception;		
 	
+	// 회원별 등급 등록 All => 기존대상자 제외
+	public void insertMberGrdAllByExist(MberGrdVO mberGrdVO)  throws Exception;
+	
 	// 회원별 등급 일괄변경
 	public int updateMberGrdAll(MberGrdVO mberGrdVO) throws Exception;
 	
 	// 회원 등급 변경(환불후) => 기존등급 상관없이 업데이트
 	public int updateMberGrdAfterRefund(MberGrdVO mberGrdVO) throws Exception;
 	
-	// 문자할인, B선라인 대상자 초기화
+	// 문자할인, B선라인 대상자 종료
 	public int updateMberGrdEndBySale(MberGrdVO mberGrdVO) throws Exception;
 	
-	// 전체회원 등급 초기화
+	// 전체회원 등급 종료
 	public int updateMberGrdEndAll(MberGrdVO mberGrdVO) throws Exception;
 
 	// 회원 등급제 종료

 	// 회원별 등급 적용
 	public void mberGrdSaveByUser(MberGrdVO mberGrdVO) throws Exception;
 	
+	// 회원별 등급제 대상여부
+	int selectMberGrdCnt(String mberId) throws Exception;
+	
 	// 회원별 등급 진행여부
 	int selectMberGrdPrgCnt(String mberId) throws Exception;
 	

ccb1dea

e73d588

src/main/java/itn/let/sym/grd/service/MberGrdVO.java

--- src/main/java/itn/let/sym/grd/service/MberGrdVO.java

+++ src/main/java/itn/let/sym/grd/service/MberGrdVO.java


 	private int mberGrdHistNo;
 
 	private String grdNoti;			// 회원등급제 시행 여부
-	private String grdDate;			// 회원등급제 시행일자
-	private String grdDatePrgYn;	// 회원등급제 시행일자 진행여부(오늘보다 이전날짜이면 Y, 이후이면 N)
+	private String grdDate;			// 회원등급제 시작일자
+	private String grdPeriodDate;	// 오늘날짜 - 누적결제 계산기간 = 계산기간 시작일자  
+	private String grdNewDate;		// 시작일자, 계산기간 시작일자 중 최근날짜
+	private String grdDatePrgYn;	// 회원등급제 시작일자 진행여부(오늘보다 이전날짜이면 Y, 이후이면 N)
+	private String grdPeriod;		// 회원등급제 누적결제 계산기간
 	
 	// 검색필터
 	private String searchGrdStatus;

 	public void setGrdDate(String grdDate) {
 		this.grdDate = grdDate;
 	}	
+	public String getGrdPeriodDate() {
+		return grdPeriodDate;
+	}
+	public void setGrdPeriodDate(String grdPeriodDate) {
+		this.grdPeriodDate = grdPeriodDate;
+	}
+	public String getGrdNewDate() {
+		return grdNewDate;
+	}
+	public void setGrdNewDate(String grdNewDate) {
+		this.grdNewDate = grdNewDate;
+	}	
 	public String getGrdDatePrgYn() {
 		return grdDatePrgYn;
 	}
 	public void setGrdDatePrgYn(String grdDatePrgYn) {
 		this.grdDatePrgYn = grdDatePrgYn;
 	}	
+	public String getGrdPeriod() {
+		return grdPeriod;
+	}
+	public void setGrdPeriod(String grdPeriod) {
+		this.grdPeriod = grdPeriod;
+	}	
 	public String getSearchGrdStatus() {
 		return searchGrdStatus;
 	}

ccb1dea

e73d588

src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java

--- src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java

+++ src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java


 	public void updateMberGrd(MberGrdVO mberGrdVO) throws Exception{
 		update("mberGrdDAO.updateMberGrd", mberGrdVO);
 	}	
+
+	// 회원별 등급 등록 All => 기존대상자 제외
+	public void insertMberGrdAllByExist(MberGrdVO mberGrdVO) throws Exception{
+		insert("mberGrdDAO.insertMberGrdAllByExist", mberGrdVO);
+	}
 	
 	// 회원별 등급 일괄변경
 	public int updateMberGrdAll(MberGrdVO mberGrdVO) throws Exception {

 		return update("mberGrdDAO.updateMberGrdAfterRefund", mberGrdVO);
 	}
 	
-	// 문자할인, B선라인 대상자 초기화
+	// 문자할인, B선라인 대상자 종료
 	public int updateMberGrdEndBySale(MberGrdVO mberGrdVO) throws Exception {
 		return update("mberGrdDAO.updateMberGrdEndBySale", mberGrdVO);
 	}		
 	
-	// 전체회원 등급 초기화
+	// 전체회원 등급 종료
 	public int updateMberGrdEndAll(MberGrdVO mberGrdVO) throws Exception {
 		return update("mberGrdDAO.updateMberGrdEndAll", mberGrdVO);
 	}		

 		return update("mberGrdDAO.updateMberGrdRestoreByUser", mberGrdVO);
 	}		
 	
+	// 회원별 등급제 대상여부
+	public int selectMberGrdCnt(String mberId) throws Exception{
+		return (int) select("mberGrdDAO.selectMberGrdCnt", mberId);
+	}	
+	
 	// 회원별 등급 진행여부
 	public int selectMberGrdPrgCnt(String mberId) throws Exception{
 		return (int) select("mberGrdDAO.selectMberGrdPrgCnt", mberId);

ccb1dea

e73d588

src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java

--- src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java

+++ src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java


 import itn.let.sym.grd.service.MberGrdVO;
 import itn.let.sym.site.service.JoinSettingVO;
 import itn.let.uss.umt.service.EgovMberManageService;
-import itn.let.uss.umt.service.MberManageVO;
 
 @Service("mberGrdService")
 public class MberGrdServiceImpl extends EgovAbstractServiceImpl implements MberGrdService {

 		mberGrdDAO.updateMberGrd(mberGrdVO);
 	}	
 	
+	// 회원별 등급 등록 All => 기존대상자 제외
+	@Override
+	public void insertMberGrdAllByExist(MberGrdVO mberGrdVO) throws Exception {
+		mberGrdDAO.insertMberGrdAllByExist(mberGrdVO);
+	}
+	
 	// 회원별 등급 일괄변경
 	@Override
 	public int updateMberGrdAll(MberGrdVO mberGrdVO) throws Exception {

 		MberGrdVO mberGrdVO1 = new MberGrdVO();
 		mberGrdVO1 = selectMberSettingDetail(mberGrdVO);
 		if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) {
-			// 문자할인, B선라인 대상자 초기화
+			mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate());
+			
+			// 대상자 추가
+			insertMberGrdAllByExist(mberGrdVO);
+			
+			// 문자할인, B선라인, 스팸회원 대상자 종료
 			updateCnt1 = updateMberGrdEndBySale(mberGrdVO);
+			
+			// 등급제 정상대상자 초기화(화이트등급) 
 			
 			// 회원별 등급 일괄변경
 			updateCnt2 = mberGrdDAO.updateMberGrdAll(mberGrdVO);

 		return mberGrdDAO.updateMberGrdAfterRefund(mberGrdVO);
 	}	
 
-	// 문자할인, B선라인 대상자 초기화
+	// 문자할인, B선라인 대상자 종료
 	@Override
 	public int updateMberGrdEndBySale(MberGrdVO mberGrdVO) throws Exception {
 		return mberGrdDAO.updateMberGrdEndBySale(mberGrdVO);
 	}	
 
-	// 전체회원 등급 초기화
+	// 전체회원 등급 종료
 	@Override
 	public int updateMberGrdEndAll(MberGrdVO mberGrdVO) throws Exception {
 		return mberGrdDAO.updateMberGrdEndAll(mberGrdVO);

 		MberGrdVO mberGrdVO1 = new MberGrdVO();
 		mberGrdVO1 = selectMberSettingDetail(mberGrdVO);
 		if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) {
-			mberGrdVO.setGrdDate(mberGrdVO1.getGrdDate());
+			mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate());
 			
-			// Step 2. /협의/스팸/비선등급 적용 제외
-			// 문자할인여부(1: 할인, 0: 미할인)
-			int isMsgSalePrice = mjonPayService.selectMsgSalePriceCnt(mberGrdVO.getMberId());
-			if(isMsgSalePrice == 0) {
-				// B선 전송사 이용고객 => 등급제대상 제외처리
-				MberManageVO mberManageVO = new MberManageVO();
-				mberManageVO.setMberId(mberGrdVO.getMberId());
-				String blineCode = mberManageService.selectBlineCodeByMberId(mberManageVO);
-				if (blineCode != null && blineCode.equals("N")) {		
+			// Step 2. 문자할인, B선라인, 스팸회원 대상자 제외
+			int isMberGrd = selectMberGrdCnt(mberGrdVO.getMberId());	// 등급제 대상여부(1: 대상, 0: 미대상)
+			if(isMberGrd == 1) {
+				// Step 3. 누적결제금액(이벤트금액 제외) 추출 및 등급 조회
+				MberGrdVO mberGrdVO3 = new MberGrdVO();				
+				mberGrdVO3 = selectMberGrdAmtDetail(mberGrdVO);
+				if (null != mberGrdVO3) {
+					mberGrdVO.setTotAmt(mberGrdVO3.getTotAmt());
+					mberGrdVO.setGrdSetNo(mberGrdVO3.getGrdSetNo());
 					
-					// Step 3. 누적결제금액(이벤트금액 제외) 추출 및 등급 조회
-					MberGrdVO mberGrdVO3 = new MberGrdVO();				
-					mberGrdVO3 = selectMberGrdAmtDetail(mberGrdVO);
-					if (null != mberGrdVO3) {
-						mberGrdVO.setTotAmt(mberGrdVO3.getTotAmt());
-						mberGrdVO.setGrdSetNo(mberGrdVO3.getGrdSetNo());
-						
-						// Step 4. 등급제 설정값 조회
-						MberGrdVO mberGrdVO4 = new MberGrdVO();
-						mberGrdVO4 = selectMberGrdSettingDetail(mberGrdVO);
-						if (null != mberGrdVO4) {
-							mberGrdVO.setAmt(mberGrdVO.getAmt());
-					    	mberGrdVO.setTotAmt(mberGrdVO.getTotAmt());
-					    	mberGrdVO.setShortPrice(mberGrdVO4.getShortPrice());
-					    	mberGrdVO.setLongPrice(mberGrdVO4.getLongPrice());
-					    	mberGrdVO.setPicturePrice(mberGrdVO4.getPicturePrice());
-					    	mberGrdVO.setPicture2Price(mberGrdVO4.getPicture2Price());
-					    	mberGrdVO.setPicture3Price(mberGrdVO4.getPicture3Price());
-					    	mberGrdVO.setGrdDate(mberGrdVO.getGrdDate());
-					    	mberGrdVO.setGrdStartDate(nowDate + " 00:00:00");
-					    	mberGrdVO.setGrdEndDate("9999:12:31 23:59:59");
-					    	mberGrdVO.setGrdStatus("Y");
-					    	
-							// Step 5. 인서트 Or 업데이트
-							MberGrdVO mberGrdVO5 = new MberGrdVO();
-							mberGrdVO5 = selectMberGrdDetail(mberGrdVO);
-							if (null != mberGrdVO5) {
-								// 업데이트 => 기존등급보다 상위등급 대상만 업데이트
-								if (mberGrdVO5.getGrdSetNo() > mberGrdVO.getGrdSetNo()) {
-									updateMberGrd(mberGrdVO);
-									
-									// 회원별 등급 히스토리 인서트
-									insertMberGrdHist(mberGrdVO);							
-								}
-							}
-							else {
-								// 인서트
-								insertMberGrd(mberGrdVO);
+					// Step 4. 등급제 설정값 조회
+					MberGrdVO mberGrdVO4 = new MberGrdVO();
+					mberGrdVO4 = selectMberGrdSettingDetail(mberGrdVO);
+					if (null != mberGrdVO4) {
+						mberGrdVO.setAmt(mberGrdVO.getAmt());
+				    	mberGrdVO.setTotAmt(mberGrdVO.getTotAmt());
+				    	mberGrdVO.setShortPrice(mberGrdVO4.getShortPrice());
+				    	mberGrdVO.setLongPrice(mberGrdVO4.getLongPrice());
+				    	mberGrdVO.setPicturePrice(mberGrdVO4.getPicturePrice());
+				    	mberGrdVO.setPicture2Price(mberGrdVO4.getPicture2Price());
+				    	mberGrdVO.setPicture3Price(mberGrdVO4.getPicture3Price());
+				    	mberGrdVO.setGrdDate(mberGrdVO.getGrdDate());
+				    	mberGrdVO.setGrdStartDate(nowDate + " 00:00:00");
+				    	mberGrdVO.setGrdEndDate("9999:12:31 23:59:59");
+				    	mberGrdVO.setGrdStatus("Y");
+				    	
+						// Step 5. 인서트 Or 업데이트
+						MberGrdVO mberGrdVO5 = new MberGrdVO();
+						mberGrdVO5 = selectMberGrdDetail(mberGrdVO);
+						if (null != mberGrdVO5) {
+							updateMberGrd(mberGrdVO);
 								
-								// 회원별 등급 히스토리 인서트
-								insertMberGrdHist(mberGrdVO);
-							}
+							// 회원별 등급 히스토리 인서트
+							insertMberGrdHist(mberGrdVO);							
 						}
-					}					
-				}
+						else {
+							// 인서트
+							insertMberGrd(mberGrdVO);
+							
+							// 회원별 등급 히스토리 인서트
+							insertMberGrdHist(mberGrdVO);
+						}
+					}
+				}					
 			}			
-
 		}
 	}			
 	
+	// 회원별 등급제 대상여부
+	@Override
+	public int selectMberGrdCnt(String mberId) throws Exception{
+		// 공백제거
+		mberId = mberId.trim();
+		
+		return mberGrdDAO.selectMberGrdCnt(mberId);
+	}
+	
 	// 회원별 등급 진행여부
 	@Override
 	public int selectMberGrdPrgCnt(String mberId) throws Exception{

ccb1dea

e73d588

src/main/java/itn/let/sym/grd/web/MberGrdMngController.java

--- src/main/java/itn/let/sym/grd/web/MberGrdMngController.java

+++ src/main/java/itn/let/sym/grd/web/MberGrdMngController.java


 
     	model.addAttribute("grdNoti", mberGrdVO.getGrdNoti());
     	model.addAttribute("grdDate", mberGrdVO.getGrdDate());
+    	model.addAttribute("grdPeriod", mberGrdVO.getGrdPeriod());
     	model.addAttribute("mberGrdSettingList", mberGrdSettingList);
     	
     	return "/sym/grd/mberGrdSetting";

     	mberGrdVO.setEditId(frstRegisterId);		// 최초등록자ID
 
         try{
-        	
-        	// 회원 등급 변경(환불후) => 기존등급 상관없이 업데이트
-        	mberGrdService.updateMberGrdAfterRefund(mberGrdVO);
-       		
+    		// Step 1. 등급제 시행 ON 일경우
+    		MberGrdVO mberGrdVO1 = new MberGrdVO();
+    		mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
+    		if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) {
+    			// 회원별 등급 일괄변경
+    			mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate());
+    			
+            	// 회원 등급 변경(환불후) => 기존등급 상관없이 업데이트
+            	mberGrdService.updateMberGrdAfterRefund(mberGrdVO);
+    		}        	
 		}
 		catch(Exception e) {
 			isSuccess = false;

ccb1dea

e73d588

src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml

--- src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml


 		UPDATE MJ_MBER_SETTING A 
 		SET 
 			A.GRD_NOTI = #grdNoti#
-			, A.GRD_DATE = #grdDate# 
+			, A.GRD_DATE = #grdDate#
+			, A.GRD_PERIOD = #grdPeriod#
 	</update>
 	
 	<!-- 등급제 시행여부 상세 -->
 	<select id="mberGrdDAO.selectMberSettingDetail" parameterClass="mberGrdVO" resultClass="mberGrdVO">
 	<![CDATA[
 		SELECT
-			GRD_NOTI AS grdNoti
-			, DATE_FORMAT(GRD_DATE, '%Y-%m-%d' ) AS grdDate
+			GRD_NOTI 								AS grdNoti
+			, DATE_FORMAT(GRD_DATE, '%Y-%m-%d') 	AS grdDate
+			, DATE_FORMAT(DATE_ADD(NOW(), INTERVAL - GRD_PERIOD DAY), '%Y-%m-%d') AS grdPeriodDate
+			, CASE
+				WHEN DATE_FORMAT(GRD_DATE, '%Y-%m-%d') > DATE_FORMAT(DATE_ADD(NOW(), INTERVAL - GRD_PERIOD DAY), '%Y-%m-%d') 
+					THEN DATE_FORMAT(GRD_DATE, '%Y-%m-%d')						
+				ELSE DATE_FORMAT(DATE_ADD(NOW(), INTERVAL - GRD_PERIOD DAY), '%Y-%m-%d')
+			END grdNewDate
+			, GRD_PERIOD 							AS grdPeriod
 			, CASE
 				WHEN IFNULL(GRD_DATE, '') = '' 
 					THEN 'N'						

 		LIMIT 1
 	</select>
 
-	<!-- 회원 등급제 대상여부 정보(사용자화면용) -->
+	<!-- 회원 등급제 대상여부 정보(사용자화면용) => 문자할인, B선라인, 스팸회원 대상자 제외  -->
 	<select id="mberGrdDAO.selectMberGrdInfo" parameterClass="String" resultClass="mberGrdVO">
 	<![CDATA[
 		SELECT
 			M.mberId
-			, blineCode
+			, M.isSalePrice
+			, M.blineCode
+			, M.spamYn
 			, M.grdSetNo
 			, M.grdSetNm
 			, CASE

 			SELECT 
 				A.MBER_ID						AS mberId
 				, IFNULL(A.BLINE_CODE, 'N') 	AS blineCode
+				, IFNULL(A.SPAM_YN, 'N') 		AS spamYn
 				, G.GRD_SET_NO					AS grdSetNo
 				, S.GRD_SET_NM					AS grdSetNm
 				, DATE_FORMAT(G.GRD_DATE, '%Y-%m-%d')		AS grdDate

 				ON G.GRD_SET_NO = S.GRD_SET_NO					
 			JOIN MJ_MBER_SETTING B
 			WHERE 1=1
+				AND A.MBER_STTUS = 'Y'
 				AND B.GRD_NOTI = 'Y'
 				AND DATE_FORMAT(B.GRD_DATE, '%Y-%m-%d') <= DATE_FORMAT(NOW(), '%Y-%m-%d') 
 				AND G.GRD_STATUS = 'Y'

 				AND G.MBER_ID = #mberId#
 		) M
 		WHERE M.isSalePrice = 'N'
-		OR M.blineCode != 'N'
-		LIMIT 1
+			AND M.blineCode = 'N'
+			AND M.spamYn = 'N'
+		LIMIT 1	
 	]]>
 	</select>
 	

 				, IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) AS REFUND_SUM
 				, (SUM(S.AMT) - IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0)) AS AMT_SUM
 				, (
-					SELECT MIN(S1.GRD_SET_NO) FROM MJ_MBER_GRD_SETTING S1 WHERE S1.STD_AMT <= (SUM(S.AMT) - IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0))
+					SELECT IFNULL(MIN(S1.GRD_SET_NO), 12) FROM MJ_MBER_GRD_SETTING S1 WHERE S1.STD_AMT <= (SUM(S.AMT) - IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0))
 				 ) GRD_SET_NO 
 			FROM MJ_PG S 
 			LEFT OUTER JOIN MJ_EVENT_MBER_INFO SS

 				AND R.REFUND_STATUS  = '3' 
 				AND R.REFUND_DIVISION = '1'
 			WHERE S.PG_STATUS = '1'	
-				AND S.REG_DATE >= CONCAT(DATE_FORMAT(#grdDate#, '%Y-%m-%d'), ' ', '00:00:00')
+				AND S.REG_DATE >= CONCAT(DATE_FORMAT(#grdNewDate#, '%Y-%m-%d'), ' ', '00:00:00')
 			GROUP BY S.USER_ID
 		) M
 		WHERE M.GRD_SET_NO IS NOT NULL

 			MBER_ID = #mberId#
 	</update>	
 	
+	<!-- 회원별 등급 등록 All => 기존대상자 제외 -->
+	<insert id="mberGrdDAO.insertMberGrdAllByExist" parameterClass="mberGrdVO">	
+			INSERT INTO MJ_MBER_GRD_INFO 
+		(
+			MBER_ID
+			, GRD_SET_NO
+			, SHORT_PRICE
+			, LONG_PRICE
+			, PICTURE_PRICE
+			, PICTURE2_PRICE
+			, PICTURE3_PRICE
+			, AMT
+			, TOT_AMT
+			, GRD_DATE
+			, GRD_START_DATE
+			, GRD_END_DATE
+			, GRD_STATUS
+			, REG_ID
+			, REG_DATE
+			, EDIT_ID
+			, EDIT_DATE
+		)
+		SELECT
+			A.MBER_ID
+			, S.GRD_SET_NO
+			, S.SHORT_PRICE
+			, S.LONG_PRICE
+			, S.PICTURE_PRICE
+			, S.PICTURE2_PRICE
+			, S.PICTURE3_PRICE
+			, 0
+			, 0
+			, #grdNewDate#
+			, NOW()
+			, '9999:12:31 23:59:59'
+			, 'Y'
+			, ''
+			, NOW()
+			, ''
+			, NOW()
+		FROM LETTNGNRLMBER A
+		INNER JOIN MJ_MBER_GRD_SETTING S
+			ON S.GRD_SET_NO = 12
+		WHERE A.MBER_STTUS = 'Y'
+			AND MBER_ID NOT IN (SELECT MBER_ID FROM MJ_MBER_GRD_INFO)
+	</insert>			
+	
 	<!-- 
 		회원별 등급 일괄변경
 		=> 기존등급보다 상위등급 대상만 업데이트 됨.

 					, IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) AS REFUND_SUM
 					, (SUM(S.AMT) - IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0)) AS AMT_SUM
 					, (
-						SELECT MIN(S1.GRD_SET_NO) FROM MJ_MBER_GRD_SETTING S1 WHERE S1.STD_AMT <= (SUM(S.AMT) - IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0))
+						SELECT IFNULL(MIN(S1.GRD_SET_NO), 12) FROM MJ_MBER_GRD_SETTING S1 WHERE S1.STD_AMT <= (SUM(S.AMT) - IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0))
 					 ) GRD_SET_NO 
 				FROM MJ_PG S 
 				LEFT OUTER JOIN MJ_EVENT_MBER_INFO SS

 					AND R.REFUND_STATUS  = '3' 
 					AND R.REFUND_DIVISION = '1'					
 				WHERE S.PG_STATUS = '1'	
-					AND S.REG_DATE >= CONCAT(DATE_FORMAT(#grdDate#, '%Y-%m-%d'), ' ', '00:00:00')
+					AND S.REG_DATE >= CONCAT(DATE_FORMAT(#grdNewDate#, '%Y-%m-%d'), ' ', '00:00:00')
 				GROUP BY S.USER_ID
 			) M
 			WHERE M.GRD_SET_NO IS NOT NULL

 			, A.PICTURE2_PRICE = C.PICTURE2_PRICE
 			, A.PICTURE3_PRICE = C.PICTURE3_PRICE
 			, A.TOT_AMT = B.AMT_SUM
-			, A.GRD_DATE = CONCAT(DATE_FORMAT(#grdDate#, '%Y-%m-%d'), ' ', '00:00:00')
+			, A.GRD_DATE = CONCAT(DATE_FORMAT(#grdNewDate#, '%Y-%m-%d'), ' ', '00:00:00')
 			, A.EDIT_DATE = NOW()
 		WHERE B.GRD_SET_NO IS NOT NULL
-			AND A.GRD_SET_NO > B.GRD_SET_NO
 			AND A.GRD_STATUS = 'Y'
 			AND NOW() BETWEEN A.GRD_START_DATE AND A.GRD_END_DATE
 	]]>

 					, IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) AS REFUND_SUM
 					, (SUM(S.AMT) - IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0)) AS AMT_SUM
 					, (
-						SELECT MIN(S1.GRD_SET_NO) FROM MJ_MBER_GRD_SETTING S1 WHERE S1.STD_AMT <= (SUM(S.AMT) - IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0))
+						SELECT IFNULL(MIN(S1.GRD_SET_NO), 12) FROM MJ_MBER_GRD_SETTING S1 WHERE S1.STD_AMT <= (SUM(S.AMT) - IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0))
 					 ) GRD_SET_NO 
 				FROM MJ_PG S 
 				LEFT OUTER JOIN MJ_EVENT_MBER_INFO SS

 					AND R.REFUND_STATUS  = '3' 
 					AND R.REFUND_DIVISION = '1'					
 				WHERE S.PG_STATUS = '1'	
-					AND S.REG_DATE >= CONCAT(DATE_FORMAT(#grdDate#, '%Y-%m-%d'), ' ', '00:00:00')
+					AND S.REG_DATE >= CONCAT(DATE_FORMAT(#grdNewDate#, '%Y-%m-%d'), ' ', '00:00:00')
 				GROUP BY S.USER_ID
 			) M
 			WHERE M.GRD_SET_NO IS NOT NULL

 			, A.PICTURE2_PRICE = C.PICTURE2_PRICE
 			, A.PICTURE3_PRICE = C.PICTURE3_PRICE
 			, A.TOT_AMT = B.AMT_SUM
-			, A.GRD_DATE = CONCAT(DATE_FORMAT(#grdDate#, '%Y-%m-%d'), ' ', '00:00:00')
+			, A.GRD_DATE = CONCAT(DATE_FORMAT(#grdNewDate#, '%Y-%m-%d'), ' ', '00:00:00')
 			, A.EDIT_ID	= #editId#
 			, A.EDIT_DATE = NOW()
 		WHERE B.GRD_SET_NO IS NOT NULL

 	]]>
 	</update>	
 	
-	<!-- 문자할인, B선라인 대상자 초기화 -->
+	<!-- 문자할인, B선라인, 스팸회원 대상자 종료 -->
 	<update id="mberGrdDAO.updateMberGrdEndBySale" parameterClass="mberGrdVO">
 	<![CDATA[
 		UPDATE MJ_MBER_GRD_INFO SET

 				SELECT 
 					A.MBER_ID
 					, IFNULL(A.BLINE_CODE, 'N') AS BLINE_CODE
+					, IFNULL(A.SPAM_YN, 'N') AS SPAM_YN
 					, CASE
 						WHEN 
 							(A.SHORT_PRICE > 0 

 							)
 						THEN 'Y'
 						ELSE 'N'
-					END isSalePrice
+					END IS_SALE_PRICE
 				FROM LETTNGNRLMBER A 
 				INNER JOIN MJ_MBER_GRD_INFO G
 					ON A.MBER_ID = G.MBER_ID
 				JOIN MJ_MBER_SETTING B
 				WHERE 1=1
+					AND A.MBER_STTUS = 'Y'
 					AND G.GRD_STATUS != 'E'
 			) M
-			WHERE M.isSalePrice = 'Y'
-			OR M.BLINE_CODE != 'N'
+			WHERE M.IS_SALE_PRICE = 'Y'
+				OR M.BLINE_CODE != 'N'
+				OR M.SPAM_YN = 'Y'
 		)
 	]]>
 	</update>	
 	
-	<!-- 전체회원 등급 초기화 -->
+	<!-- 전체회원 등급 종료 -->
 	<update id="mberGrdDAO.updateMberGrdEndAll" parameterClass="mberGrdVO">
 		UPDATE MJ_MBER_GRD_INFO SET
 			GRD_END_DATE			= NOW()

 			GRD_STATUS != 'Y'
 			AND MBER_ID = #mberId#
 	</update>	
-				
+
+	<!-- 회원별 등급제 대상여부 -->
+	<select id="mberGrdDAO.selectMberGrdCnt" parameterClass="String" resultClass="Integer">
+		SELECT
+			COUNT(0)
+		FROM (
+			SELECT 
+				A.MBER_ID						AS mberId
+				, IFNULL(A.BLINE_CODE, 'N') 	AS blineCode
+				, IFNULL(A.SPAM_YN, 'N') 		AS spamYn
+				, CASE
+					WHEN 
+						(A.SHORT_PRICE > 0 
+							AND (B.SHORT_PRICE > A.SHORT_PRICE 
+								OR B.LONG_PRICE > A.LONG_PRICE 
+								OR B.PICTURE_PRICE > A.PICTURE_PRICE 
+								OR B.PICTURE2_PRICE > A.PICTURE2_PRICE 
+								OR B.PICTURE3_PRICE > A.PICTURE3_PRICE)
+						)
+					THEN 'Y'
+					ELSE 'N'
+				END isSalePrice
+			FROM LETTNGNRLMBER A 
+			JOIN MJ_MBER_SETTING B
+			WHERE 1=1
+				AND A.MBER_ID = #mberId#
+				AND A.MBER_STTUS = 'Y'
+		) M
+		WHERE M.isSalePrice = 'N'
+			AND M.blineCode = 'N'
+			AND M.spamYn = 'N'
+		LIMIT 1	
+	</select>
+
 	<!-- 회원별 등급 진행여부 -->
 	<select id="mberGrdDAO.selectMberGrdPrgCnt" parameterClass="String" resultClass="Integer">
 		SELECT

ccb1dea

e73d588

src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdList.jsp

--- src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdList.jsp

+++ src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdList.jsp


 }	
 
 //회원 등급제 갱신
-function setMberGrdUpdateByUser(mberId, grdDate) {
+function setMberGrdUpdateByUser(mberId) {
 	if(confirm("등급제 갱신하시겠습니까?\n등급 다시 계산합니다.")) {
 		$.ajax({
 	        type: "POST",
 	        url: "/sym/grd/mberGrdUpdateByUserAjax.do",
-	        data: {"mberId" : mberId, "grdDate" : grdDate},
+	        data: {"mberId" : mberId},
 	        dataType:'json',
 	        async: false,
 	        success: function (data) {

 						<col style="width: 12%">
 						<col style="width: 12%">
 						<col style="width: 5%">
-						<col style="width: 8%">
+						<col style="width: 9%">
 					</colgroup>
 					<thead>
 						<tr>

 					   		<td nowrap="nowrap">
 					    		<c:out value="${result.grdStatusNm}"/>
 					    	</td>					    					    	
-					   		<td nowrap="nowrap">
+					   		<td nowrap="nowrap" class="left">
 								<c:choose>
 									<c:when test="${result.grdStatusNm eq '종료'}">
 										<input type="button" class="btnType2" onclick="setMberGrdRestoreByUser('${result.mberId}','${result.grdDate}')" value="복원">
 									</c:when>
 									<c:otherwise>
-										<input type="button" class="btnType2" onclick="setMberGrdUpdateByUser('${result.mberId}','${result.grdDate}')" value="갱신">
+										<input type="button" class="btnType2" onclick="setMberGrdUpdateByUser('${result.mberId}')" value="갱신">
 										<input type="button" class="btnType1" onclick="setMberGrdEndByUser('${result.mberId}')" value="종료">
 									</c:otherwise>
 								</c:choose>

ccb1dea

e73d588

src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdSetting.jsp

--- src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdSetting.jsp

+++ src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdSetting.jsp


 			<div class="tableWrap">
 				<table class="tbType2">
 					<colgroup>
+						<col width="20%">
 						<col width="30%">
+						<col width="20%">
 						<col width="*">
 					</colgroup>
 					<tbody>
 						<tr>
 							<th>등급제 적용</th>
-							<td>
+							<td colspan="3">
 							<input type="radio" name="grdNoti" id="grdNoti1" value="Y" <c:if test="${grdNoti eq 'Y'}">checked="checked"</c:if> /> ON
 							&nbsp;&nbsp;&nbsp;
 							<input type="radio" name="grdNoti" id="grdNoti2" value="N" <c:if test="${grdNoti eq 'N'}">checked="checked"</c:if> /> OFF
 							</td>
+							
 						</tr>					
 						<tr>
-							<th>누적결제 적용일자</th>
+							<th>누적결제 시작일자</th>
 							<td>
 								<input type="hidden" name="cal_url" id="cal_url" value="/sym/cmm/EgovNormalCalPopup.do">
 							    <a href="#" onclick="javascript:fn_egov_NormalCalendar(document.forms.listForm, document.forms.listForm.ntceBgndeYYYMMDD);">

 							   	 	<input type="button" class="calBtn">
 						    	</a>
 							</td>
+							<th>누적결제 계산기간</th>
+							<td>
+								<input type="text" name="grdPeriod" value="<c:out value="${grdPeriod}" />" style="height: 20px; width: 150px; padding: 5px 5px 5px 5px;" />
+							</td>
 						</tr>
 					</tbody>
 				</table>

Add a comment

Open 0
Closed 0

List

...	...	@@ -41,8 +41,11 @@
41	41	private int mberGrdHistNo;
42	42
43	43	private String grdNoti; // 회원등급제 시행 여부
44		- private String grdDate; // 회원등급제 시행일자
45		- private String grdDatePrgYn; // 회원등급제 시행일자 진행여부(오늘보다 이전날짜이면 Y, 이후이면 N)
	44	+ private String grdDate; // 회원등급제 시작일자
	45	+ private String grdPeriodDate; // 오늘날짜 - 누적결제 계산기간 = 계산기간 시작일자
	46	+ private String grdNewDate; // 시작일자, 계산기간 시작일자 중 최근날짜
	47	+ private String grdDatePrgYn; // 회원등급제 시작일자 진행여부(오늘보다 이전날짜이면 Y, 이후이면 N)
	48	+ private String grdPeriod; // 회원등급제 누적결제 계산기간
46	49
47	50	// 검색필터
48	51	private String searchGrdStatus;
...	...	@@ -241,12 +244,30 @@
241	244	public void setGrdDate(String grdDate) {
242	245	this.grdDate = grdDate;
243	246	}
	247	+ public String getGrdPeriodDate() {
	248	+ return grdPeriodDate;
	249	+ }
	250	+ public void setGrdPeriodDate(String grdPeriodDate) {
	251	+ this.grdPeriodDate = grdPeriodDate;
	252	+ }
	253	+ public String getGrdNewDate() {
	254	+ return grdNewDate;
	255	+ }
	256	+ public void setGrdNewDate(String grdNewDate) {
	257	+ this.grdNewDate = grdNewDate;
	258	+ }
244	259	public String getGrdDatePrgYn() {
245	260	return grdDatePrgYn;
246	261	}
247	262	public void setGrdDatePrgYn(String grdDatePrgYn) {
248	263	this.grdDatePrgYn = grdDatePrgYn;
249	264	}
	265	+ public String getGrdPeriod() {
	266	+ return grdPeriod;
	267	+ }
	268	+ public void setGrdPeriod(String grdPeriod) {
	269	+ this.grdPeriod = grdPeriod;
	270	+ }
250	271	public String getSearchGrdStatus() {
251	272	return searchGrdStatus;
252	273	}

...	...	@@ -67,6 +67,11 @@
67	67	public void updateMberGrd(MberGrdVO mberGrdVO) throws Exception{
68	68	update("mberGrdDAO.updateMberGrd", mberGrdVO);
69	69	}
	70	+
	71	+ // 회원별 등급 등록 All => 기존대상자 제외
	72	+ public void insertMberGrdAllByExist(MberGrdVO mberGrdVO) throws Exception{
	73	+ insert("mberGrdDAO.insertMberGrdAllByExist", mberGrdVO);
	74	+ }
70	75
71	76	// 회원별 등급 일괄변경
72	77	public int updateMberGrdAll(MberGrdVO mberGrdVO) throws Exception {
...	...	@@ -78,12 +83,12 @@
78	83	return update("mberGrdDAO.updateMberGrdAfterRefund", mberGrdVO);
79	84	}
80	85
81		- // 문자할인, B선라인 대상자 초기화
	86	+ // 문자할인, B선라인 대상자 종료
82	87	public int updateMberGrdEndBySale(MberGrdVO mberGrdVO) throws Exception {
83	88	return update("mberGrdDAO.updateMberGrdEndBySale", mberGrdVO);
84	89	}
85	90
86		- // 전체회원 등급 초기화
	91	+ // 전체회원 등급 종료
87	92	public int updateMberGrdEndAll(MberGrdVO mberGrdVO) throws Exception {
88	93	return update("mberGrdDAO.updateMberGrdEndAll", mberGrdVO);
89	94	}
...	...	@@ -98,6 +103,11 @@
98	103	return update("mberGrdDAO.updateMberGrdRestoreByUser", mberGrdVO);
99	104	}
100	105
	106	+ // 회원별 등급제 대상여부
	107	+ public int selectMberGrdCnt(String mberId) throws Exception{
	108	+ return (int) select("mberGrdDAO.selectMberGrdCnt", mberId);
	109	+ }
	110	+
101	111	// 회원별 등급 진행여부
102	112	public int selectMberGrdPrgCnt(String mberId) throws Exception{
103	113	return (int) select("mberGrdDAO.selectMberGrdPrgCnt", mberId);

...	...	@@ -14,7 +14,6 @@
14	14	import itn.let.sym.grd.service.MberGrdVO;
15	15	import itn.let.sym.site.service.JoinSettingVO;
16	16	import itn.let.uss.umt.service.EgovMberManageService;
17		-import itn.let.uss.umt.service.MberManageVO;
18	17
19	18	@Service("mberGrdService")
20	19	public class MberGrdServiceImpl extends EgovAbstractServiceImpl implements MberGrdService {
...	...	@@ -147,6 +146,12 @@
147	146	mberGrdDAO.updateMberGrd(mberGrdVO);
148	147	}
149	148
	149	+ // 회원별 등급 등록 All => 기존대상자 제외
	150	+ @Override
	151	+ public void insertMberGrdAllByExist(MberGrdVO mberGrdVO) throws Exception {
	152	+ mberGrdDAO.insertMberGrdAllByExist(mberGrdVO);
	153	+ }
	154	+
150	155	// 회원별 등급 일괄변경
151	156	@Override
152	157	public int updateMberGrdAll(MberGrdVO mberGrdVO) throws Exception {
...	...	@@ -157,8 +162,15 @@
157	162	MberGrdVO mberGrdVO1 = new MberGrdVO();
158	163	mberGrdVO1 = selectMberSettingDetail(mberGrdVO);
159	164	if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) {
160		- // 문자할인, B선라인 대상자 초기화
	165	+ mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate());
	166	+
	167	+ // 대상자 추가
	168	+ insertMberGrdAllByExist(mberGrdVO);
	169	+
	170	+ // 문자할인, B선라인, 스팸회원 대상자 종료
161	171	updateCnt1 = updateMberGrdEndBySale(mberGrdVO);
	172	+
	173	+ // 등급제 정상대상자 초기화(화이트등급)
162	174
163	175	// 회원별 등급 일괄변경
164	176	updateCnt2 = mberGrdDAO.updateMberGrdAll(mberGrdVO);
...	...	@@ -173,13 +185,13 @@
173	185	return mberGrdDAO.updateMberGrdAfterRefund(mberGrdVO);
174	186	}
175	187
176		- // 문자할인, B선라인 대상자 초기화
	188	+ // 문자할인, B선라인 대상자 종료
177	189	@Override
178	190	public int updateMberGrdEndBySale(MberGrdVO mberGrdVO) throws Exception {
179	191	return mberGrdDAO.updateMberGrdEndBySale(mberGrdVO);
180	192	}
181	193
182		- // 전체회원 등급 초기화
	194	+ // 전체회원 등급 종료
183	195	@Override
184	196	public int updateMberGrdEndAll(MberGrdVO mberGrdVO) throws Exception {
185	197	return mberGrdDAO.updateMberGrdEndAll(mberGrdVO);
...	...	@@ -212,68 +224,65 @@
212	224	MberGrdVO mberGrdVO1 = new MberGrdVO();
213	225	mberGrdVO1 = selectMberSettingDetail(mberGrdVO);
214	226	if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) {
215		- mberGrdVO.setGrdDate(mberGrdVO1.getGrdDate());
	227	+ mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate());
216	228
217		- // Step 2. /협의/스팸/비선등급 적용 제외
218		- // 문자할인여부(1: 할인, 0: 미할인)
219		- int isMsgSalePrice = mjonPayService.selectMsgSalePriceCnt(mberGrdVO.getMberId());
220		- if(isMsgSalePrice == 0) {
221		- // B선 전송사 이용고객 => 등급제대상 제외처리
222		- MberManageVO mberManageVO = new MberManageVO();
223		- mberManageVO.setMberId(mberGrdVO.getMberId());
224		- String blineCode = mberManageService.selectBlineCodeByMberId(mberManageVO);
225		- if (blineCode != null && blineCode.equals("N")) {
	229	+ // Step 2. 문자할인, B선라인, 스팸회원 대상자 제외
	230	+ int isMberGrd = selectMberGrdCnt(mberGrdVO.getMberId()); // 등급제 대상여부(1: 대상, 0: 미대상)
	231	+ if(isMberGrd == 1) {
	232	+ // Step 3. 누적결제금액(이벤트금액 제외) 추출 및 등급 조회
	233	+ MberGrdVO mberGrdVO3 = new MberGrdVO();
	234	+ mberGrdVO3 = selectMberGrdAmtDetail(mberGrdVO);
	235	+ if (null != mberGrdVO3) {
	236	+ mberGrdVO.setTotAmt(mberGrdVO3.getTotAmt());
	237	+ mberGrdVO.setGrdSetNo(mberGrdVO3.getGrdSetNo());
226	238
227		- // Step 3. 누적결제금액(이벤트금액 제외) 추출 및 등급 조회
228		- MberGrdVO mberGrdVO3 = new MberGrdVO();
229		- mberGrdVO3 = selectMberGrdAmtDetail(mberGrdVO);
230		- if (null != mberGrdVO3) {
231		- mberGrdVO.setTotAmt(mberGrdVO3.getTotAmt());
232		- mberGrdVO.setGrdSetNo(mberGrdVO3.getGrdSetNo());
233		-
234		- // Step 4. 등급제 설정값 조회
235		- MberGrdVO mberGrdVO4 = new MberGrdVO();
236		- mberGrdVO4 = selectMberGrdSettingDetail(mberGrdVO);
237		- if (null != mberGrdVO4) {
238		- mberGrdVO.setAmt(mberGrdVO.getAmt());
239		- mberGrdVO.setTotAmt(mberGrdVO.getTotAmt());
240		- mberGrdVO.setShortPrice(mberGrdVO4.getShortPrice());
241		- mberGrdVO.setLongPrice(mberGrdVO4.getLongPrice());
242		- mberGrdVO.setPicturePrice(mberGrdVO4.getPicturePrice());
243		- mberGrdVO.setPicture2Price(mberGrdVO4.getPicture2Price());
244		- mberGrdVO.setPicture3Price(mberGrdVO4.getPicture3Price());
245		- mberGrdVO.setGrdDate(mberGrdVO.getGrdDate());
246		- mberGrdVO.setGrdStartDate(nowDate + " 00:00:00");
247		- mberGrdVO.setGrdEndDate("9999:12:31 23:59:59");
248		- mberGrdVO.setGrdStatus("Y");
249		-
250		- // Step 5. 인서트 Or 업데이트
251		- MberGrdVO mberGrdVO5 = new MberGrdVO();
252		- mberGrdVO5 = selectMberGrdDetail(mberGrdVO);
253		- if (null != mberGrdVO5) {
254		- // 업데이트 => 기존등급보다 상위등급 대상만 업데이트
255		- if (mberGrdVO5.getGrdSetNo() > mberGrdVO.getGrdSetNo()) {
256		- updateMberGrd(mberGrdVO);
257		-
258		- // 회원별 등급 히스토리 인서트
259		- insertMberGrdHist(mberGrdVO);
260		- }
261		- }
262		- else {
263		- // 인서트
264		- insertMberGrd(mberGrdVO);
	239	+ // Step 4. 등급제 설정값 조회
	240	+ MberGrdVO mberGrdVO4 = new MberGrdVO();
	241	+ mberGrdVO4 = selectMberGrdSettingDetail(mberGrdVO);
	242	+ if (null != mberGrdVO4) {
	243	+ mberGrdVO.setAmt(mberGrdVO.getAmt());
	244	+ mberGrdVO.setTotAmt(mberGrdVO.getTotAmt());
	245	+ mberGrdVO.setShortPrice(mberGrdVO4.getShortPrice());
	246	+ mberGrdVO.setLongPrice(mberGrdVO4.getLongPrice());
	247	+ mberGrdVO.setPicturePrice(mberGrdVO4.getPicturePrice());
	248	+ mberGrdVO.setPicture2Price(mberGrdVO4.getPicture2Price());
	249	+ mberGrdVO.setPicture3Price(mberGrdVO4.getPicture3Price());
	250	+ mberGrdVO.setGrdDate(mberGrdVO.getGrdDate());
	251	+ mberGrdVO.setGrdStartDate(nowDate + " 00:00:00");
	252	+ mberGrdVO.setGrdEndDate("9999:12:31 23:59:59");
	253	+ mberGrdVO.setGrdStatus("Y");
	254	+
	255	+ // Step 5. 인서트 Or 업데이트
	256	+ MberGrdVO mberGrdVO5 = new MberGrdVO();
	257	+ mberGrdVO5 = selectMberGrdDetail(mberGrdVO);
	258	+ if (null != mberGrdVO5) {
	259	+ updateMberGrd(mberGrdVO);
265	260
266		- // 회원별 등급 히스토리 인서트
267		- insertMberGrdHist(mberGrdVO);
268		- }
	261	+ // 회원별 등급 히스토리 인서트
	262	+ insertMberGrdHist(mberGrdVO);
269	263	}
270		- }
271		- }
	264	+ else {
	265	+ // 인서트
	266	+ insertMberGrd(mberGrdVO);
	267	+
	268	+ // 회원별 등급 히스토리 인서트
	269	+ insertMberGrdHist(mberGrdVO);
	270	+ }
	271	+ }
	272	+ }
272	273	}
273		-
274	274	}
275	275	}
276	276
	277	+ // 회원별 등급제 대상여부
	278	+ @Override
	279	+ public int selectMberGrdCnt(String mberId) throws Exception{
	280	+ // 공백제거
	281	+ mberId = mberId.trim();
	282	+
	283	+ return mberGrdDAO.selectMberGrdCnt(mberId);
	284	+ }
	285	+
277	286	// 회원별 등급 진행여부
278	287	@Override
279	288	public int selectMberGrdPrgCnt(String mberId) throws Exception{

...	...	@@ -39,6 +39,7 @@
39	39
40	40	model.addAttribute("grdNoti", mberGrdVO.getGrdNoti());
41	41	model.addAttribute("grdDate", mberGrdVO.getGrdDate());
	42	+ model.addAttribute("grdPeriod", mberGrdVO.getGrdPeriod());
42	43	model.addAttribute("mberGrdSettingList", mberGrdSettingList);
43	44
44	45	return "/sym/grd/mberGrdSetting";
...	...	@@ -322,10 +323,16 @@
322	323	mberGrdVO.setEditId(frstRegisterId); // 최초등록자ID
323	324
324	325	try{
325		-
326		- // 회원 등급 변경(환불후) => 기존등급 상관없이 업데이트
327		- mberGrdService.updateMberGrdAfterRefund(mberGrdVO);
328		-
	326	+ // Step 1. 등급제 시행 ON 일경우
	327	+ MberGrdVO mberGrdVO1 = new MberGrdVO();
	328	+ mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
	329	+ if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) {
	330	+ // 회원별 등급 일괄변경
	331	+ mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate());
	332	+
	333	+ // 회원 등급 변경(환불후) => 기존등급 상관없이 업데이트
	334	+ mberGrdService.updateMberGrdAfterRefund(mberGrdVO);
	335	+ }
329	336	}
330	337	catch(Exception e) {
331	338	isSuccess = false;

...	...	@@ -131,12 +131,12 @@
131	131	}
132	132
133	133	//회원 등급제 갱신
134		-function setMberGrdUpdateByUser(mberId, grdDate) {
	134	+function setMberGrdUpdateByUser(mberId) {
135	135	if(confirm("등급제 갱신하시겠습니까?\n등급 다시 계산합니다.")) {
136	136	$.ajax({
137	137	type: "POST",
138	138	url: "/sym/grd/mberGrdUpdateByUserAjax.do",
139		- data: {"mberId" : mberId, "grdDate" : grdDate},
	139	+ data: {"mberId" : mberId},
140	140	dataType:'json',
141	141	async: false,
142	142	success: function (data) {
...	...	@@ -246,7 +246,7 @@
246	246	<col style="width: 12%">
247	247	<col style="width: 12%">
248	248	<col style="width: 5%">
249		- <col style="width: 8%">
	249	+ <col style="width: 9%">
250	250	</colgroup>
251	251	<thead>
252	252	<tr>
...	...	@@ -307,13 +307,13 @@
307	307	<td nowrap="nowrap">
308	308	<c:out value="${result.grdStatusNm}"/>
309	309	</td>
310		- <td nowrap="nowrap">
	310	+ <td nowrap="nowrap" class="left">
311	311	<c:choose>
312	312	<c:when test="${result.grdStatusNm eq '종료'}">
313	313	<input type="button" class="btnType2" onclick="setMberGrdRestoreByUser('${result.mberId}','${result.grdDate}')" value="복원">
314	314	</c:when>
315	315	<c:otherwise>
316		- <input type="button" class="btnType2" onclick="setMberGrdUpdateByUser('${result.mberId}','${result.grdDate}')" value="갱신">
	316	+ <input type="button" class="btnType2" onclick="setMberGrdUpdateByUser('${result.mberId}')" value="갱신">
317	317	<input type="button" class="btnType1" onclick="setMberGrdEndByUser('${result.mberId}')" value="종료">
318	318	</c:otherwise>
319	319	</c:choose>

...	...	@@ -43,16 +43,19 @@
43	43	// 회원별 등급 수정
44	44	public void updateMberGrd(MberGrdVO mberGrdVO) throws Exception;
45	45
	46	+ // 회원별 등급 등록 All => 기존대상자 제외
	47	+ public void insertMberGrdAllByExist(MberGrdVO mberGrdVO) throws Exception;
	48	+
46	49	// 회원별 등급 일괄변경
47	50	public int updateMberGrdAll(MberGrdVO mberGrdVO) throws Exception;
48	51
49	52	// 회원 등급 변경(환불후) => 기존등급 상관없이 업데이트
50	53	public int updateMberGrdAfterRefund(MberGrdVO mberGrdVO) throws Exception;
51	54
52		- // 문자할인, B선라인 대상자 초기화
	55	+ // 문자할인, B선라인 대상자 종료
53	56	public int updateMberGrdEndBySale(MberGrdVO mberGrdVO) throws Exception;
54	57
55		- // 전체회원 등급 초기화
	58	+ // 전체회원 등급 종료
56	59	public int updateMberGrdEndAll(MberGrdVO mberGrdVO) throws Exception;
57	60
58	61	// 회원 등급제 종료
...	...	@@ -64,6 +67,9 @@
64	67	// 회원별 등급 적용
65	68	public void mberGrdSaveByUser(MberGrdVO mberGrdVO) throws Exception;
66	69
	70	+ // 회원별 등급제 대상여부
	71	+ int selectMberGrdCnt(String mberId) throws Exception;
	72	+
67	73	// 회원별 등급 진행여부
68	74	int selectMberGrdPrgCnt(String mberId) throws Exception;
69	75

...	...	@@ -10,15 +10,23 @@
10	10	UPDATE MJ_MBER_SETTING A
11	11	SET
12	12	A.GRD_NOTI = #grdNoti#
13		- , A.GRD_DATE = #grdDate#
	13	+ , A.GRD_DATE = #grdDate#
	14	+ , A.GRD_PERIOD = #grdPeriod#
14	15	</update>
15	16
16	17	<!-- 등급제 시행여부 상세 -->
17	18	<select id="mberGrdDAO.selectMberSettingDetail" parameterClass="mberGrdVO" resultClass="mberGrdVO">
18	19	<![CDATA[
19	20	SELECT
20		- GRD_NOTI AS grdNoti
21		- , DATE_FORMAT(GRD_DATE, '%Y-%m-%d' ) AS grdDate
	21	+ GRD_NOTI AS grdNoti
	22	+ , DATE_FORMAT(GRD_DATE, '%Y-%m-%d') AS grdDate
	23	+ , DATE_FORMAT(DATE_ADD(NOW(), INTERVAL - GRD_PERIOD DAY), '%Y-%m-%d') AS grdPeriodDate
	24	+ , CASE
	25	+ WHEN DATE_FORMAT(GRD_DATE, '%Y-%m-%d') > DATE_FORMAT(DATE_ADD(NOW(), INTERVAL - GRD_PERIOD DAY), '%Y-%m-%d')
	26	+ THEN DATE_FORMAT(GRD_DATE, '%Y-%m-%d')
	27	+ ELSE DATE_FORMAT(DATE_ADD(NOW(), INTERVAL - GRD_PERIOD DAY), '%Y-%m-%d')
	28	+ END grdNewDate
	29	+ , GRD_PERIOD AS grdPeriod
22	30	, CASE
23	31	WHEN IFNULL(GRD_DATE, '') = ''
24	32	THEN 'N'
...	...	@@ -217,12 +225,14 @@
217	225	LIMIT 1
218	226	</select>
219	227
220		- <!-- 회원 등급제 대상여부 정보(사용자화면용) -->
	228	+ <!-- 회원 등급제 대상여부 정보(사용자화면용) => 문자할인, B선라인, 스팸회원 대상자 제외 -->
221	229	<select id="mberGrdDAO.selectMberGrdInfo" parameterClass="String" resultClass="mberGrdVO">
222	230	<![CDATA[
223	231	SELECT
224	232	M.mberId
225		- , blineCode
	233	+ , M.isSalePrice
	234	+ , M.blineCode
	235	+ , M.spamYn
226	236	, M.grdSetNo
227	237	, M.grdSetNm
228	238	, CASE
...	...	@@ -250,6 +260,7 @@
250	260	SELECT
251	261	A.MBER_ID AS mberId
252	262	, IFNULL(A.BLINE_CODE, 'N') AS blineCode
	263	+ , IFNULL(A.SPAM_YN, 'N') AS spamYn
253	264	, G.GRD_SET_NO AS grdSetNo
254	265	, S.GRD_SET_NM AS grdSetNm
255	266	, DATE_FORMAT(G.GRD_DATE, '%Y-%m-%d') AS grdDate
...	...	@@ -278,6 +289,7 @@
278	289	ON G.GRD_SET_NO = S.GRD_SET_NO
279	290	JOIN MJ_MBER_SETTING B
280	291	WHERE 1=1
	292	+ AND A.MBER_STTUS = 'Y'
281	293	AND B.GRD_NOTI = 'Y'
282	294	AND DATE_FORMAT(B.GRD_DATE, '%Y-%m-%d') <= DATE_FORMAT(NOW(), '%Y-%m-%d')
283	295	AND G.GRD_STATUS = 'Y'
...	...	@@ -285,8 +297,9 @@
285	297	AND G.MBER_ID = #mberId#
286	298	) M
287	299	WHERE M.isSalePrice = 'N'
288		- OR M.blineCode != 'N'
289		- LIMIT 1
	300	+ AND M.blineCode = 'N'
	301	+ AND M.spamYn = 'N'
	302	+ LIMIT 1
290	303	]]>
291	304	</select>
292	305
...	...	@@ -306,7 +319,7 @@
306	319	, IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) AS REFUND_SUM
307	320	, (SUM(S.AMT) - IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0)) AS AMT_SUM
308	321	, (
309		- SELECT MIN(S1.GRD_SET_NO) FROM MJ_MBER_GRD_SETTING S1 WHERE S1.STD_AMT <= (SUM(S.AMT) - IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0))
	322	+ SELECT IFNULL(MIN(S1.GRD_SET_NO), 12) FROM MJ_MBER_GRD_SETTING S1 WHERE S1.STD_AMT <= (SUM(S.AMT) - IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0))
310	323	) GRD_SET_NO
311	324	FROM MJ_PG S
312	325	LEFT OUTER JOIN MJ_EVENT_MBER_INFO SS
...	...	@@ -316,7 +329,7 @@
316	329	AND R.REFUND_STATUS = '3'
317	330	AND R.REFUND_DIVISION = '1'
318	331	WHERE S.PG_STATUS = '1'
319		- AND S.REG_DATE >= CONCAT(DATE_FORMAT(#grdDate#, '%Y-%m-%d'), ' ', '00:00:00')
	332	+ AND S.REG_DATE >= CONCAT(DATE_FORMAT(#grdNewDate#, '%Y-%m-%d'), ' ', '00:00:00')
320	333	GROUP BY S.USER_ID
321	334	) M
322	335	WHERE M.GRD_SET_NO IS NOT NULL
...	...	@@ -387,6 +400,53 @@
387	400	MBER_ID = #mberId#
388	401	</update>
389	402
	403	+ <!-- 회원별 등급 등록 All => 기존대상자 제외 -->
	404	+ <insert id="mberGrdDAO.insertMberGrdAllByExist" parameterClass="mberGrdVO">
	405	+ INSERT INTO MJ_MBER_GRD_INFO
	406	+ (
	407	+ MBER_ID
	408	+ , GRD_SET_NO
	409	+ , SHORT_PRICE
	410	+ , LONG_PRICE
	411	+ , PICTURE_PRICE
	412	+ , PICTURE2_PRICE
	413	+ , PICTURE3_PRICE
	414	+ , AMT
	415	+ , TOT_AMT
	416	+ , GRD_DATE
	417	+ , GRD_START_DATE
	418	+ , GRD_END_DATE
	419	+ , GRD_STATUS
	420	+ , REG_ID
	421	+ , REG_DATE
	422	+ , EDIT_ID
	423	+ , EDIT_DATE
	424	+ )
	425	+ SELECT
	426	+ A.MBER_ID
	427	+ , S.GRD_SET_NO
	428	+ , S.SHORT_PRICE
	429	+ , S.LONG_PRICE
	430	+ , S.PICTURE_PRICE
	431	+ , S.PICTURE2_PRICE
	432	+ , S.PICTURE3_PRICE
	433	+ , 0
	434	+ , 0
	435	+ , #grdNewDate#
	436	+ , NOW()
	437	+ , '9999:12:31 23:59:59'
	438	+ , 'Y'
	439	+ , ''
	440	+ , NOW()
	441	+ , ''
	442	+ , NOW()
	443	+ FROM LETTNGNRLMBER A
	444	+ INNER JOIN MJ_MBER_GRD_SETTING S
	445	+ ON S.GRD_SET_NO = 12
	446	+ WHERE A.MBER_STTUS = 'Y'
	447	+ AND MBER_ID NOT IN (SELECT MBER_ID FROM MJ_MBER_GRD_INFO)
	448	+ </insert>
	449	+
390	450	<!--
391	451	회원별 등급 일괄변경
392	452	=> 기존등급보다 상위등급 대상만 업데이트 됨.
...	...	@@ -409,7 +469,7 @@
409	469	, IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) AS REFUND_SUM
410	470	, (SUM(S.AMT) - IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0)) AS AMT_SUM
411	471	, (
412		- SELECT MIN(S1.GRD_SET_NO) FROM MJ_MBER_GRD_SETTING S1 WHERE S1.STD_AMT <= (SUM(S.AMT) - IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0))
	472	+ SELECT IFNULL(MIN(S1.GRD_SET_NO), 12) FROM MJ_MBER_GRD_SETTING S1 WHERE S1.STD_AMT <= (SUM(S.AMT) - IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0))
413	473	) GRD_SET_NO
414	474	FROM MJ_PG S
415	475	LEFT OUTER JOIN MJ_EVENT_MBER_INFO SS
...	...	@@ -419,7 +479,7 @@
419	479	AND R.REFUND_STATUS = '3'
420	480	AND R.REFUND_DIVISION = '1'
421	481	WHERE S.PG_STATUS = '1'
422		- AND S.REG_DATE >= CONCAT(DATE_FORMAT(#grdDate#, '%Y-%m-%d'), ' ', '00:00:00')
	482	+ AND S.REG_DATE >= CONCAT(DATE_FORMAT(#grdNewDate#, '%Y-%m-%d'), ' ', '00:00:00')
423	483	GROUP BY S.USER_ID
424	484	) M
425	485	WHERE M.GRD_SET_NO IS NOT NULL
...	...	@@ -436,10 +496,9 @@
436	496	, A.PICTURE2_PRICE = C.PICTURE2_PRICE
437	497	, A.PICTURE3_PRICE = C.PICTURE3_PRICE
438	498	, A.TOT_AMT = B.AMT_SUM
439		- , A.GRD_DATE = CONCAT(DATE_FORMAT(#grdDate#, '%Y-%m-%d'), ' ', '00:00:00')
	499	+ , A.GRD_DATE = CONCAT(DATE_FORMAT(#grdNewDate#, '%Y-%m-%d'), ' ', '00:00:00')
440	500	, A.EDIT_DATE = NOW()
441	501	WHERE B.GRD_SET_NO IS NOT NULL
442		- AND A.GRD_SET_NO > B.GRD_SET_NO
443	502	AND A.GRD_STATUS = 'Y'
444	503	AND NOW() BETWEEN A.GRD_START_DATE AND A.GRD_END_DATE
445	504	]]>
...	...	@@ -466,7 +525,7 @@
466	525	, IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) AS REFUND_SUM
467	526	, (SUM(S.AMT) - IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0)) AS AMT_SUM
468	527	, (
469		- SELECT MIN(S1.GRD_SET_NO) FROM MJ_MBER_GRD_SETTING S1 WHERE S1.STD_AMT <= (SUM(S.AMT) - IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0))
	528	+ SELECT IFNULL(MIN(S1.GRD_SET_NO), 12) FROM MJ_MBER_GRD_SETTING S1 WHERE S1.STD_AMT <= (SUM(S.AMT) - IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0))
470	529	) GRD_SET_NO
471	530	FROM MJ_PG S
472	531	LEFT OUTER JOIN MJ_EVENT_MBER_INFO SS
...	...	@@ -476,7 +535,7 @@
476	535	AND R.REFUND_STATUS = '3'
477	536	AND R.REFUND_DIVISION = '1'
478	537	WHERE S.PG_STATUS = '1'
479		- AND S.REG_DATE >= CONCAT(DATE_FORMAT(#grdDate#, '%Y-%m-%d'), ' ', '00:00:00')
	538	+ AND S.REG_DATE >= CONCAT(DATE_FORMAT(#grdNewDate#, '%Y-%m-%d'), ' ', '00:00:00')
480	539	GROUP BY S.USER_ID
481	540	) M
482	541	WHERE M.GRD_SET_NO IS NOT NULL
...	...	@@ -493,7 +552,7 @@
493	552	, A.PICTURE2_PRICE = C.PICTURE2_PRICE
494	553	, A.PICTURE3_PRICE = C.PICTURE3_PRICE
495	554	, A.TOT_AMT = B.AMT_SUM
496		- , A.GRD_DATE = CONCAT(DATE_FORMAT(#grdDate#, '%Y-%m-%d'), ' ', '00:00:00')
	555	+ , A.GRD_DATE = CONCAT(DATE_FORMAT(#grdNewDate#, '%Y-%m-%d'), ' ', '00:00:00')
497	556	, A.EDIT_ID = #editId#
498	557	, A.EDIT_DATE = NOW()
499	558	WHERE B.GRD_SET_NO IS NOT NULL
...	...	@@ -503,7 +562,7 @@
503	562	]]>
504	563	</update>
505	564
506		- <!-- 문자할인, B선라인 대상자 초기화 -->
	565	+ <!-- 문자할인, B선라인, 스팸회원 대상자 종료 -->
507	566	<update id="mberGrdDAO.updateMberGrdEndBySale" parameterClass="mberGrdVO">
508	567	<![CDATA[
509	568	UPDATE MJ_MBER_GRD_INFO SET
...	...	@@ -517,6 +576,7 @@
517	576	SELECT
518	577	A.MBER_ID
519	578	, IFNULL(A.BLINE_CODE, 'N') AS BLINE_CODE
	579	+ , IFNULL(A.SPAM_YN, 'N') AS SPAM_YN
520	580	, CASE
521	581	WHEN
522	582	(A.SHORT_PRICE > 0
...	...	@@ -528,21 +588,23 @@
528	588	)
529	589	THEN 'Y'
530	590	ELSE 'N'
531		- END isSalePrice
	591	+ END IS_SALE_PRICE
532	592	FROM LETTNGNRLMBER A
533	593	INNER JOIN MJ_MBER_GRD_INFO G
534	594	ON A.MBER_ID = G.MBER_ID
535	595	JOIN MJ_MBER_SETTING B
536	596	WHERE 1=1
	597	+ AND A.MBER_STTUS = 'Y'
537	598	AND G.GRD_STATUS != 'E'
538	599	) M
539		- WHERE M.isSalePrice = 'Y'
540		- OR M.BLINE_CODE != 'N'
	600	+ WHERE M.IS_SALE_PRICE = 'Y'
	601	+ OR M.BLINE_CODE != 'N'
	602	+ OR M.SPAM_YN = 'Y'
541	603	)
542	604	]]>
543	605	</update>
544	606
545		- <!-- 전체회원 등급 초기화 -->
	607	+ <!-- 전체회원 등급 종료 -->
546	608	<update id="mberGrdDAO.updateMberGrdEndAll" parameterClass="mberGrdVO">
547	609	UPDATE MJ_MBER_GRD_INFO SET
548	610	GRD_END_DATE = NOW()
...	...	@@ -577,7 +639,40 @@
577	639	GRD_STATUS != 'Y'
578	640	AND MBER_ID = #mberId#
579	641	</update>
580		-
	642	+
	643	+ <!-- 회원별 등급제 대상여부 -->
	644	+ <select id="mberGrdDAO.selectMberGrdCnt" parameterClass="String" resultClass="Integer">
	645	+ SELECT
	646	+ COUNT(0)
	647	+ FROM (
	648	+ SELECT
	649	+ A.MBER_ID AS mberId
	650	+ , IFNULL(A.BLINE_CODE, 'N') AS blineCode
	651	+ , IFNULL(A.SPAM_YN, 'N') AS spamYn
	652	+ , CASE
	653	+ WHEN
	654	+ (A.SHORT_PRICE > 0
	655	+ AND (B.SHORT_PRICE > A.SHORT_PRICE
	656	+ OR B.LONG_PRICE > A.LONG_PRICE
	657	+ OR B.PICTURE_PRICE > A.PICTURE_PRICE
	658	+ OR B.PICTURE2_PRICE > A.PICTURE2_PRICE
	659	+ OR B.PICTURE3_PRICE > A.PICTURE3_PRICE)
	660	+ )
	661	+ THEN 'Y'
	662	+ ELSE 'N'
	663	+ END isSalePrice
	664	+ FROM LETTNGNRLMBER A
	665	+ JOIN MJ_MBER_SETTING B
	666	+ WHERE 1=1
	667	+ AND A.MBER_ID = #mberId#
	668	+ AND A.MBER_STTUS = 'Y'
	669	+ ) M
	670	+ WHERE M.isSalePrice = 'N'
	671	+ AND M.blineCode = 'N'
	672	+ AND M.spamYn = 'N'
	673	+ LIMIT 1
	674	+ </select>
	675	+
581	676	<!-- 회원별 등급 진행여부 -->
582	677	<select id="mberGrdDAO.selectMberGrdPrgCnt" parameterClass="String" resultClass="Integer">
583	678	SELECT

...	...	@@ -100,20 +100,23 @@
100	100	<div class="tableWrap">
101	101	<table class="tbType2">
102	102	<colgroup>
	103	+ <col width="20%">
103	104	<col width="30%">
	105	+ <col width="20%">
104	106	<col width="*">
105	107	</colgroup>
106	108	<tbody>
107	109	<tr>
108	110	<th>등급제 적용</th>
109		- <td>
	111	+ <td colspan="3">
110	112	<input type="radio" name="grdNoti" id="grdNoti1" value="Y" <c:if test="${grdNoti eq 'Y'}">checked="checked"</c:if> /> ON
111	113
112	114	<input type="radio" name="grdNoti" id="grdNoti2" value="N" <c:if test="${grdNoti eq 'N'}">checked="checked"</c:if> /> OFF
113	115	</td>
	116	+
114	117	</tr>
115	118	<tr>
116		- <th>누적결제 적용일자</th>
	119	+ <th>누적결제 시작일자</th>
117	120	<td>
118	121	<input type="hidden" name="cal_url" id="cal_url" value="/sym/cmm/EgovNormalCalPopup.do">
119	122	<a href="#" onclick="javascript:fn_egov_NormalCalendar(document.forms.listForm, document.forms.listForm.ntceBgndeYYYMMDD);">
...	...	@@ -123,6 +126,10 @@
123	126	<input type="button" class="calBtn">
124	127	</a>
125	128	</td>
	129	+ <th>누적결제 계산기간</th>
	130	+ <td>
	131	+ <input type="text" name="grdPeriod" value="<c:out value="${grdPeriod}" />" style="height: 20px; width: 150px; padding: 5px 5px 5px 5px;" />
	132	+ </td>
126	133	</tr>
127	134	</tbody>
128	135	</table>

Delete comment