Commit @daa6b8bd4926c67c999b4cb1a71acf2c331ed876

itn 2023-08-16

환불완료시 회원등급 업데이트 기능 추가

@daa6b8bd4926c67c999b4cb1a71acf2c331ed876

7d32430

daa6b8b

src/main/java/itn/let/mjo/pay/web/RefundController.java

--- src/main/java/itn/let/mjo/pay/web/RefundController.java

+++ src/main/java/itn/let/mjo/pay/web/RefundController.java


 import itn.let.mjo.pay.service.RefundVO;
 import itn.let.mjo.tax.service.TaxService;
 import itn.let.mjo.tax.service.TaxVO;
+import itn.let.sym.grd.service.MberGrdService;
+import itn.let.sym.grd.service.MberGrdVO;
 import itn.let.sym.site.service.EgovSiteManagerService;
 import itn.let.sym.site.service.JoinSettingVO;
 import itn.let.uat.uia.service.EgovLoginService;

 	
 	@Resource(name = "MjonEventService")
     private MjonEventService mjonEventService;
+	
+	@Resource(name = "mberGrdService")
+	MberGrdService mberGrdService;
 	
     /**
      * 환불요청 목록 페이지

 			mjonPayVO.setMemo("환불처리 " + refundVO.getRefundPoint() + "포인트");
 			mjonPayService.insertPoint(mjonPayVO);
 			
-			
+			// 등급제 Start
+	   		// 회원별 등급 적용
+			MberGrdVO mberGrdVO = new MberGrdVO();
+			mberGrdVO.setMberId(refundVO.getMberId());
+	    	mberGrdVO.setAmt("0");
+	    	mberGrdVO.setMoid("");
+	   		mberGrdService.mberGrdSaveByUserNoHist(mberGrdVO);    		
+			// End				
+	   		
 			//modelAndView.addObject("status", "success");
 			s_status	=	"success";
 			

 					}
 				}
 				
+				// 등급제 Start
+		   		// 회원별 등급 적용
+				MberGrdVO mberGrdVO = new MberGrdVO();
+				mberGrdVO.setMberId(refundVO.getMberId());
+		    	mberGrdVO.setAmt("0");
+		    	mberGrdVO.setMoid("");
+		   		mberGrdService.mberGrdSaveByUserNoHist(mberGrdVO);    		
+				// End				
+				
 			}else if(afterStatus.equals("4")) {// 처리불가로 변경 시
 				
 				if(beforeStatus.equals("3")) {

7d32430

daa6b8b

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 JoinSettingVO selectMberGrdDefaultInfo(JoinSettingVO sysJoinSetVO, String mberId) throws Exception;	
 	
+	// 등급제 단가 추출 => 시스템 단가에 적용 Last
+	public JoinSettingVO selectMberGrdDefaultInfoLast(JoinSettingVO sysJoinSetVO, String mberId) throws Exception;	
+	
 	// 등급제 설정 일괄변경
 	public int updateMberSetting(MberGrdVO mberGrdVO) throws Exception;
 	

 	// 회원별 등급 적용
 	public void mberGrdSaveByUser(MberGrdVO mberGrdVO) throws Exception;
 	
+	// 회원별 등급 적용 Last
+	public void mberGrdSaveByUserLast(MberGrdVO mberGrdVO) throws Exception;
+	
 	// 회원별 등급 적용(로그인시 사용 => 히스토리 저장 제외)
 	public void mberGrdSaveByUserNoHist(MberGrdVO mberGrdVO) throws Exception;
+	
+	// 회원별 등급 적용(로그인시 사용 => 히스토리 저장 제외) Last
+	public void mberGrdSaveByUserNoHistLast(MberGrdVO mberGrdVO) throws Exception;
 	
 	// 회원별 등급제 대상여부
 	int selectMberGrdCnt(String mberId) throws Exception;

 	// 회원별 등급 저장여부
 	int selectMberGrdSaveCnt(String mberId) throws Exception;
 	
+	// 회원별 등급제 기간내, 최종결제이후 환불총금액
+	int selectMberGrdRefundSum(String mberId) throws Exception;
 	
 	// 회원별 등급 히스토리 등록
 	public void insertMberGrdHist(MberGrdVO mberGrdVO)  throws Exception;	

7d32430

daa6b8b

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 (int) select("mberGrdDAO.selectMberGrdSaveCnt", mberId);
 	}	
 	
+	// 회원별 등급제 기간내, 최종결제이후 환불총금액
+	public int selectMberGrdRefundSum(String mberId) throws Exception{
+		return (int) select("mberGrdDAO.selectMberGrdRefundSum", mberId);
+	}	
 	
 	// 회원별 등급 히스토리 등록
 	public void insertMberGrdHist(MberGrdVO mberGrdVO) throws Exception{

7d32430

daa6b8b

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


 package itn.let.sym.grd.service.impl;
 
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 import javax.annotation.Resource;
 
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
 import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;

 	/** 등급제 설정 히스토리 idgen */
 	@Resource(name="egovGrdSettingHistIdGnrService")
 	private EgovIdGnrService gshidgenService;
-	
-	
-	// 등급제 단가 추출 => 시스템 단가에 적용
-	@Override
-	public JoinSettingVO selectMberGrdDefaultInfo(JoinSettingVO sysJoinSetVO, String mberId) throws Exception {
-		/*
-		// 공백제거
-		mberId = mberId.trim();
-		
-		// Step 1. 등급제 시행 ON 일경우
-		if (StringUtils.isNotEmpty(mberId)) {
-			MberGrdVO mberGrdVO = new MberGrdVO();		
-			MberGrdVO mberGrdVO1 = new MberGrdVO();
-			mberGrdVO1 = selectMberSettingDetail(mberGrdVO);
-			if (mberGrdVO1.getGrdNoti().equals("Y")) {
-				mberGrdVO = new MberGrdVO();
-				mberGrdVO = selectMberGrdInfo(mberId);
-				if (null != mberGrdVO) {
-					if(mberGrdVO.getShortPrice() > 1 && mberGrdVO.getLongPrice() > 1 && mberGrdVO.getPicturePrice() > 1 && mberGrdVO.getPicture2Price() > 1 && mberGrdVO.getPicture3Price() > 1) {
-						sysJoinSetVO.setShortPrice(mberGrdVO.getShortPrice());
-						sysJoinSetVO.setLongPrice(mberGrdVO.getLongPrice());
-						sysJoinSetVO.setPicturePrice(mberGrdVO.getPicturePrice());
-						sysJoinSetVO.setPicture2Price(mberGrdVO.getPicture2Price());
-						sysJoinSetVO.setPicture3Price(mberGrdVO.getPicture3Price());
-					}
-				}
-			}		
-		}
-		*/
-		
-		return sysJoinSetVO;
-	}	
 	
 	// 등급제 시행여부 변경
 	@Override

 		return mberGrdDAO.updateMberGrdRestoreByUser(mberGrdVO);
 	}	
 	
+	
+	// 등급제 단가 추출 => 시스템 단가에 적용
+	@Override
+	public JoinSettingVO selectMberGrdDefaultInfo(JoinSettingVO sysJoinSetVO, String mberId) throws Exception {	
+		// 등급제 단가 추출 => 시스템 단가에 적용 Last
+		//sysJoinSetVO = selectMberGrdDefaultInfoLast(sysJoinSetVO, mberId);
+			
+		return sysJoinSetVO;
+	}	
+	
 	// 회원별 등급 적용
 	@Override
 	public void mberGrdSaveByUser(MberGrdVO mberGrdVO) throws Exception {
-		/*
+		// 회원별 등급 적용 Last
+		//mberGrdSaveByUserLast(mberGrdVO);
+	}
+	
+	// 회원별 등급 적용(로그인, 환불시 사용 => 히스토리 저장 제외)
+	@Override
+	public void mberGrdSaveByUserNoHist(MberGrdVO mberGrdVO) throws Exception {
+		// 회원별 등급 적용(로그인, 환불시 사용 => 히스토리 저장 제외)
+		//mberGrdSaveByUserNoHistLast(mberGrdVO);
+	}	
+	
+	// 등급제 단가 추출 => 시스템 단가에 적용 Last
+	@Override
+	public JoinSettingVO selectMberGrdDefaultInfoLast(JoinSettingVO sysJoinSetVO, String mberId) throws Exception {
+		System.out.println("START 등급제 단가 추출 => 시스템 단가에 적용");
+		
+		// 공백제거
+		mberId = mberId.trim();
+		
+		if (StringUtils.isNotEmpty(mberId)) {
+			System.out.println("아이디 : " + mberId);
+			
+			MberGrdVO mberGrdVO = new MberGrdVO();		
+			// Step 1. 등급제 시행 ON 일경우
+			MberGrdVO mberGrdVO1 = new MberGrdVO();
+			mberGrdVO1 = selectMberSettingDetail(mberGrdVO);
+			System.out.println("Step 1. 등급제 시행 ON 일경우");
+			if (mberGrdVO1.getGrdNoti().equals("Y")) {
+				mberGrdVO = new MberGrdVO();
+				
+				// Step 2. 등급 정보 조회
+				mberGrdVO = selectMberGrdInfo(mberId);
+				System.out.println("Step 2. 등급 정보 조회");
+				if (null != mberGrdVO) {
+					if(mberGrdVO.getShortPrice() > 1 && mberGrdVO.getLongPrice() > 1 && mberGrdVO.getPicturePrice() > 1 && mberGrdVO.getPicture2Price() > 1 && mberGrdVO.getPicture3Price() > 1) {
+						sysJoinSetVO.setShortPrice(mberGrdVO.getShortPrice());
+						sysJoinSetVO.setLongPrice(mberGrdVO.getLongPrice());
+						sysJoinSetVO.setPicturePrice(mberGrdVO.getPicturePrice());
+						sysJoinSetVO.setPicture2Price(mberGrdVO.getPicture2Price());
+						sysJoinSetVO.setPicture3Price(mberGrdVO.getPicture3Price());
+					}
+				}
+			}		
+		}
+		
+		System.out.println("END 등급제 단가 추출 => 시스템 단가에 적용");
+		
+		return sysJoinSetVO;
+	}	
+	
+	// 회원별 등급 적용 Last
+	@Override
+	public void mberGrdSaveByUserLast(MberGrdVO mberGrdVO) throws Exception {
     	try {
+    		System.out.println("START 회원별 등급 적용");
+    		System.out.println("아이디 : " + mberGrdVO.getMberId());
+    		
     		// 현재 날짜 구하기
             LocalDate now = LocalDate.now();
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");	// 포맷 정의

     		// Step 1. 등급제 시행 ON 일경우(시행일자 진행여부 Y일경우)
     		MberGrdVO mberGrdVO1 = new MberGrdVO();
     		mberGrdVO1 = selectMberSettingDetail(mberGrdVO);
+    		System.out.println("Step 1. 등급제 시행 ON 일경우(시행일자 진행여부 Y일경우)");
     		if (mberGrdVO1.getGrdNoti().equals("Y")) {
     			mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate());
     			
     			// Step 2. 문자할인, B선라인, 스팸회원 대상자 제외
     			int isMberGrd = selectMberGrdCnt(mberGrdVO.getMberId());	// 등급제 대상여부(1: 대상, 0: 미대상)
+    			System.out.println("Step 2. 문자할인, B선라인, 스팸회원 대상자 제외");
     			if(isMberGrd == 1) {
     				// Step 3. 누적결제금액(이벤트금액 제외) 추출 및 등급 조회
     				MberGrdVO mberGrdVO3 = new MberGrdVO();				
     				mberGrdVO3 = selectMberGrdAmtDetail(mberGrdVO);
+    				System.out.println("Step 3. 누적결제금액(이벤트금액 제외) 추출 및 등급 조회");
     				if (null != mberGrdVO3) {
     					mberGrdVO.setTotAmt(mberGrdVO3.getTotAmt());
     					mberGrdVO.setGrdSetNo(mberGrdVO3.getGrdSetNo());

     					// Step 4. 등급제 설정값 조회
     					MberGrdVO mberGrdVO4 = new MberGrdVO();
     					mberGrdVO4 = selectMberGrdSettingDetail(mberGrdVO);
+    					System.out.println("Step 4. 등급제 설정값 조회");
     					if (null != mberGrdVO4) {
     						mberGrdVO.setAmt(mberGrdVO.getAmt());
     				    	mberGrdVO.setTotAmt(mberGrdVO.getTotAmt());

     						// Step 5. 인서트 Or 업데이트
     						MberGrdVO mberGrdVO5 = new MberGrdVO();
     						mberGrdVO5 = selectMberGrdDetail(mberGrdVO);
+    						System.out.println("Step 5. 인서트 Or 업데이트");
     						if (null != mberGrdVO5) {
     							updateMberGrdOk(mberGrdVO);
     								

     				}					
     			}			
     		}
+    		System.out.println("START 회원별 등급 적용");
     	}
     	catch (Exception e) {
 	    	// Slack 메시지 발송(단순본문)

 			System.out.println("#############################################################");
 			System.out.println(mberGrdVO.getMberId() + "님 결제중 회원등급 저장 오류");			    		
     	}												
-		*/
 	}			
 	
-	// 회원별 등급 적용(로그인시 사용 => 히스토리 저장 제외)
+	// 회원별 등급 적용(로그인, 환불시 사용 => 히스토리 저장 제외)
 	@Override
-	public void mberGrdSaveByUserNoHist(MberGrdVO mberGrdVO) throws Exception {
-		/*
+	public void mberGrdSaveByUserNoHistLast(MberGrdVO mberGrdVO) throws Exception {
+
     	try {
+    		System.out.println("START 회원별 등급 적용(로그인, 환불시 사용 => 히스토리 저장 제외)");
+    		System.out.println("아이디 : " + mberGrdVO.getMberId());
+    		
     		// 현재 날짜 구하기
             LocalDate now = LocalDate.now();
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");	// 포맷 정의

     		// Step 1. 등급제 시행 ON 일경우(시행일자 진행여부 Y일경우)
     		MberGrdVO mberGrdVO1 = new MberGrdVO();
     		mberGrdVO1 = selectMberSettingDetail(mberGrdVO);
+    		System.out.println("Step 1. 등급제 시행 ON 일경우(시행일자 진행여부 Y일경우)");
     		if (mberGrdVO1.getGrdNoti().equals("Y")) {
     			mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate());
     			
     			// Step 2. 문자할인, B선라인, 스팸회원 대상자 제외
     			int isMberGrd = selectMberGrdCnt(mberGrdVO.getMberId());	// 등급제 대상여부(1: 대상, 0: 미대상)
+    			System.out.println("Step 2. 문자할인, B선라인, 스팸회원 대상자 제외");
     			if(isMberGrd == 1) {
     				// Step 3. 누적결제금액(이벤트금액 제외) 추출 및 등급 조회
     				MberGrdVO mberGrdVO3 = new MberGrdVO();				
     				mberGrdVO3 = selectMberGrdAmtDetail(mberGrdVO);
+    				System.out.println("Step 3. 누적결제금액(이벤트금액 제외) 추출 및 등급 조회");
     				if (null != mberGrdVO3) {
     					mberGrdVO.setTotAmt(mberGrdVO3.getTotAmt());
     					mberGrdVO.setGrdSetNo(mberGrdVO3.getGrdSetNo());

     					// Step 4. 등급제 설정값 조회
     					MberGrdVO mberGrdVO4 = new MberGrdVO();
     					mberGrdVO4 = selectMberGrdSettingDetail(mberGrdVO);
+    					System.out.println("Step 4. 누적결제금액(이벤트금액 제외) 추출 및 등급 조회");
     					if (null != mberGrdVO4) {
     						mberGrdVO.setAmt(mberGrdVO.getAmt());
     				    	mberGrdVO.setTotAmt(mberGrdVO.getTotAmt());

     						// Step 5. 인서트 Or 업데이트
     						MberGrdVO mberGrdVO5 = new MberGrdVO();
     						mberGrdVO5 = selectMberGrdDetail(mberGrdVO);
+    						System.out.println("Step 5. 인서트 Or 업데이트");
     						if (null != mberGrdVO5) {
     							updateMberGrdOk(mberGrdVO);
     						}

     				}					
     			}			
     		}
+    		System.out.println("END 회원별 등급 적용(로그인, 환불시 사용 => 히스토리 저장 제외)");
     	}
     	catch (Exception e) {
 	    	// Slack 메시지 발송(단순본문)

 			System.out.println("#############################################################");
 			System.out.println(mberGrdVO.getMberId() + "님 로그인중 회원등급 저장 오류");			    		
     	}
-    	*/												
+												
 	}			
 	
 	// 회원별 등급제 대상여부

 		return mberGrdDAO.selectMberGrdSaveCnt(mberId);
 	}
 	
+	// 회원별 등급제 기간내, 최종결제이후 환불총금액
+	@Override
+	public int selectMberGrdRefundSum(String mberId) throws Exception{
+		// 공백제거
+		mberId = mberId.trim();
+		
+		return mberGrdDAO.selectMberGrdRefundSum(mberId);
+	}
 	
 	// 회원별 등급 히스토리 등록
 	@Override

7d32430

daa6b8b

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


 					SELECT 
 						S.USER_ID
 						, SUM(S.AMT) AS AMT_SUM_ORIGIN
-						, (SUM(S.AMT) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0)) AS AMT_SUM
+						, (SUM(S.AMT) - IFNULL(SUM(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10)), 0)) AS AMT_SUM
 						, (
 							SELECT IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) FROM MJ_REFUND R
 							WHERE S.USER_ID = R.MBER_ID

 					SELECT 
 						S.USER_ID
 						, SUM(S.AMT) AS AMT_SUM_ORIGIN
-						, (SUM(S.AMT) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0)) AS AMT_SUM
+						, (SUM(S.AMT) - IFNULL(SUM(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10)), 0)) AS AMT_SUM
 						, (
 							SELECT IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) FROM MJ_REFUND R
 							WHERE S.USER_ID = R.MBER_ID

 					SELECT 
 						S.USER_ID
 						, SUM(S.AMT) AS AMT_SUM_ORIGIN
-						, (SUM(S.AMT) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0)) AS AMT_SUM
+						, (SUM(S.AMT) - IFNULL(SUM(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10)), 0)) AS AMT_SUM
 						, (
 							SELECT IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) FROM MJ_REFUND R
 							WHERE S.USER_ID = R.MBER_ID

 		LIMIT 1
 	</select>	
 	
-	
+	<!-- 회원별 등급제 기간내, 최종결제이후 환불총금액 -->
+	<select id="mberGrdDAO.selectMberGrdRefundSum" parameterClass="String" resultClass="Integer">
+		SELECT 
+			IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) refundSum 
+		FROM MJ_REFUND R
+		WHERE R.MBER_ID = #mberId#
+		AND R.REFUND_STATUS  = '3' 
+		AND R.REFUND_DIVISION = '1'
+		AND R.REFUND_HANDLE_PNTTM >= (SELECT G.GRD_DATE FROM MJ_MBER_GRD_INFO G WHERE G.MBER_ID = #mberId#)
+		AND R.REFUND_HANDLE_PNTTM >= (SELECT MAX(S.REG_DATE) FROM MJ_PG S WHERE S.USER_ID = #mberId# AND S.PG_STATUS = '1')
+	</select>	
+		
 	<!-- 회원별 등급 히스토리 등록 -->
 	<insert id="mberGrdDAO.insertMberGrdHist" parameterClass="mberGrdVO">
 		INSERT INTO MJ_MBER_GRD_HIST

 	<!-- 회원별 등급 히스토리 목록 => 등급제 시행일이후 목록(사용자화면용) -->
 	<!-- AND A.GRD_DATE >= (SELECT S.GRD_DATE FROM MJ_MBER_GRD_INFO S WHERE S.MBER_ID = #mberId#) -->
 	<select id="mberGrdDAO.selectMberGrdHistByGrdDateList" parameterClass="mberGrdVO" resultClass="mberGrdVO">
-		SELECT
-			COUNT(MBER_ID) OVER() 	AS totCnt
-			, A.MBER_ID				AS mberId
-			, A.GRD_SET_NO			AS grdSetNo
-			, B.GRD_SET_NM			AS grdSetNm
-			, 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.AMT					AS amt
-			, A.TOT_AMT				AS totAmt
-			, A.GRD_DATE			AS grdDate
-			, A.MOID				AS moid
-			, A.REG_ID				AS regId
-			, DATE_FORMAT(A.REG_DATE, '%Y-%m-%d %H:%i')			AS regDate
-			, A.EDIT_ID				AS editId
-			, A.EDIT_DATE			AS editDate	
-		FROM MJ_MBER_GRD_HIST A
+	<![CDATA[
+		SELECT 
+			M3.totCnt
+			, M3.mberId
+			, M3.regDate
+			, M3.amt
+			, M3.amtStepSum
+			, M3.refundSum
+			, M3.totAmt
+			, M3.GRD_SET_NO			AS grdSetNo 
+			, B.GRD_SET_NM			AS grdSetNm				
+		FROM (
+			SELECT 
+				M2.totCnt
+				, M2.mberId
+				, M2.regDate
+				, M2.amt
+				, M2.amtStepSum
+				, M2.refundSum
+				, (IFNULL(ROUND(M2.amtStepSum - M2.refundSum), 0)) AS totAmt
+				, (
+					SELECT IFNULL(MIN(S1.GRD_SET_NO), (SELECT MAX(GRD_SET_NO) FROM MJ_MBER_GRD_SETTING)) FROM MJ_MBER_GRD_SETTING S1 WHERE S1.STD_AMT <= IFNULL(ROUND(M2.amtStepSum - M2.refundSum), 0)
+				 ) GRD_SET_NO 		
+			FROM (
+				SELECT 
+					M.totCnt
+					, M.mberId
+					, DATE_FORMAT(M.REG_DATE, '%Y-%m-%d %H:%i')			AS regDate
+					, M.amt
+					, SUM(M.amt) OVER(ORDER BY M.REG_DATE ASC) AS amtStepSum
+					, (
+						SELECT IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) FROM MJ_REFUND R
+						WHERE M.mberId = R.MBER_ID
+							AND R.REFUND_STATUS  = '3' 
+							AND R.REFUND_DIVISION = '1'
+							AND R.REFUND_HANDLE_PNTTM >= (SELECT G.GRD_DATE FROM MJ_MBER_GRD_INFO G WHERE G.MBER_ID = M.mberId)
+							AND M.REG_DATE >= R.REFUND_HANDLE_PNTTM
+					) refundSum
+				FROM (
+					SELECT 
+						COUNT(S.USER_ID) OVER() 	AS totCnt
+						, S.USER_ID					AS mberId
+						, S.REG_DATE
+						, (S.AMT - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0)) AS amt
+					FROM MJ_PG S 
+					LEFT OUTER JOIN MJ_EVENT_MBER_INFO SS
+						ON S.USER_ID = SS.MBER_ID
+						AND S.MOID = SS.EVENT_PG_MOID
+					WHERE 
+						S.USER_ID = #mberId#
+						AND S.PG_STATUS = '1'	
+						AND S.REG_DATE >= (SELECT G.GRD_DATE FROM MJ_MBER_GRD_INFO G WHERE G.MBER_ID = #mberId#)
+					ORDER BY S.REG_DATE ASC
+				) M
+				ORDER BY M.REG_DATE DESC		
+				LIMIT  #recordCountPerPage# OFFSET #firstIndex#
+			) M2
+		) M3
 		INNER JOIN MJ_MBER_GRD_SETTING B
-			ON A.GRD_SET_NO = B.GRD_SET_NO		
-		WHERE 1=1 
-		AND A.MBER_ID = #mberId#
-		AND IFNULL(TRIM(A.MOID), '') != ''
-		AND A.TOT_AMT > 0
-		AND A.GRD_DATE >= (SELECT S.GRD_DATE FROM MJ_MBER_GRD_INFO S WHERE S.MBER_ID = #mberId#)		
-		ORDER BY A.REG_DATE DESC
-		LIMIT  #recordCountPerPage# OFFSET #firstIndex#	
+			ON M3.GRD_SET_NO = B.GRD_SET_NO
+	]]>
 	</select>
 			
 	<!-- 회원별 등급 히스토리 목록 -->

Add a comment

Open 0
Closed 0

List

...	...	@@ -48,6 +48,8 @@
48	48	import itn.let.mjo.pay.service.RefundVO;
49	49	import itn.let.mjo.tax.service.TaxService;
50	50	import itn.let.mjo.tax.service.TaxVO;
	51	+import itn.let.sym.grd.service.MberGrdService;
	52	+import itn.let.sym.grd.service.MberGrdVO;
51	53	import itn.let.sym.site.service.EgovSiteManagerService;
52	54	import itn.let.sym.site.service.JoinSettingVO;
53	55	import itn.let.uat.uia.service.EgovLoginService;
...	...	@@ -106,6 +108,9 @@
106	108
107	109	@Resource(name = "MjonEventService")
108	110	private MjonEventService mjonEventService;
	111	+
	112	+ @Resource(name = "mberGrdService")
	113	+ MberGrdService mberGrdService;
109	114
110	115	/**
111	116	* 환불요청 목록 페이지
...	...	@@ -542,7 +547,15 @@
542	547	mjonPayVO.setMemo("환불처리 " + refundVO.getRefundPoint() + "포인트");
543	548	mjonPayService.insertPoint(mjonPayVO);
544	549
545		-
	550	+ // 등급제 Start
	551	+ // 회원별 등급 적용
	552	+ MberGrdVO mberGrdVO = new MberGrdVO();
	553	+ mberGrdVO.setMberId(refundVO.getMberId());
	554	+ mberGrdVO.setAmt("0");
	555	+ mberGrdVO.setMoid("");
	556	+ mberGrdService.mberGrdSaveByUserNoHist(mberGrdVO);
	557	+ // End
	558	+
546	559	//modelAndView.addObject("status", "success");
547	560	s_status = "success";
548	561
...	...	@@ -722,6 +735,15 @@
722	735	}
723	736	}
724	737
	738	+ // 등급제 Start
	739	+ // 회원별 등급 적용
	740	+ MberGrdVO mberGrdVO = new MberGrdVO();
	741	+ mberGrdVO.setMberId(refundVO.getMberId());
	742	+ mberGrdVO.setAmt("0");
	743	+ mberGrdVO.setMoid("");
	744	+ mberGrdService.mberGrdSaveByUserNoHist(mberGrdVO);
	745	+ // End
	746	+
725	747	}else if(afterStatus.equals("4")) {// 처리불가로 변경 시
726	748
727	749	if(beforeStatus.equals("3")) {

...	...	@@ -9,6 +9,9 @@
9	9	// 등급제 단가 추출 => 시스템 단가에 적용
10	10	public JoinSettingVO selectMberGrdDefaultInfo(JoinSettingVO sysJoinSetVO, String mberId) throws Exception;
11	11
	12	+ // 등급제 단가 추출 => 시스템 단가에 적용 Last
	13	+ public JoinSettingVO selectMberGrdDefaultInfoLast(JoinSettingVO sysJoinSetVO, String mberId) throws Exception;
	14	+
12	15	// 등급제 설정 일괄변경
13	16	public int updateMberSetting(MberGrdVO mberGrdVO) throws Exception;
14	17
...	...	@@ -85,8 +88,14 @@
85	88	// 회원별 등급 적용
86	89	public void mberGrdSaveByUser(MberGrdVO mberGrdVO) throws Exception;
87	90
	91	+ // 회원별 등급 적용 Last
	92	+ public void mberGrdSaveByUserLast(MberGrdVO mberGrdVO) throws Exception;
	93	+
88	94	// 회원별 등급 적용(로그인시 사용 => 히스토리 저장 제외)
89	95	public void mberGrdSaveByUserNoHist(MberGrdVO mberGrdVO) throws Exception;
	96	+
	97	+ // 회원별 등급 적용(로그인시 사용 => 히스토리 저장 제외) Last
	98	+ public void mberGrdSaveByUserNoHistLast(MberGrdVO mberGrdVO) throws Exception;
90	99
91	100	// 회원별 등급제 대상여부
92	101	int selectMberGrdCnt(String mberId) throws Exception;
...	...	@@ -100,6 +109,8 @@
100	109	// 회원별 등급 저장여부
101	110	int selectMberGrdSaveCnt(String mberId) throws Exception;
102	111
	112	+ // 회원별 등급제 기간내, 최종결제이후 환불총금액
	113	+ int selectMberGrdRefundSum(String mberId) throws Exception;
103	114
104	115	// 회원별 등급 히스토리 등록
105	116	public void insertMberGrdHist(MberGrdVO mberGrdVO) throws Exception;

...	...	@@ -158,6 +158,10 @@
158	158	return (int) select("mberGrdDAO.selectMberGrdSaveCnt", mberId);
159	159	}
160	160
	161	+ // 회원별 등급제 기간내, 최종결제이후 환불총금액
	162	+ public int selectMberGrdRefundSum(String mberId) throws Exception{
	163	+ return (int) select("mberGrdDAO.selectMberGrdRefundSum", mberId);
	164	+ }
161	165
162	166	// 회원별 등급 히스토리 등록
163	167	public void insertMberGrdHist(MberGrdVO mberGrdVO) throws Exception{

...	...	@@ -417,7 +417,7 @@
417	417	SELECT
418	418	S.USER_ID
419	419	, SUM(S.AMT) AS AMT_SUM_ORIGIN
420		- , (SUM(S.AMT) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0)) AS AMT_SUM
	420	+ , (SUM(S.AMT) - IFNULL(SUM(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10)), 0)) AS AMT_SUM
421	421	, (
422	422	SELECT IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) FROM MJ_REFUND R
423	423	WHERE S.USER_ID = R.MBER_ID
...	...	@@ -643,7 +643,7 @@
643	643	SELECT
644	644	S.USER_ID
645	645	, SUM(S.AMT) AS AMT_SUM_ORIGIN
646		- , (SUM(S.AMT) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0)) AS AMT_SUM
	646	+ , (SUM(S.AMT) - IFNULL(SUM(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10)), 0)) AS AMT_SUM
647	647	, (
648	648	SELECT IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) FROM MJ_REFUND R
649	649	WHERE S.USER_ID = R.MBER_ID
...	...	@@ -712,7 +712,7 @@
712	712	SELECT
713	713	S.USER_ID
714	714	, SUM(S.AMT) AS AMT_SUM_ORIGIN
715		- , (SUM(S.AMT) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0)) AS AMT_SUM
	715	+ , (SUM(S.AMT) - IFNULL(SUM(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10)), 0)) AS AMT_SUM
716	716	, (
717	717	SELECT IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) FROM MJ_REFUND R
718	718	WHERE S.USER_ID = R.MBER_ID
...	...	@@ -947,7 +947,18 @@
947	947	LIMIT 1
948	948	</select>
949	949
950		-
	950	+ <!-- 회원별 등급제 기간내, 최종결제이후 환불총금액 -->
	951	+ <select id="mberGrdDAO.selectMberGrdRefundSum" parameterClass="String" resultClass="Integer">
	952	+ SELECT
	953	+ IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) refundSum
	954	+ FROM MJ_REFUND R
	955	+ WHERE R.MBER_ID = #mberId#
	956	+ AND R.REFUND_STATUS = '3'
	957	+ AND R.REFUND_DIVISION = '1'
	958	+ AND R.REFUND_HANDLE_PNTTM >= (SELECT G.GRD_DATE FROM MJ_MBER_GRD_INFO G WHERE G.MBER_ID = #mberId#)
	959	+ AND R.REFUND_HANDLE_PNTTM >= (SELECT MAX(S.REG_DATE) FROM MJ_PG S WHERE S.USER_ID = #mberId# AND S.PG_STATUS = '1')
	960	+ </select>
	961	+
951	962	<!-- 회원별 등급 히스토리 등록 -->
952	963	<insert id="mberGrdDAO.insertMberGrdHist" parameterClass="mberGrdVO">
953	964	INSERT INTO MJ_MBER_GRD_HIST
...	...	@@ -991,34 +1002,67 @@
991	1002	<!-- 회원별 등급 히스토리 목록 => 등급제 시행일이후 목록(사용자화면용) -->
992	1003	<!-- AND A.GRD_DATE >= (SELECT S.GRD_DATE FROM MJ_MBER_GRD_INFO S WHERE S.MBER_ID = #mberId#) -->
993	1004	<select id="mberGrdDAO.selectMberGrdHistByGrdDateList" parameterClass="mberGrdVO" resultClass="mberGrdVO">
994		- SELECT
995		- COUNT(MBER_ID) OVER() AS totCnt
996		- , A.MBER_ID AS mberId
997		- , A.GRD_SET_NO AS grdSetNo
998		- , B.GRD_SET_NM AS grdSetNm
999		- , A.SHORT_PRICE AS shortPrice
1000		- , A.LONG_PRICE AS longPrice
1001		- , A.PICTURE_PRICE AS picturePrice
1002		- , A.PICTURE2_PRICE AS picture2Price
1003		- , A.PICTURE3_PRICE AS picture3Price
1004		- , A.AMT AS amt
1005		- , A.TOT_AMT AS totAmt
1006		- , A.GRD_DATE AS grdDate
1007		- , A.MOID AS moid
1008		- , A.REG_ID AS regId
1009		- , DATE_FORMAT(A.REG_DATE, '%Y-%m-%d %H:%i') AS regDate
1010		- , A.EDIT_ID AS editId
1011		- , A.EDIT_DATE AS editDate
1012		- FROM MJ_MBER_GRD_HIST A
	1005	+ <![CDATA[
	1006	+ SELECT
	1007	+ M3.totCnt
	1008	+ , M3.mberId
	1009	+ , M3.regDate
	1010	+ , M3.amt
	1011	+ , M3.amtStepSum
	1012	+ , M3.refundSum
	1013	+ , M3.totAmt
	1014	+ , M3.GRD_SET_NO AS grdSetNo
	1015	+ , B.GRD_SET_NM AS grdSetNm
	1016	+ FROM (
	1017	+ SELECT
	1018	+ M2.totCnt
	1019	+ , M2.mberId
	1020	+ , M2.regDate
	1021	+ , M2.amt
	1022	+ , M2.amtStepSum
	1023	+ , M2.refundSum
	1024	+ , (IFNULL(ROUND(M2.amtStepSum - M2.refundSum), 0)) AS totAmt
	1025	+ , (
	1026	+ SELECT IFNULL(MIN(S1.GRD_SET_NO), (SELECT MAX(GRD_SET_NO) FROM MJ_MBER_GRD_SETTING)) FROM MJ_MBER_GRD_SETTING S1 WHERE S1.STD_AMT <= IFNULL(ROUND(M2.amtStepSum - M2.refundSum), 0)
	1027	+ ) GRD_SET_NO
	1028	+ FROM (
	1029	+ SELECT
	1030	+ M.totCnt
	1031	+ , M.mberId
	1032	+ , DATE_FORMAT(M.REG_DATE, '%Y-%m-%d %H:%i') AS regDate
	1033	+ , M.amt
	1034	+ , SUM(M.amt) OVER(ORDER BY M.REG_DATE ASC) AS amtStepSum
	1035	+ , (
	1036	+ SELECT IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) FROM MJ_REFUND R
	1037	+ WHERE M.mberId = R.MBER_ID
	1038	+ AND R.REFUND_STATUS = '3'
	1039	+ AND R.REFUND_DIVISION = '1'
	1040	+ AND R.REFUND_HANDLE_PNTTM >= (SELECT G.GRD_DATE FROM MJ_MBER_GRD_INFO G WHERE G.MBER_ID = M.mberId)
	1041	+ AND M.REG_DATE >= R.REFUND_HANDLE_PNTTM
	1042	+ ) refundSum
	1043	+ FROM (
	1044	+ SELECT
	1045	+ COUNT(S.USER_ID) OVER() AS totCnt
	1046	+ , S.USER_ID AS mberId
	1047	+ , S.REG_DATE
	1048	+ , (S.AMT - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0)) AS amt
	1049	+ FROM MJ_PG S
	1050	+ LEFT OUTER JOIN MJ_EVENT_MBER_INFO SS
	1051	+ ON S.USER_ID = SS.MBER_ID
	1052	+ AND S.MOID = SS.EVENT_PG_MOID
	1053	+ WHERE
	1054	+ S.USER_ID = #mberId#
	1055	+ AND S.PG_STATUS = '1'
	1056	+ AND S.REG_DATE >= (SELECT G.GRD_DATE FROM MJ_MBER_GRD_INFO G WHERE G.MBER_ID = #mberId#)
	1057	+ ORDER BY S.REG_DATE ASC
	1058	+ ) M
	1059	+ ORDER BY M.REG_DATE DESC
	1060	+ LIMIT #recordCountPerPage# OFFSET #firstIndex#
	1061	+ ) M2
	1062	+ ) M3
1013	1063	INNER JOIN MJ_MBER_GRD_SETTING B
1014		- ON A.GRD_SET_NO = B.GRD_SET_NO
1015		- WHERE 1=1
1016		- AND A.MBER_ID = #mberId#
1017		- AND IFNULL(TRIM(A.MOID), '') != ''
1018		- AND A.TOT_AMT > 0
1019		- AND A.GRD_DATE >= (SELECT S.GRD_DATE FROM MJ_MBER_GRD_INFO S WHERE S.MBER_ID = #mberId#)
1020		- ORDER BY A.REG_DATE DESC
1021		- LIMIT #recordCountPerPage# OFFSET #firstIndex#
	1064	+ ON M3.GRD_SET_NO = B.GRD_SET_NO
	1065	+ ]]>
1022	1066	</select>
1023	1067
1024	1068	<!-- 회원별 등급 히스토리 목록 -->

...	...	@@ -1,9 +1,12 @@
1	1	package itn.let.sym.grd.service.impl;
2	2
	3	+import java.time.LocalDate;
	4	+import java.time.format.DateTimeFormatter;
3	5	import java.util.List;
4	6
5	7	import javax.annotation.Resource;
6	8
	9	+import org.apache.commons.lang.StringUtils;
7	10	import org.springframework.stereotype.Service;
8	11
9	12	import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
...	...	@@ -34,38 +37,6 @@
34	37	/** 등급제 설정 히스토리 idgen */
35	38	@Resource(name="egovGrdSettingHistIdGnrService")
36	39	private EgovIdGnrService gshidgenService;
37		-
38		-
39		- // 등급제 단가 추출 => 시스템 단가에 적용
40		- @Override
41		- public JoinSettingVO selectMberGrdDefaultInfo(JoinSettingVO sysJoinSetVO, String mberId) throws Exception {
42		- /*
43		- // 공백제거
44		- mberId = mberId.trim();
45		-
46		- // Step 1. 등급제 시행 ON 일경우
47		- if (StringUtils.isNotEmpty(mberId)) {
48		- MberGrdVO mberGrdVO = new MberGrdVO();
49		- MberGrdVO mberGrdVO1 = new MberGrdVO();
50		- mberGrdVO1 = selectMberSettingDetail(mberGrdVO);
51		- if (mberGrdVO1.getGrdNoti().equals("Y")) {
52		- mberGrdVO = new MberGrdVO();
53		- mberGrdVO = selectMberGrdInfo(mberId);
54		- if (null != mberGrdVO) {
55		- if(mberGrdVO.getShortPrice() > 1 && mberGrdVO.getLongPrice() > 1 && mberGrdVO.getPicturePrice() > 1 && mberGrdVO.getPicture2Price() > 1 && mberGrdVO.getPicture3Price() > 1) {
56		- sysJoinSetVO.setShortPrice(mberGrdVO.getShortPrice());
57		- sysJoinSetVO.setLongPrice(mberGrdVO.getLongPrice());
58		- sysJoinSetVO.setPicturePrice(mberGrdVO.getPicturePrice());
59		- sysJoinSetVO.setPicture2Price(mberGrdVO.getPicture2Price());
60		- sysJoinSetVO.setPicture3Price(mberGrdVO.getPicture3Price());
61		- }
62		- }
63		- }
64		- }
65		- */
66		-
67		- return sysJoinSetVO;
68		- }
69	40
70	41	// 등급제 시행여부 변경
71	42	@Override
...	...	@@ -276,11 +247,76 @@
276	247	return mberGrdDAO.updateMberGrdRestoreByUser(mberGrdVO);
277	248	}
278	249
	250	+
	251	+ // 등급제 단가 추출 => 시스템 단가에 적용
	252	+ @Override
	253	+ public JoinSettingVO selectMberGrdDefaultInfo(JoinSettingVO sysJoinSetVO, String mberId) throws Exception {
	254	+ // 등급제 단가 추출 => 시스템 단가에 적용 Last
	255	+ //sysJoinSetVO = selectMberGrdDefaultInfoLast(sysJoinSetVO, mberId);
	256	+
	257	+ return sysJoinSetVO;
	258	+ }
	259	+
279	260	// 회원별 등급 적용
280	261	@Override
281	262	public void mberGrdSaveByUser(MberGrdVO mberGrdVO) throws Exception {
282		- /*
	263	+ // 회원별 등급 적용 Last
	264	+ //mberGrdSaveByUserLast(mberGrdVO);
	265	+ }
	266	+
	267	+ // 회원별 등급 적용(로그인, 환불시 사용 => 히스토리 저장 제외)
	268	+ @Override
	269	+ public void mberGrdSaveByUserNoHist(MberGrdVO mberGrdVO) throws Exception {
	270	+ // 회원별 등급 적용(로그인, 환불시 사용 => 히스토리 저장 제외)
	271	+ //mberGrdSaveByUserNoHistLast(mberGrdVO);
	272	+ }
	273	+
	274	+ // 등급제 단가 추출 => 시스템 단가에 적용 Last
	275	+ @Override
	276	+ public JoinSettingVO selectMberGrdDefaultInfoLast(JoinSettingVO sysJoinSetVO, String mberId) throws Exception {
	277	+ System.out.println("START 등급제 단가 추출 => 시스템 단가에 적용");
	278	+
	279	+ // 공백제거
	280	+ mberId = mberId.trim();
	281	+
	282	+ if (StringUtils.isNotEmpty(mberId)) {
	283	+ System.out.println("아이디 : " + mberId);
	284	+
	285	+ MberGrdVO mberGrdVO = new MberGrdVO();
	286	+ // Step 1. 등급제 시행 ON 일경우
	287	+ MberGrdVO mberGrdVO1 = new MberGrdVO();
	288	+ mberGrdVO1 = selectMberSettingDetail(mberGrdVO);
	289	+ System.out.println("Step 1. 등급제 시행 ON 일경우");
	290	+ if (mberGrdVO1.getGrdNoti().equals("Y")) {
	291	+ mberGrdVO = new MberGrdVO();
	292	+
	293	+ // Step 2. 등급 정보 조회
	294	+ mberGrdVO = selectMberGrdInfo(mberId);
	295	+ System.out.println("Step 2. 등급 정보 조회");
	296	+ if (null != mberGrdVO) {
	297	+ if(mberGrdVO.getShortPrice() > 1 && mberGrdVO.getLongPrice() > 1 && mberGrdVO.getPicturePrice() > 1 && mberGrdVO.getPicture2Price() > 1 && mberGrdVO.getPicture3Price() > 1) {
	298	+ sysJoinSetVO.setShortPrice(mberGrdVO.getShortPrice());
	299	+ sysJoinSetVO.setLongPrice(mberGrdVO.getLongPrice());
	300	+ sysJoinSetVO.setPicturePrice(mberGrdVO.getPicturePrice());
	301	+ sysJoinSetVO.setPicture2Price(mberGrdVO.getPicture2Price());
	302	+ sysJoinSetVO.setPicture3Price(mberGrdVO.getPicture3Price());
	303	+ }
	304	+ }
	305	+ }
	306	+ }
	307	+
	308	+ System.out.println("END 등급제 단가 추출 => 시스템 단가에 적용");
	309	+
	310	+ return sysJoinSetVO;
	311	+ }
	312	+
	313	+ // 회원별 등급 적용 Last
	314	+ @Override
	315	+ public void mberGrdSaveByUserLast(MberGrdVO mberGrdVO) throws Exception {
283	316	try {
	317	+ System.out.println("START 회원별 등급 적용");
	318	+ System.out.println("아이디 : " + mberGrdVO.getMberId());
	319	+
284	320	// 현재 날짜 구하기
285	321	LocalDate now = LocalDate.now();
286	322	DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); // 포맷 정의
...	...	@@ -292,15 +328,18 @@
292	328	// Step 1. 등급제 시행 ON 일경우(시행일자 진행여부 Y일경우)
293	329	MberGrdVO mberGrdVO1 = new MberGrdVO();
294	330	mberGrdVO1 = selectMberSettingDetail(mberGrdVO);
	331	+ System.out.println("Step 1. 등급제 시행 ON 일경우(시행일자 진행여부 Y일경우)");
295	332	if (mberGrdVO1.getGrdNoti().equals("Y")) {
296	333	mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate());
297	334
298	335	// Step 2. 문자할인, B선라인, 스팸회원 대상자 제외
299	336	int isMberGrd = selectMberGrdCnt(mberGrdVO.getMberId()); // 등급제 대상여부(1: 대상, 0: 미대상)
	337	+ System.out.println("Step 2. 문자할인, B선라인, 스팸회원 대상자 제외");
300	338	if(isMberGrd == 1) {
301	339	// Step 3. 누적결제금액(이벤트금액 제외) 추출 및 등급 조회
302	340	MberGrdVO mberGrdVO3 = new MberGrdVO();
303	341	mberGrdVO3 = selectMberGrdAmtDetail(mberGrdVO);
	342	+ System.out.println("Step 3. 누적결제금액(이벤트금액 제외) 추출 및 등급 조회");
304	343	if (null != mberGrdVO3) {
305	344	mberGrdVO.setTotAmt(mberGrdVO3.getTotAmt());
306	345	mberGrdVO.setGrdSetNo(mberGrdVO3.getGrdSetNo());
...	...	@@ -308,6 +347,7 @@
308	347	// Step 4. 등급제 설정값 조회
309	348	MberGrdVO mberGrdVO4 = new MberGrdVO();
310	349	mberGrdVO4 = selectMberGrdSettingDetail(mberGrdVO);
	350	+ System.out.println("Step 4. 등급제 설정값 조회");
311	351	if (null != mberGrdVO4) {
312	352	mberGrdVO.setAmt(mberGrdVO.getAmt());
313	353	mberGrdVO.setTotAmt(mberGrdVO.getTotAmt());
...	...	@@ -324,6 +364,7 @@
324	364	// Step 5. 인서트 Or 업데이트
325	365	MberGrdVO mberGrdVO5 = new MberGrdVO();
326	366	mberGrdVO5 = selectMberGrdDetail(mberGrdVO);
	367	+ System.out.println("Step 5. 인서트 Or 업데이트");
327	368	if (null != mberGrdVO5) {
328	369	updateMberGrdOk(mberGrdVO);
329	370
...	...	@@ -341,6 +382,7 @@
341	382	}
342	383	}
343	384	}
	385	+ System.out.println("START 회원별 등급 적용");
344	386	}
345	387	catch (Exception e) {
346	388	// Slack 메시지 발송(단순본문)
...	...	@@ -350,14 +392,16 @@
350	392	System.out.println("#############################################################");
351	393	System.out.println(mberGrdVO.getMberId() + "님 결제중 회원등급 저장 오류");
352	394	}
353		- */
354	395	}
355	396
356		- // 회원별 등급 적용(로그인시 사용 => 히스토리 저장 제외)
	397	+ // 회원별 등급 적용(로그인, 환불시 사용 => 히스토리 저장 제외)
357	398	@Override
358		- public void mberGrdSaveByUserNoHist(MberGrdVO mberGrdVO) throws Exception {
359		- /*
	399	+ public void mberGrdSaveByUserNoHistLast(MberGrdVO mberGrdVO) throws Exception {
	400	+
360	401	try {
	402	+ System.out.println("START 회원별 등급 적용(로그인, 환불시 사용 => 히스토리 저장 제외)");
	403	+ System.out.println("아이디 : " + mberGrdVO.getMberId());
	404	+
361	405	// 현재 날짜 구하기
362	406	LocalDate now = LocalDate.now();
363	407	DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); // 포맷 정의
...	...	@@ -369,15 +413,18 @@
369	413	// Step 1. 등급제 시행 ON 일경우(시행일자 진행여부 Y일경우)
370	414	MberGrdVO mberGrdVO1 = new MberGrdVO();
371	415	mberGrdVO1 = selectMberSettingDetail(mberGrdVO);
	416	+ System.out.println("Step 1. 등급제 시행 ON 일경우(시행일자 진행여부 Y일경우)");
372	417	if (mberGrdVO1.getGrdNoti().equals("Y")) {
373	418	mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate());
374	419
375	420	// Step 2. 문자할인, B선라인, 스팸회원 대상자 제외
376	421	int isMberGrd = selectMberGrdCnt(mberGrdVO.getMberId()); // 등급제 대상여부(1: 대상, 0: 미대상)
	422	+ System.out.println("Step 2. 문자할인, B선라인, 스팸회원 대상자 제외");
377	423	if(isMberGrd == 1) {
378	424	// Step 3. 누적결제금액(이벤트금액 제외) 추출 및 등급 조회
379	425	MberGrdVO mberGrdVO3 = new MberGrdVO();
380	426	mberGrdVO3 = selectMberGrdAmtDetail(mberGrdVO);
	427	+ System.out.println("Step 3. 누적결제금액(이벤트금액 제외) 추출 및 등급 조회");
381	428	if (null != mberGrdVO3) {
382	429	mberGrdVO.setTotAmt(mberGrdVO3.getTotAmt());
383	430	mberGrdVO.setGrdSetNo(mberGrdVO3.getGrdSetNo());
...	...	@@ -385,6 +432,7 @@
385	432	// Step 4. 등급제 설정값 조회
386	433	MberGrdVO mberGrdVO4 = new MberGrdVO();
387	434	mberGrdVO4 = selectMberGrdSettingDetail(mberGrdVO);
	435	+ System.out.println("Step 4. 누적결제금액(이벤트금액 제외) 추출 및 등급 조회");
388	436	if (null != mberGrdVO4) {
389	437	mberGrdVO.setAmt(mberGrdVO.getAmt());
390	438	mberGrdVO.setTotAmt(mberGrdVO.getTotAmt());
...	...	@@ -401,6 +449,7 @@
401	449	// Step 5. 인서트 Or 업데이트
402	450	MberGrdVO mberGrdVO5 = new MberGrdVO();
403	451	mberGrdVO5 = selectMberGrdDetail(mberGrdVO);
	452	+ System.out.println("Step 5. 인서트 Or 업데이트");
404	453	if (null != mberGrdVO5) {
405	454	updateMberGrdOk(mberGrdVO);
406	455	}
...	...	@@ -412,6 +461,7 @@
412	461	}
413	462	}
414	463	}
	464	+ System.out.println("END 회원별 등급 적용(로그인, 환불시 사용 => 히스토리 저장 제외)");
415	465	}
416	466	catch (Exception e) {
417	467	// Slack 메시지 발송(단순본문)
...	...	@@ -421,7 +471,7 @@
421	471	System.out.println("#############################################################");
422	472	System.out.println(mberGrdVO.getMberId() + "님 로그인중 회원등급 저장 오류");
423	473	}
424		- */
	474	+
425	475	}
426	476
427	477	// 회원별 등급제 대상여부
...	...	@@ -460,6 +510,14 @@
460	510	return mberGrdDAO.selectMberGrdSaveCnt(mberId);
461	511	}
462	512
	513	+ // 회원별 등급제 기간내, 최종결제이후 환불총금액
	514	+ @Override
	515	+ public int selectMberGrdRefundSum(String mberId) throws Exception{
	516	+ // 공백제거
	517	+ mberId = mberId.trim();
	518	+
	519	+ return mberGrdDAO.selectMberGrdRefundSum(mberId);
	520	+ }
463	521
464	522	// 회원별 등급 히스토리 등록
465	523	@Override

Delete comment