Commit @d552b98eb3b5d5327ad38a1563b0497b2bccbb13

name 2023-08-23

Merge branch 'master' of http://dudgusw@vcs.iten.co.kr:9999/hylee/mjon_git

@d552b98eb3b5d5327ad38a1563b0497b2bccbb13

c27af4e

d552b98

src/main/java/itn/let/fax/addr/web/FaxAddrController.java

--- src/main/java/itn/let/fax/addr/web/FaxAddrController.java

+++ src/main/java/itn/let/fax/addr/web/FaxAddrController.java

...	...	@@ -317,7 +317,43 @@
317	317	return "/web/fax/addr/FaxAddrListPrint";
318	318	}
319	319
320		-
	320	+ /**
	321	+ * 주소록 상세정보 ajax
	322	+ * @param addrCheck
	323	+ * @param request
	324	+ * @param addrVO
	325	+ * @param model
	326	+ * @param redirectAttributes
	327	+ * @return
	328	+ * @throws Exception
	329	+ */
	330	+ @RequestMapping("/web/mjon/fax/addr/selectFaxAddrDetailAjax.do")
	331	+ public ModelAndView selectAddrDetailAjax(HttpServletRequest request,
	332	+ FaxAddrVO addrVO, Model model) throws Exception {
	333	+
	334	+ ModelAndView modelAndView = new ModelAndView();
	335	+ modelAndView.setViewName("jsonView");
	336	+
	337	+ boolean isSuccess = true;
	338	+ String msg = "";
	339	+ FaxAddrVO addrInfo = null;
	340	+
	341	+ try {
	342	+
	343	+ addrInfo = faxAddrService.selectFaxAddrDetail(addrVO);
	344	+
	345	+ } catch (Exception e) {
	346	+ isSuccess = false;
	347	+ msg = e.getMessage();
	348	+ }
	349	+
	350	+ modelAndView.addObject("isSuccess", isSuccess);
	351	+ modelAndView.addObject("msg", msg);
	352	+ modelAndView.addObject("addrInfo", addrInfo);
	353	+
	354	+ return modelAndView;
	355	+
	356	+ }
321	357
322	358	/**
323	359	* 주소록 그룹 삭제 로직 ajax

c27af4e

d552b98

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 MberGrdVO selectMberGrdSettingDetail(MberGrdVO mberGrdVO) throws Exception;
 	
+	// 회원별 설정 상세(White)
+	public MberGrdVO selectMberGrdSettingDetailWhite(MberGrdVO mberGrdVO) throws Exception;
+	
 	// 등급제 설정 일괄변경
 	public int updateGrdSettingList(MberGrdVO mberGrdVO) throws Exception;
 

 	// 회원별 등급 등록 All => 기존대상자 제외
 	public void insertMberGrdAllByExist(MberGrdVO mberGrdVO)  throws Exception;
 	
+	// 회원별 등급 등록 By MberId
+	public void insertMberGrdByMberId(MberGrdVO mberGrdVO)  throws Exception;
+	
 	// 회원별 등급 히스토리 등록 All
 	public void insertMberGrdHistAll(MberGrdVO mberGrdVO)  throws Exception;
 	

c27af4e

d552b98

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


 		return (MberGrdVO) select("mberGrdDAO.selectMberGrdSettingDetail", mberGrdVO);
 	}
 	
+	// 회원별 설정 상세(White)
+	public MberGrdVO selectMberGrdSettingDetailWhite(MberGrdVO mberGrdVO) throws Exception{
+		return (MberGrdVO) select("mberGrdDAO.selectMberGrdSettingDetailWhite", mberGrdVO);
+	}
+	
 	// 등급제 설정 일괄변경
 	public int updateGrdSetting(MberGrdVO mberGrdVO) throws Exception {
 		return update("mberGrdDAO.updateGrdSetting", mberGrdVO);

 		insert("mberGrdDAO.insertMberGrdAllByExist", mberGrdVO);
 	}
 	
+	// 회원별 등급 등록 By MberId
+	public void insertMberGrdByMberId(MberGrdVO mberGrdVO) throws Exception{
+		insert("mberGrdDAO.insertMberGrdByMberId", mberGrdVO);
+	}
+	
 	// 회원별 등급 히스토리 등록 All
 	public void insertMberGrdHistAll(MberGrdVO mberGrdVO) throws Exception{
 		insert("mberGrdDAO.insertMberGrdHistAll", mberGrdVO);

c27af4e

d552b98

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


 		return mberGrdDAO.selectMberGrdSettingDetail(mberGrdVO);
 	}	
 	
+	// 회원별 설정 상세(White)
+	@Override
+	public MberGrdVO selectMberGrdSettingDetailWhite(MberGrdVO mberGrdVO) throws Exception {
+		return mberGrdDAO.selectMberGrdSettingDetailWhite(mberGrdVO);
+	}	
+	
 	// 등급제 설정 일괄변경
 	@Override
 	public int updateGrdSettingList(MberGrdVO mberGrdVO) throws Exception {

 	@Override
 	public void insertMberGrdAllByExist(MberGrdVO mberGrdVO) throws Exception {
 		mberGrdDAO.insertMberGrdAllByExist(mberGrdVO);
+	}
+	
+	// 회원별 등급 등록 By MberId
+	@Override
+	public void insertMberGrdByMberId(MberGrdVO mberGrdVO) throws Exception {
+		mberGrdDAO.insertMberGrdByMberId(mberGrdVO);
 	}
 	
 	// 회원별 등급 히스토리 등록 All

 	    				    	MberGrdVO mberGrdVO5 = new MberGrdVO();
 	    						mberGrdVO5 = selectMberGrdDetail(mberGrdVO);
 	    						if (mberGrdVO5 != null) {
+	    							// 업데이트
 	    							updateMberGrdOk(mberGrdVO);
 	    								
 	    							// 회원별 등급 히스토리 인서트

 	    							insertMberGrdHist(mberGrdVO);
 	    						}
 	    					}
-	    				}					
-	    			}			
+	    				}
+	    				else {
+	    					System.out.println("Step 3. ELSE => 화이트등급 인서트");
+	    					
+	    					// Step 4. 등급제 설정값 조회
+	    					System.out.println("Step 4. 등급제 설정값 조회");
+	    					MberGrdVO mberGrdVO4 = new MberGrdVO();
+	    					mberGrdVO4 = selectMberGrdSettingDetailWhite(mberGrdVO);
+	    					if (mberGrdVO4 != null) {
+	    						mberGrdVO.setAmt("0");
+	    				    	mberGrdVO.setTotAmt(0);
+	    				    	mberGrdVO.setGrdSetNo(mberGrdVO4.getGrdSetNo());
+	    				    	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 업데이트
+	    						System.out.println("Step 5. 인서트 Or 업데이트");
+	    				    	MberGrdVO mberGrdVO5 = new MberGrdVO();
+	    						mberGrdVO5 = selectMberGrdDetail(mberGrdVO);
+	    						if (mberGrdVO5 != null) {
+	    							// 업데이트
+	    							updateMberGrdOk(mberGrdVO);
+	    								
+	    							// 회원별 등급 히스토리 인서트
+	    							insertMberGrdHist(mberGrdVO);							
+	    						}
+	    						else {
+	    							// 인서트
+	    							insertMberGrd(mberGrdVO);
+	    							
+	    							// 회원별 등급 히스토리 인서트
+	    							insertMberGrdHist(mberGrdVO);
+	    						}
+	    					}	    					
+	    				}
+	    			}	
+	    			else {
+		    			System.out.println("Step 2. ELSE 등급제 종료");
+		    			updateMberGrdEndByUser(mberGrdVO);
+	    			}	    			
 	    		}
     		}
     		System.out.println("END 회원별 등급 적용");

 	    				    	MberGrdVO mberGrdVO5 = new MberGrdVO();
 	    						mberGrdVO5 = selectMberGrdDetail(mberGrdVO);
 	    						if (mberGrdVO5 != null) {
+	    							// 업데이트
 	    							updateMberGrdOk(mberGrdVO);
 	    						}
 	    						else {

 	    							insertMberGrd(mberGrdVO);
 	    						}
 	    					}
-	    				}					
-	    			}			
+	    				}
+	    				else {
+	    					System.out.println("Step 3. ELSE => 화이트등급 인서트");
+	    					
+	    					// Step 4. 등급제 설정값 조회
+	    					System.out.println("Step 4. 등급제 설정값 조회");
+	    					MberGrdVO mberGrdVO4 = new MberGrdVO();
+	    					mberGrdVO4 = selectMberGrdSettingDetailWhite(mberGrdVO);
+	    					if (mberGrdVO4 != null) {
+	    						mberGrdVO.setAmt("0");
+	    				    	mberGrdVO.setTotAmt(0);
+	    				    	mberGrdVO.setGrdSetNo(mberGrdVO4.getGrdSetNo());
+	    				    	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 업데이트
+	    						System.out.println("Step 5. 인서트 Or 업데이트");
+	    				    	MberGrdVO mberGrdVO5 = new MberGrdVO();
+	    						mberGrdVO5 = selectMberGrdDetail(mberGrdVO);
+	    						if (mberGrdVO5 != null) {
+	    							// 업데이트
+	    							updateMberGrdOk(mberGrdVO);
+	    								
+	    							// 회원별 등급 히스토리 인서트
+	    							insertMberGrdHist(mberGrdVO);							
+	    						}
+	    						else {
+	    							// 인서트
+	    							insertMberGrd(mberGrdVO);
+	    							
+	    							// 회원별 등급 히스토리 인서트
+	    							insertMberGrdHist(mberGrdVO);
+	    						}
+	    					}	    					
+	    				}
+	    			}
+	    			else {
+		    			System.out.println("Step 2. ELSE 등급제 종료");
+		    			updateMberGrdEndByUser(mberGrdVO);
+	    			}
 	    		}
     		}
     		System.out.println("END 회원별 등급 적용(로그인, 환불시 사용 => 히스토리 저장 제외)");

c27af4e

d552b98

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


     	// 로그인VO에서  사용자 정보 가져오기
     	LoginVO	loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
     	String frstRegisterId = loginVO == null ? "" : loginVO.getId();
-    	mberGrdVO.setEditId(frstRegisterId);		// 최초등록자ID
-
+		mberGrdVO.setRegId(frstRegisterId);
+		mberGrdVO.setEditId(frstRegisterId);
+		
         try{
-        	
-        	// 회원 등급제 복원
-        	mberGrdService.updateMberGrdRestoreByUser(mberGrdVO);
-        	
-        	// 회원 등급 변경(환불후) => 기존등급 상관없이 업데이트
-        	mberGrdService.updateMberGrdAfterRefund(mberGrdVO);
-       		
+    		
+        	// Step 1. 등급제 시행 ON 일경우(시행일자 진행여부 Y일경우)
+    		System.out.println("Step 1. 등급제 시행 ON 일경우(시행일자 진행여부 Y일경우)");
+    		MberGrdVO mberGrdVO1 = new MberGrdVO();
+    		mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
+    		if (mberGrdVO1.getGrdNoti().equals("Y")) {
+    			mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate());
+    			
+    			// Step 2. 문자할인, B선라인, 스팸회원 대상자 제외
+    			System.out.println("Step 2. 문자할인, B선라인, 스팸회원 대상자 제외");
+    			int isMberGrd = mberGrdService.selectMberGrdCnt(mberGrdVO.getMberId());	// 등급제 대상여부(1: 대상, 0: 미대상)
+    			if(isMberGrd == 1) {        	
+		        	// 회원 등급제 복원
+		        	mberGrdService.updateMberGrdRestoreByUser(mberGrdVO);
+		        	
+		        	// 회원 등급 변경(환불후) => 기존등급 상관없이 업데이트
+		        	mberGrdService.updateMberGrdAfterRefund(mberGrdVO);
+    			}
+    			else {
+    				isSuccess = false;
+    				msg = "문자할인, B선라인, 스팸회원 대상자는 등급제 대상자가 아닙니다.";    				
+    			}
+    		}
+			else {
+				isSuccess = false;
+				msg = "등급제 시행 OFF 일경우 복원이 불가합니다.";    				
+			}    		
 		}
 		catch(Exception e) {
 			isSuccess = false;

c27af4e

d552b98

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

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

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


 				
 				mberManageService.insertCmpUsrHst(mberManageVO);
 				
-				//Slack 알림 전송 처리
-				String msg = "[문자온] 기업회원 담당자변경 요청 - " + mberManageVO.getMberNm() +"("+ mberManageVO.getMberId() + ")";
-				mjonCommon.sendSimpleSlackMsg(msg);
+				// 법인폰 알람여부 체크
+				JoinSettingVO joinSettingVO = new JoinSettingVO();
+				joinSettingVO = egovSiteManagerService.selectAdminNotiDetail();
+				// 이메일 체크
+				if (joinSettingVO != null && joinSettingVO.getEmailNoti().equals("Y")) {
+					String emailTitle = "회원관리 > 기업회원 담당자변경 요청";
+					
+					// CS관리자 이메일 알림전송
+					mjonNoticeSendUtil.csAdminEmailNoticeSend(mberManageVO.getMberNm(), mberManageVO.getMberId(), emailTitle);
+				}
+
+				// SMS 체크			
+				if (joinSettingVO != null && joinSettingVO.getSmsNoti().equals("Y")) {
+					String smsTitle = "기업회원 담당자변경 요청";
+					
+					// CS관리자 SMS 알림전송
+					mjonNoticeSendUtil.csAdminSmsNoticeSend(mberManageVO.getMberId(), smsTitle);				
+				}
+
+				// SLACK 체크
+				if (joinSettingVO != null && joinSettingVO.getSlackNoti().equals("Y")) {			
+					// Slack 메시지 발송(단순본문)
+					String msg = "[문자온] 기업회원 담당자변경 요청 - " + mberManageVO.getMberNm() +"("+ mberManageVO.getMberId() + ")";
+					mjonCommon.sendSimpleSlackMsg(msg);
+				}
 				
 			}
 			

 			
 			mberManageService.insertCmpUsrHst(mberManageVO);
 			
-			//Slack 알림 처리
-			String msg = "[문자온] 기업회원 정보변경 요청 - " + mberManageVO.getMberNm() +"("+ mberManageVO.getMberId() + ")";
-			mjonCommon.sendSimpleSlackMsg(msg);
+			// 법인폰 알람여부 체크
+			JoinSettingVO joinSettingVO = new JoinSettingVO();
+			joinSettingVO = egovSiteManagerService.selectAdminNotiDetail();
+			// 이메일 체크
+			if (joinSettingVO != null && joinSettingVO.getEmailNoti().equals("Y")) {
+				String emailTitle = "회원관리 > 기업회원 정보변경 요청";
+				
+				// CS관리자 이메일 알림전송
+				mjonNoticeSendUtil.csAdminEmailNoticeSend(mberManageVO.getMberNm(), mberManageVO.getMberId(), emailTitle);
+			}
+
+			// SMS 체크			
+			if (joinSettingVO != null && joinSettingVO.getSmsNoti().equals("Y")) {
+				String smsTitle = "기업회원 정보변경 요청";
+				
+				// CS관리자 SMS 알림전송
+				mjonNoticeSendUtil.csAdminSmsNoticeSend(mberManageVO.getMberId(), smsTitle);				
+			}
+
+			// SLACK 체크
+			if (joinSettingVO != null && joinSettingVO.getSlackNoti().equals("Y")) {			
+				// Slack 메시지 발송(단순본문)
+				String msg = "[문자온] 기업회원 정보변경 요청 - " + mberManageVO.getMberNm() +"("+ mberManageVO.getMberId() + ")";
+				mjonCommon.sendSimpleSlackMsg(msg);
+			}
 			
 			modelAndView.addObject("result", "success");
 			

c27af4e

d552b98

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


 		LIMIT 1
 	</select>
 
+	<!-- 등급제 설정 상세 -->
+	<select id="mberGrdDAO.selectMberGrdSettingDetailWhite" parameterClass="mberGrdVO" resultClass="mberGrdVO">
+		SELECT 
+			A.GRD_SET_NO AS grdSetNo
+			, A.GRD_SET_NM AS grdSetNm
+			, FLOOR(A.STD_AMT) AS stdAmt
+			, FORMAT(FLOOR(A.STD_AMT),0) AS stdAmtComma 
+			, A.SHORT_PRICE AS shortPrice 
+			, A.LONG_PRICE AS longPrice 
+			, A.PICTURE_PRICE AS picturePrice 
+			, A.PICTURE2_PRICE AS picture2Price 
+			, A.PICTURE3_PRICE AS picture3Price 
+			, A.REG_ID AS regId 
+			, A.REG_DATE AS regDate 
+			, A.EDIT_ID AS editId 
+			, A.EDIT_DATE AS editDate 
+		FROM MJ_MBER_GRD_SETTING A
+		ORDER BY A.GRD_SET_NO DESC
+		LIMIT 1
+	</select>
+
+
 	<!-- 등급제 설정 일괄변경 일괄변경 -->
 	<update id="mberGrdDAO.updateGrdSetting" parameterClass="mberGrdVO">
 		UPDATE MJ_MBER_GRD_SETTING A 

 			, NOW()
 			, '9999:12:31 23:59:59'
 			, 'Y'
-			, ''
+			, #regId#
 			, NOW()
-			, ''
+			, #editId#
 			, NOW()	
 		FROM (
 			SELECT

 			AND M.spamYn = 'N'	
 	</insert>			
 	
+	<!-- 회원별 등급 등록 By MberId -->
+	<insert id="mberGrdDAO.insertMberGrdByMberId" 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
+			M.MBER_ID
+			, M.GRD_SET_NO
+			, M.SHORT_PRICE
+			, M.LONG_PRICE
+			, M.PICTURE_PRICE
+			, M.PICTURE2_PRICE
+			, M.PICTURE3_PRICE
+			, 0
+			, 0
+			, #grdNewDate#
+			, NOW()
+			, '9999:12:31 23:59:59'
+			, 'Y'
+			, #regId#
+			, NOW()
+			, #editId#
+			, NOW()	
+		FROM (
+			SELECT
+				A.MBER_ID
+				, S.GRD_SET_NO
+				, S.SHORT_PRICE
+				, S.LONG_PRICE
+				, S.PICTURE_PRICE
+				, S.PICTURE2_PRICE
+				, S.PICTURE3_PRICE
+				, 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
+			INNER JOIN MJ_MBER_GRD_SETTING S
+				ON S.GRD_SET_NO = (SELECT MAX(GRD_SET_NO) FROM MJ_MBER_GRD_SETTING)
+			JOIN MJ_MBER_SETTING B			
+			WHERE A.MBER_STTUS = 'Y'
+				AND MBER_ID = #mberId#
+		) M
+		WHERE M.isSalePrice = 'N'
+			AND M.blineCode = 'N'
+			AND M.spamYn = 'N'	
+	</insert>
+		
 	<!-- 회원별 등급 히스토리 등록 All -->
 	<insert id="mberGrdDAO.insertMberGrdHistAll" parameterClass="mberGrdVO">	
 		INSERT INTO MJ_MBER_GRD_HIST

 			, A.AMT = B.AMT_SUM
 			, A.TOT_AMT = B.AMT_SUM
 			, A.GRD_DATE = CONCAT(DATE_FORMAT(#grdNewDate#, '%Y-%m-%d'), ' ', '00:00:00')
+			, A.EDIT_ID	= #editId#
 			, A.EDIT_DATE = NOW()
 			, A.TEMP_YN = 'Y'
-		WHERE B.GRD_SET_NO IS NOT NULL
+		WHERE 1=1
+			AND B.GRD_SET_NO IS NOT NULL
 			AND A.GRD_STATUS = 'Y'
+			AND A.TEMP_YN = 'N'
 			AND NOW() BETWEEN A.GRD_START_DATE AND A.GRD_END_DATE
 	]]>
 	</update>	

 			, 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
+		WHERE  1=1
+			AND B.GRD_SET_NO IS NOT NULL
 			AND A.MBER_ID = #mberId#
 			AND A.GRD_STATUS = 'Y'
 			AND NOW() BETWEEN A.GRD_START_DATE AND A.GRD_END_DATE

 			, A.AMT = 0
 			, A.TOT_AMT = 0
 			, A.GRD_DATE = CONCAT(DATE_FORMAT(#grdNewDate#, '%Y-%m-%d'), ' ', '00:00:00')
+			, A.EDIT_ID	= #editId#
 			, A.EDIT_DATE = NOW()
 			, A.TEMP_YN = 'Y'
 			, A.GRD_END_DATE = '9999:12:31 23:59:59'

 			, A.AMT = 0
 			, A.TOT_AMT = 0
 			, A.GRD_DATE = CONCAT(DATE_FORMAT(#grdNewDate#, '%Y-%m-%d'), ' ', '00:00:00')
+			, A.EDIT_ID	= #editId#
 			, A.EDIT_DATE = NOW()
 		WHERE C.GRD_SET_NO = (SELECT MAX(GRD_SET_NO) FROM MJ_MBER_GRD_SETTING)
 	]]>

 		UPDATE MJ_MBER_GRD_INFO SET
 			GRD_END_DATE			= NOW()
 			, GRD_STATUS			= 'E'
+			, EDIT_ID	= #editId#
 			, EDIT_DATE				= NOW()
+			, TEMP_YN = 'Y'
 		WHERE MBER_ID IN (
 			SELECT
 				M.MBER_ID

 				JOIN MJ_MBER_SETTING B
 				WHERE 1=1
 					AND A.MBER_STTUS = 'Y'
-					AND G.GRD_STATUS != 'E'
 			) M
 			WHERE M.IS_SALE_PRICE = 'Y'
 				OR M.BLINE_CODE != 'N'

 			, GRD_STATUS			= 'E'
 			, EDIT_ID				= #editId#
 			, EDIT_DATE				= NOW()
+			, TEMP_YN = 'Y'			
 		WHERE 
 			GRD_STATUS != 'E'
 			AND MBER_ID = #mberId#

c27af4e

d552b98

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


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

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

c27af4e

d552b98

src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrListAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrListAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrListAjax.jsp


 }
 
 //메모 레이어 열 때 메모 데이터 전달
-function memoOpen(comment, id) {
+function memoOpen(id) {
 	var form = document.addrMemoForm;
 	form.addrCheck.value=id;
-	$('#textareaMemo').text(comment);
-	
+
+	// 메모내용 가져오기
+	$.ajax({
+		url : "<c:url value='/web/mjon/fax/addr/selectFaxAddrDetailAjax.do'/>", 
+		type : 'POST', 
+		data : {"addrId" : id},
+		dataType:'json',
+		async: false,
+		success : function(data, status){
+			if(data.isSuccess == true) {
+				$('#textareaMemo').text(data.addrInfo.addrComment);
+			} 
+			else {
+				//alert("Message : " + msg);
+			}			
+		},
+		error: function (e) { 
+			console.log("ERROR : ", e); 
+			alert("에러가 발생했습니다.");  
+		}
+	});	
 }
+
 // 메모 저장
 function updateMemo() {
 	var form = document.addrMemoForm;

 									</p>
 								</td>
 								<td>
-									<button type="button" onclick="memoOpen('<c:out value='${result.addrComment}' />','<c:out value='${result.addrId}' />'); return false;" data-tooltip="adr_popup13">
+									<button type="button" onclick="memoOpen('<c:out value='${result.addrId}' />'); return false;" data-tooltip="adr_popup13">
 										<img src="/publish/images/content/memo_img.png" alt="메모">
 									</button>
 								</td>

Add a comment

Open 0
Closed 0

List

...	...	@@ -75,6 +75,12 @@
75	75	return mberGrdDAO.selectMberGrdSettingDetail(mberGrdVO);
76	76	}
77	77
	78	+ // 회원별 설정 상세(White)
	79	+ @Override
	80	+ public MberGrdVO selectMberGrdSettingDetailWhite(MberGrdVO mberGrdVO) throws Exception {
	81	+ return mberGrdDAO.selectMberGrdSettingDetailWhite(mberGrdVO);
	82	+ }
	83	+
78	84	// 등급제 설정 일괄변경
79	85	@Override
80	86	public int updateGrdSettingList(MberGrdVO mberGrdVO) throws Exception {
...	...	@@ -154,6 +160,12 @@
154	160	@Override
155	161	public void insertMberGrdAllByExist(MberGrdVO mberGrdVO) throws Exception {
156	162	mberGrdDAO.insertMberGrdAllByExist(mberGrdVO);
	163	+ }
	164	+
	165	+ // 회원별 등급 등록 By MberId
	166	+ @Override
	167	+ public void insertMberGrdByMberId(MberGrdVO mberGrdVO) throws Exception {
	168	+ mberGrdDAO.insertMberGrdByMberId(mberGrdVO);
157	169	}
158	170
159	171	// 회원별 등급 히스토리 등록 All
...	...	@@ -368,6 +380,7 @@
368	380	MberGrdVO mberGrdVO5 = new MberGrdVO();
369	381	mberGrdVO5 = selectMberGrdDetail(mberGrdVO);
370	382	if (mberGrdVO5 != null) {
	383	+ // 업데이트
371	384	updateMberGrdOk(mberGrdVO);
372	385
373	386	// 회원별 등급 히스토리 인서트
...	...	@@ -381,8 +394,53 @@
381	394	insertMberGrdHist(mberGrdVO);
382	395	}
383	396	}
384		- }
385		- }
	397	+ }
	398	+ else {
	399	+ System.out.println("Step 3. ELSE => 화이트등급 인서트");
	400	+
	401	+ // Step 4. 등급제 설정값 조회
	402	+ System.out.println("Step 4. 등급제 설정값 조회");
	403	+ MberGrdVO mberGrdVO4 = new MberGrdVO();
	404	+ mberGrdVO4 = selectMberGrdSettingDetailWhite(mberGrdVO);
	405	+ if (mberGrdVO4 != null) {
	406	+ mberGrdVO.setAmt("0");
	407	+ mberGrdVO.setTotAmt(0);
	408	+ mberGrdVO.setGrdSetNo(mberGrdVO4.getGrdSetNo());
	409	+ mberGrdVO.setShortPrice(mberGrdVO4.getShortPrice());
	410	+ mberGrdVO.setLongPrice(mberGrdVO4.getLongPrice());
	411	+ mberGrdVO.setPicturePrice(mberGrdVO4.getPicturePrice());
	412	+ mberGrdVO.setPicture2Price(mberGrdVO4.getPicture2Price());
	413	+ mberGrdVO.setPicture3Price(mberGrdVO4.getPicture3Price());
	414	+ mberGrdVO.setGrdDate(mberGrdVO.getGrdDate());
	415	+ mberGrdVO.setGrdStartDate(nowDate + " 00:00:00");
	416	+ mberGrdVO.setGrdEndDate("9999:12:31 23:59:59");
	417	+ mberGrdVO.setGrdStatus("Y");
	418	+
	419	+ // Step 5. 인서트 Or 업데이트
	420	+ System.out.println("Step 5. 인서트 Or 업데이트");
	421	+ MberGrdVO mberGrdVO5 = new MberGrdVO();
	422	+ mberGrdVO5 = selectMberGrdDetail(mberGrdVO);
	423	+ if (mberGrdVO5 != null) {
	424	+ // 업데이트
	425	+ updateMberGrdOk(mberGrdVO);
	426	+
	427	+ // 회원별 등급 히스토리 인서트
	428	+ insertMberGrdHist(mberGrdVO);
	429	+ }
	430	+ else {
	431	+ // 인서트
	432	+ insertMberGrd(mberGrdVO);
	433	+
	434	+ // 회원별 등급 히스토리 인서트
	435	+ insertMberGrdHist(mberGrdVO);
	436	+ }
	437	+ }
	438	+ }
	439	+ }
	440	+ else {
	441	+ System.out.println("Step 2. ELSE 등급제 종료");
	442	+ updateMberGrdEndByUser(mberGrdVO);
	443	+ }
386	444	}
387	445	}
388	446	System.out.println("END 회원별 등급 적용");
...	...	@@ -456,6 +514,7 @@
456	514	MberGrdVO mberGrdVO5 = new MberGrdVO();
457	515	mberGrdVO5 = selectMberGrdDetail(mberGrdVO);
458	516	if (mberGrdVO5 != null) {
	517	+ // 업데이트
459	518	updateMberGrdOk(mberGrdVO);
460	519	}
461	520	else {
...	...	@@ -463,8 +522,53 @@
463	522	insertMberGrd(mberGrdVO);
464	523	}
465	524	}
466		- }
467		- }
	525	+ }
	526	+ else {
	527	+ System.out.println("Step 3. ELSE => 화이트등급 인서트");
	528	+
	529	+ // Step 4. 등급제 설정값 조회
	530	+ System.out.println("Step 4. 등급제 설정값 조회");
	531	+ MberGrdVO mberGrdVO4 = new MberGrdVO();
	532	+ mberGrdVO4 = selectMberGrdSettingDetailWhite(mberGrdVO);
	533	+ if (mberGrdVO4 != null) {
	534	+ mberGrdVO.setAmt("0");
	535	+ mberGrdVO.setTotAmt(0);
	536	+ mberGrdVO.setGrdSetNo(mberGrdVO4.getGrdSetNo());
	537	+ mberGrdVO.setShortPrice(mberGrdVO4.getShortPrice());
	538	+ mberGrdVO.setLongPrice(mberGrdVO4.getLongPrice());
	539	+ mberGrdVO.setPicturePrice(mberGrdVO4.getPicturePrice());
	540	+ mberGrdVO.setPicture2Price(mberGrdVO4.getPicture2Price());
	541	+ mberGrdVO.setPicture3Price(mberGrdVO4.getPicture3Price());
	542	+ mberGrdVO.setGrdDate(mberGrdVO.getGrdDate());
	543	+ mberGrdVO.setGrdStartDate(nowDate + " 00:00:00");
	544	+ mberGrdVO.setGrdEndDate("9999:12:31 23:59:59");
	545	+ mberGrdVO.setGrdStatus("Y");
	546	+
	547	+ // Step 5. 인서트 Or 업데이트
	548	+ System.out.println("Step 5. 인서트 Or 업데이트");
	549	+ MberGrdVO mberGrdVO5 = new MberGrdVO();
	550	+ mberGrdVO5 = selectMberGrdDetail(mberGrdVO);
	551	+ if (mberGrdVO5 != null) {
	552	+ // 업데이트
	553	+ updateMberGrdOk(mberGrdVO);
	554	+
	555	+ // 회원별 등급 히스토리 인서트
	556	+ insertMberGrdHist(mberGrdVO);
	557	+ }
	558	+ else {
	559	+ // 인서트
	560	+ insertMberGrd(mberGrdVO);
	561	+
	562	+ // 회원별 등급 히스토리 인서트
	563	+ insertMberGrdHist(mberGrdVO);
	564	+ }
	565	+ }
	566	+ }
	567	+ }
	568	+ else {
	569	+ System.out.println("Step 2. ELSE 등급제 종료");
	570	+ updateMberGrdEndByUser(mberGrdVO);
	571	+ }
468	572	}
469	573	}
470	574	System.out.println("END 회원별 등급 적용(로그인, 환불시 사용 => 히스토리 저장 제외)");

...	...	@@ -466,16 +466,37 @@
466	466	// 로그인VO에서 사용자 정보 가져오기
467	467	LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
468	468	String frstRegisterId = loginVO == null ? "" : loginVO.getId();
469		- mberGrdVO.setEditId(frstRegisterId); // 최초등록자ID
470		-
	469	+ mberGrdVO.setRegId(frstRegisterId);
	470	+ mberGrdVO.setEditId(frstRegisterId);
	471	+
471	472	try{
472		-
473		- // 회원 등급제 복원
474		- mberGrdService.updateMberGrdRestoreByUser(mberGrdVO);
475		-
476		- // 회원 등급 변경(환불후) => 기존등급 상관없이 업데이트
477		- mberGrdService.updateMberGrdAfterRefund(mberGrdVO);
478		-
	473	+
	474	+ // Step 1. 등급제 시행 ON 일경우(시행일자 진행여부 Y일경우)
	475	+ System.out.println("Step 1. 등급제 시행 ON 일경우(시행일자 진행여부 Y일경우)");
	476	+ MberGrdVO mberGrdVO1 = new MberGrdVO();
	477	+ mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
	478	+ if (mberGrdVO1.getGrdNoti().equals("Y")) {
	479	+ mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate());
	480	+
	481	+ // Step 2. 문자할인, B선라인, 스팸회원 대상자 제외
	482	+ System.out.println("Step 2. 문자할인, B선라인, 스팸회원 대상자 제외");
	483	+ int isMberGrd = mberGrdService.selectMberGrdCnt(mberGrdVO.getMberId()); // 등급제 대상여부(1: 대상, 0: 미대상)
	484	+ if(isMberGrd == 1) {
	485	+ // 회원 등급제 복원
	486	+ mberGrdService.updateMberGrdRestoreByUser(mberGrdVO);
	487	+
	488	+ // 회원 등급 변경(환불후) => 기존등급 상관없이 업데이트
	489	+ mberGrdService.updateMberGrdAfterRefund(mberGrdVO);
	490	+ }
	491	+ else {
	492	+ isSuccess = false;
	493	+ msg = "문자할인, B선라인, 스팸회원 대상자는 등급제 대상자가 아닙니다.";
	494	+ }
	495	+ }
	496	+ else {
	497	+ isSuccess = false;
	498	+ msg = "등급제 시행 OFF 일경우 복원이 불가합니다.";
	499	+ }
479	500	}
480	501	catch(Exception e) {
481	502	isSuccess = false;

...	...	@@ -848,9 +848,31 @@
848	848
849	849	mberManageService.insertCmpUsrHst(mberManageVO);
850	850
851		- //Slack 알림 전송 처리
852		- String msg = "[문자온] 기업회원 담당자변경 요청 - " + mberManageVO.getMberNm() +"("+ mberManageVO.getMberId() + ")";
853		- mjonCommon.sendSimpleSlackMsg(msg);
	851	+ // 법인폰 알람여부 체크
	852	+ JoinSettingVO joinSettingVO = new JoinSettingVO();
	853	+ joinSettingVO = egovSiteManagerService.selectAdminNotiDetail();
	854	+ // 이메일 체크
	855	+ if (joinSettingVO != null && joinSettingVO.getEmailNoti().equals("Y")) {
	856	+ String emailTitle = "회원관리 > 기업회원 담당자변경 요청";
	857	+
	858	+ // CS관리자 이메일 알림전송
	859	+ mjonNoticeSendUtil.csAdminEmailNoticeSend(mberManageVO.getMberNm(), mberManageVO.getMberId(), emailTitle);
	860	+ }
	861	+
	862	+ // SMS 체크
	863	+ if (joinSettingVO != null && joinSettingVO.getSmsNoti().equals("Y")) {
	864	+ String smsTitle = "기업회원 담당자변경 요청";
	865	+
	866	+ // CS관리자 SMS 알림전송
	867	+ mjonNoticeSendUtil.csAdminSmsNoticeSend(mberManageVO.getMberId(), smsTitle);
	868	+ }
	869	+
	870	+ // SLACK 체크
	871	+ if (joinSettingVO != null && joinSettingVO.getSlackNoti().equals("Y")) {
	872	+ // Slack 메시지 발송(단순본문)
	873	+ String msg = "[문자온] 기업회원 담당자변경 요청 - " + mberManageVO.getMberNm() +"("+ mberManageVO.getMberId() + ")";
	874	+ mjonCommon.sendSimpleSlackMsg(msg);
	875	+ }
854	876
855	877	}
856	878
...	...	@@ -932,9 +954,31 @@
932	954
933	955	mberManageService.insertCmpUsrHst(mberManageVO);
934	956
935		- //Slack 알림 처리
936		- String msg = "[문자온] 기업회원 정보변경 요청 - " + mberManageVO.getMberNm() +"("+ mberManageVO.getMberId() + ")";
937		- mjonCommon.sendSimpleSlackMsg(msg);
	957	+ // 법인폰 알람여부 체크
	958	+ JoinSettingVO joinSettingVO = new JoinSettingVO();
	959	+ joinSettingVO = egovSiteManagerService.selectAdminNotiDetail();
	960	+ // 이메일 체크
	961	+ if (joinSettingVO != null && joinSettingVO.getEmailNoti().equals("Y")) {
	962	+ String emailTitle = "회원관리 > 기업회원 정보변경 요청";
	963	+
	964	+ // CS관리자 이메일 알림전송
	965	+ mjonNoticeSendUtil.csAdminEmailNoticeSend(mberManageVO.getMberNm(), mberManageVO.getMberId(), emailTitle);
	966	+ }
	967	+
	968	+ // SMS 체크
	969	+ if (joinSettingVO != null && joinSettingVO.getSmsNoti().equals("Y")) {
	970	+ String smsTitle = "기업회원 정보변경 요청";
	971	+
	972	+ // CS관리자 SMS 알림전송
	973	+ mjonNoticeSendUtil.csAdminSmsNoticeSend(mberManageVO.getMberId(), smsTitle);
	974	+ }
	975	+
	976	+ // SLACK 체크
	977	+ if (joinSettingVO != null && joinSettingVO.getSlackNoti().equals("Y")) {
	978	+ // Slack 메시지 발송(단순본문)
	979	+ String msg = "[문자온] 기업회원 정보변경 요청 - " + mberManageVO.getMberNm() +"("+ mberManageVO.getMberId() + ")";
	980	+ mjonCommon.sendSimpleSlackMsg(msg);
	981	+ }
938	982
939	983	modelAndView.addObject("result", "success");
940	984

...	...	@@ -102,6 +102,28 @@
102	102	LIMIT 1
103	103	</select>
104	104
	105	+ <!-- 등급제 설정 상세 -->
	106	+ <select id="mberGrdDAO.selectMberGrdSettingDetailWhite" parameterClass="mberGrdVO" resultClass="mberGrdVO">
	107	+ SELECT
	108	+ A.GRD_SET_NO AS grdSetNo
	109	+ , A.GRD_SET_NM AS grdSetNm
	110	+ , FLOOR(A.STD_AMT) AS stdAmt
	111	+ , FORMAT(FLOOR(A.STD_AMT),0) AS stdAmtComma
	112	+ , A.SHORT_PRICE AS shortPrice
	113	+ , A.LONG_PRICE AS longPrice
	114	+ , A.PICTURE_PRICE AS picturePrice
	115	+ , A.PICTURE2_PRICE AS picture2Price
	116	+ , A.PICTURE3_PRICE AS picture3Price
	117	+ , A.REG_ID AS regId
	118	+ , A.REG_DATE AS regDate
	119	+ , A.EDIT_ID AS editId
	120	+ , A.EDIT_DATE AS editDate
	121	+ FROM MJ_MBER_GRD_SETTING A
	122	+ ORDER BY A.GRD_SET_NO DESC
	123	+ LIMIT 1
	124	+ </select>
	125	+
	126	+
105	127	<!-- 등급제 설정 일괄변경 일괄변경 -->
106	128	<update id="mberGrdDAO.updateGrdSetting" parameterClass="mberGrdVO">
107	129	UPDATE MJ_MBER_GRD_SETTING A
...	...	@@ -545,9 +567,9 @@
545	567	, NOW()
546	568	, '9999:12:31 23:59:59'
547	569	, 'Y'
548		- , ''
	570	+ , #regId#
549	571	, NOW()
550		- , ''
	572	+ , #editId#
551	573	, NOW()
552	574	FROM (
553	575	SELECT
...	...	@@ -584,6 +606,81 @@
584	606	AND M.spamYn = 'N'
585	607	</insert>
586	608
	609	+ <!-- 회원별 등급 등록 By MberId -->
	610	+ <insert id="mberGrdDAO.insertMberGrdByMberId" parameterClass="mberGrdVO">
	611	+ INSERT INTO MJ_MBER_GRD_INFO
	612	+ (
	613	+ MBER_ID
	614	+ , GRD_SET_NO
	615	+ , SHORT_PRICE
	616	+ , LONG_PRICE
	617	+ , PICTURE_PRICE
	618	+ , PICTURE2_PRICE
	619	+ , PICTURE3_PRICE
	620	+ , AMT
	621	+ , TOT_AMT
	622	+ , GRD_DATE
	623	+ , GRD_START_DATE
	624	+ , GRD_END_DATE
	625	+ , GRD_STATUS
	626	+ , REG_ID
	627	+ , REG_DATE
	628	+ , EDIT_ID
	629	+ , EDIT_DATE
	630	+ )
	631	+ SELECT
	632	+ M.MBER_ID
	633	+ , M.GRD_SET_NO
	634	+ , M.SHORT_PRICE
	635	+ , M.LONG_PRICE
	636	+ , M.PICTURE_PRICE
	637	+ , M.PICTURE2_PRICE
	638	+ , M.PICTURE3_PRICE
	639	+ , 0
	640	+ , 0
	641	+ , #grdNewDate#
	642	+ , NOW()
	643	+ , '9999:12:31 23:59:59'
	644	+ , 'Y'
	645	+ , #regId#
	646	+ , NOW()
	647	+ , #editId#
	648	+ , NOW()
	649	+ FROM (
	650	+ SELECT
	651	+ A.MBER_ID
	652	+ , S.GRD_SET_NO
	653	+ , S.SHORT_PRICE
	654	+ , S.LONG_PRICE
	655	+ , S.PICTURE_PRICE
	656	+ , S.PICTURE2_PRICE
	657	+ , S.PICTURE3_PRICE
	658	+ , IFNULL(A.BLINE_CODE, 'N') AS blineCode
	659	+ , IFNULL(A.SPAM_YN, 'N') AS spamYn
	660	+ , CASE
	661	+ WHEN
	662	+ (A.SHORT_PRICE > 0
	663	+ AND (B.SHORT_PRICE > A.SHORT_PRICE
	664	+ OR B.LONG_PRICE > A.LONG_PRICE
	665	+ OR B.PICTURE_PRICE > A.PICTURE_PRICE
	666	+ OR B.PICTURE2_PRICE > A.PICTURE2_PRICE
	667	+ OR B.PICTURE3_PRICE > A.PICTURE3_PRICE)
	668	+ )
	669	+ THEN 'Y'
	670	+ ELSE 'N'
	671	+ END isSalePrice
	672	+ FROM LETTNGNRLMBER A
	673	+ INNER JOIN MJ_MBER_GRD_SETTING S
	674	+ ON S.GRD_SET_NO = (SELECT MAX(GRD_SET_NO) FROM MJ_MBER_GRD_SETTING)
	675	+ JOIN MJ_MBER_SETTING B
	676	+ WHERE A.MBER_STTUS = 'Y'
	677	+ AND MBER_ID = #mberId#
	678	+ ) M
	679	+ WHERE M.isSalePrice = 'N'
	680	+ AND M.blineCode = 'N'
	681	+ AND M.spamYn = 'N'
	682	+ </insert>
	683	+
587	684	<!-- 회원별 등급 히스토리 등록 All -->
588	685	<insert id="mberGrdDAO.insertMberGrdHistAll" parameterClass="mberGrdVO">
589	686	INSERT INTO MJ_MBER_GRD_HIST
...	...	@@ -680,10 +777,13 @@
680	777	, A.AMT = B.AMT_SUM
681	778	, A.TOT_AMT = B.AMT_SUM
682	779	, A.GRD_DATE = CONCAT(DATE_FORMAT(#grdNewDate#, '%Y-%m-%d'), ' ', '00:00:00')
	780	+ , A.EDIT_ID = #editId#
683	781	, A.EDIT_DATE = NOW()
684	782	, A.TEMP_YN = 'Y'
685		- WHERE B.GRD_SET_NO IS NOT NULL
	783	+ WHERE 1=1
	784	+ AND B.GRD_SET_NO IS NOT NULL
686	785	AND A.GRD_STATUS = 'Y'
	786	+ AND A.TEMP_YN = 'N'
687	787	AND NOW() BETWEEN A.GRD_START_DATE AND A.GRD_END_DATE
688	788	]]>
689	789	</update>
...	...	@@ -751,7 +851,8 @@
751	851	, A.GRD_DATE = CONCAT(DATE_FORMAT(#grdNewDate#, '%Y-%m-%d'), ' ', '00:00:00')
752	852	, A.EDIT_ID = #editId#
753	853	, A.EDIT_DATE = NOW()
754		- WHERE B.GRD_SET_NO IS NOT NULL
	854	+ WHERE 1=1
	855	+ AND B.GRD_SET_NO IS NOT NULL
755	856	AND A.MBER_ID = #mberId#
756	857	AND A.GRD_STATUS = 'Y'
757	858	AND NOW() BETWEEN A.GRD_START_DATE AND A.GRD_END_DATE
...	...	@@ -773,6 +874,7 @@
773	874	, A.AMT = 0
774	875	, A.TOT_AMT = 0
775	876	, A.GRD_DATE = CONCAT(DATE_FORMAT(#grdNewDate#, '%Y-%m-%d'), ' ', '00:00:00')
	877	+ , A.EDIT_ID = #editId#
776	878	, A.EDIT_DATE = NOW()
777	879	, A.TEMP_YN = 'Y'
778	880	, A.GRD_END_DATE = '9999:12:31 23:59:59'
...	...	@@ -797,6 +899,7 @@
797	899	, A.AMT = 0
798	900	, A.TOT_AMT = 0
799	901	, A.GRD_DATE = CONCAT(DATE_FORMAT(#grdNewDate#, '%Y-%m-%d'), ' ', '00:00:00')
	902	+ , A.EDIT_ID = #editId#
800	903	, A.EDIT_DATE = NOW()
801	904	WHERE C.GRD_SET_NO = (SELECT MAX(GRD_SET_NO) FROM MJ_MBER_GRD_SETTING)
802	905	]]>
...	...	@@ -808,7 +911,9 @@
808	911	UPDATE MJ_MBER_GRD_INFO SET
809	912	GRD_END_DATE = NOW()
810	913	, GRD_STATUS = 'E'
	914	+ , EDIT_ID = #editId#
811	915	, EDIT_DATE = NOW()
	916	+ , TEMP_YN = 'Y'
812	917	WHERE MBER_ID IN (
813	918	SELECT
814	919	M.MBER_ID
...	...	@@ -835,7 +940,6 @@
835	940	JOIN MJ_MBER_SETTING B
836	941	WHERE 1=1
837	942	AND A.MBER_STTUS = 'Y'
838		- AND G.GRD_STATUS != 'E'
839	943	) M
840	944	WHERE M.IS_SALE_PRICE = 'Y'
841	945	OR M.BLINE_CODE != 'N'
...	...	@@ -868,6 +972,7 @@
868	972	, GRD_STATUS = 'E'
869	973	, EDIT_ID = #editId#
870	974	, EDIT_DATE = NOW()
	975	+ , TEMP_YN = 'Y'
871	976	WHERE
872	977	GRD_STATUS != 'E'
873	978	AND MBER_ID = #mberId#

...	...	@@ -237,16 +237,16 @@
237	237	<colgroup>
238	238	<col style="width: 5%">
239	239	<col style="width: auto;">
240		- <col style="width: 8%;">
	240	+ <col style="width: 10%;">
241	241	<col style="width: 7%;">
242		- <col style="width: 9%">
	242	+ <col style="width: 10%">
243	243	<col style="width: 9%">
244	244	<col style="width: 8%">
245	245	<col style="width: 8%">
246	246	<col style="width: 12%">
247	247	<col style="width: 12%">
248	248	<col style="width: 5%">
249		- <col style="width: 9%">
	249	+ <col style="width: 5%">
250	250	</colgroup>
251	251	<thead>
252	252	<tr>
...	...	@@ -307,14 +307,16 @@
307	307	<td nowrap="nowrap">
308	308	<c:out value="${result.grdStatusNm}"/>
309	309	</td>
310		- <td nowrap="nowrap" class="left">
	310	+ <td nowrap="nowrap">
311	311	<c:choose>
312	312	<c:when test="${result.grdStatusNm eq '종료'}">
313		- <input type="button" class="btnType2" onclick="setMberGrdRestoreByUser('${result.mberId}','${result.grdDate}')" value="복원">
	313	+ <input type="button" class="btnType1" onclick="setMberGrdRestoreByUser('${result.mberId}','${result.grdDate}')" value="복원">
314	314	</c:when>
315	315	<c:otherwise>
316	316	<input type="button" class="btnType2" onclick="setMberGrdUpdateByUser('${result.mberId}')" value="갱신">
	317	+ <%--
317	318	<input type="button" class="btnType1" onclick="setMberGrdEndByUser('${result.mberId}')" value="종료">
	319	+ --%>
318	320	</c:otherwise>
319	321	</c:choose>
320	322	</td>

...	...	@@ -28,6 +28,9 @@
28	28	// 회원별 설정 상세
29	29	public MberGrdVO selectMberGrdSettingDetail(MberGrdVO mberGrdVO) throws Exception;
30	30
	31	+ // 회원별 설정 상세(White)
	32	+ public MberGrdVO selectMberGrdSettingDetailWhite(MberGrdVO mberGrdVO) throws Exception;
	33	+
31	34	// 등급제 설정 일괄변경
32	35	public int updateGrdSettingList(MberGrdVO mberGrdVO) throws Exception;
33	36
...	...	@@ -55,6 +58,9 @@
55	58	// 회원별 등급 등록 All => 기존대상자 제외
56	59	public void insertMberGrdAllByExist(MberGrdVO mberGrdVO) throws Exception;
57	60
	61	+ // 회원별 등급 등록 By MberId
	62	+ public void insertMberGrdByMberId(MberGrdVO mberGrdVO) throws Exception;
	63	+
58	64	// 회원별 등급 히스토리 등록 All
59	65	public void insertMberGrdHistAll(MberGrdVO mberGrdVO) throws Exception;
60	66

...	...	@@ -37,6 +37,11 @@
37	37	return (MberGrdVO) select("mberGrdDAO.selectMberGrdSettingDetail", mberGrdVO);
38	38	}
39	39
	40	+ // 회원별 설정 상세(White)
	41	+ public MberGrdVO selectMberGrdSettingDetailWhite(MberGrdVO mberGrdVO) throws Exception{
	42	+ return (MberGrdVO) select("mberGrdDAO.selectMberGrdSettingDetailWhite", mberGrdVO);
	43	+ }
	44	+
40	45	// 등급제 설정 일괄변경
41	46	public int updateGrdSetting(MberGrdVO mberGrdVO) throws Exception {
42	47	return update("mberGrdDAO.updateGrdSetting", mberGrdVO);
...	...	@@ -88,6 +93,11 @@
88	93	insert("mberGrdDAO.insertMberGrdAllByExist", mberGrdVO);
89	94	}
90	95
	96	+ // 회원별 등급 등록 By MberId
	97	+ public void insertMberGrdByMberId(MberGrdVO mberGrdVO) throws Exception{
	98	+ insert("mberGrdDAO.insertMberGrdByMberId", mberGrdVO);
	99	+ }
	100	+
91	101	// 회원별 등급 히스토리 등록 All
92	102	public void insertMberGrdHistAll(MberGrdVO mberGrdVO) throws Exception{
93	103	insert("mberGrdDAO.insertMberGrdHistAll", mberGrdVO);

...	...	@@ -214,12 +214,32 @@
214	214	}
215	215
216	216	//메모 레이어 열 때 메모 데이터 전달
217		-function memoOpen(comment, id) {
	217	+function memoOpen(id) {
218	218	var form = document.addrMemoForm;
219	219	form.addrCheck.value=id;
220		- $('#textareaMemo').text(comment);
221		-
	220	+
	221	+ // 메모내용 가져오기
	222	+ $.ajax({
	223	+ url : "<c:url value='/web/mjon/fax/addr/selectFaxAddrDetailAjax.do'/>",
	224	+ type : 'POST',
	225	+ data : {"addrId" : id},
	226	+ dataType:'json',
	227	+ async: false,
	228	+ success : function(data, status){
	229	+ if(data.isSuccess == true) {
	230	+ $('#textareaMemo').text(data.addrInfo.addrComment);
	231	+ }
	232	+ else {
	233	+ //alert("Message : " + msg);
	234	+ }
	235	+ },
	236	+ error: function (e) {
	237	+ console.log("ERROR : ", e);
	238	+ alert("에러가 발생했습니다.");
	239	+ }
	240	+ });
222	241	}
	242	+
223	243	// 메모 저장
224	244	function updateMemo() {
225	245	var form = document.addrMemoForm;
...	...	@@ -672,7 +692,7 @@
672	692	</p>
673	693	</td>
674	694	<td>
675		- <button type="button" onclick="memoOpen('<c:out value='${result.addrComment}' />','<c:out value='${result.addrId}' />'); return false;" data-tooltip="adr_popup13">
	695	+ <button type="button" onclick="memoOpen('<c:out value='${result.addrId}' />'); return false;" data-tooltip="adr_popup13">
676	696	<img src="/publish/images/content/memo_img.png" alt="메모">
677	697	</button>
678	698	</td>

Delete comment