Commit @f4faea96f6dbfd87c57224025c33fb613f51303f

e40b5ac

f4faea9

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

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

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


 		
 		model.addAttribute("mjonCandidateVO", mjonCandidateVO);
     	
+		/*
     	if(pattern.equals("/web/member/pay/PayListAllAjax.do")) { 
 			// 등급제 Start
 	   		// 회원별 등급 적용

 	   		mberGrdService.mberGrdSaveByUserNoHist(mberGrdVO);    		
 			// End	    	
     	}
+    	*/
     	
     	if(pattern.equals("/web/member/pay/PayListAllAjax.do")
     			|| pattern.equals("/web/member/pay/PayListMobileAjax.do")

e40b5ac

f4faea9

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


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

e40b5ac

f4faea9

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

e40b5ac

f4faea9

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


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

e40b5ac

f4faea9

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

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

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


     	}
     	
     	// 회원별 등급제 기간내, 최종결제이후 환불총금액
-    	int refundSumAfterLastPay = mberGrdService.selectMberGrdRefundSum(mberGrdVO.getMberId());
+    	int refundSumAfterLastPay = mberGrdService.selectMberGrdRefundSumAfterLastPay(mberGrdVO.getMberId());
+    	
+    	// 회원별 등급제 기간내, 최종결제이전 환불총금액
+    	int refundSumBeforeLastPay = mberGrdService.selectMberGrdRefundSumBeforeLastPay(mberGrdVO.getMberId());    	
 
     	List<MberGrdVO> mberGrdHistList =  mberGrdService.selectMberGrdHistByGrdDateList(mberGrdVO);
     	

     	model.addAttribute("grdSetNm", mberGrdVO.getGrdSetNm());
     	model.addAttribute("totAmt", mberGrdVO.getTotAmt());
     	model.addAttribute("refundSumAfterLastPay", refundSumAfterLastPay);
+    	model.addAttribute("refundSumBeforeLastPay", refundSumBeforeLastPay);
     	
     	return "/web/grd/MberGrdHistListAjax";
     }	

e40b5ac

f4faea9

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


 				) S2	
 		) M
 		WHERE M.GRD_SET_NO IS NOT NULL
-			AND M.AMT_SUM > 0
+			/*AND M.AMT_SUM > 0*/
 		LIMIT 1	
 	]]>
 	</select>

 				) S2			
 			) M
 			WHERE M.GRD_SET_NO IS NOT NULL
-				AND M.AMT_SUM > 0
+				/*AND M.AMT_SUM > 0*/
 		) B
 			ON A.MBER_ID = B.USER_ID
 		INNER JOIN MJ_MBER_GRD_SETTING C

 				) S2					
 			) M
 			WHERE M.GRD_SET_NO IS NOT NULL
-				AND M.AMT_SUM > 0
+				/*AND M.AMT_SUM > 0*/
 		) B
 			ON A.MBER_ID = B.USER_ID
 		INNER JOIN MJ_MBER_GRD_SETTING C

 	</select>	
 	
 	<!-- 회원별 등급제 기간내, 최종결제이후 환불총금액 -->
-	<select id="mberGrdDAO.selectMberGrdRefundSum" parameterClass="String" resultClass="Integer">
+	<select id="mberGrdDAO.selectMberGrdRefundSumAfterLastPay" parameterClass="String" resultClass="Integer">
+	<![CDATA[
 		SELECT 
 			IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) refundSum 
 		FROM MJ_REFUND R

 		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>	
 		
+	<!-- 회원별 등급제 기간내, 최종결제이전 환불총금액 -->
+	<select id="mberGrdDAO.selectMberGrdRefundSumBeforeLastPay" parameterClass="String" resultClass="Integer">
+	<![CDATA[
+		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

e40b5ac

f4faea9

src/main/webapp/WEB-INF/jsp/web/grd/MberGrdHistListAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/grd/MberGrdHistListAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/grd/MberGrdHistListAjax.jsp

...	...	@@ -63,17 +63,17 @@
63	63	<table class="tType4">
64	64	<colgroup>
65	65	<col style="width: 50px;">
66		- <col style="width: 40%;">
67		- <col style="width: 20%;">
68		- <col style="width: 20%;">
69		- <col style="width: 20%;">
	66	+ <col style="width: 30%;">
	67	+ <col style="width: 25%;">
	68	+ <col style="width: 26%;">
	69	+ <col style="width: 19%;">
70	70	</colgroup>
71	71	<thead>
72	72	<tr class="level_title">
73	73	<th>구분</th>
74	74	<th>결제일시</th>
75	75	<th>결제금액</th>
76		- <th>누적금액</th>
	76	+ <th>누적금액<c:if test="${refundSumBeforeLastPay > 0}">(환불차감)</c:if></th>
77	77	<th>등급</th>
78	78	</tr>
79	79	</thead>

...	...	@@ -1906,6 +1906,7 @@
1906	1906
1907	1907	model.addAttribute("mjonCandidateVO", mjonCandidateVO);
1908	1908
	1909	+ /*
1909	1910	if(pattern.equals("/web/member/pay/PayListAllAjax.do")) {
1910	1911	// 등급제 Start
1911	1912	// 회원별 등급 적용
...	...	@@ -1916,6 +1917,7 @@
1916	1917	mberGrdService.mberGrdSaveByUserNoHist(mberGrdVO);
1917	1918	// End
1918	1919	}
	1920	+ */
1919	1921
1920	1922	if(pattern.equals("/web/member/pay/PayListAllAjax.do")
1921	1923	\|\| pattern.equals("/web/member/pay/PayListMobileAjax.do")

...	...	@@ -110,7 +110,10 @@
110	110	int selectMberGrdSaveCnt(String mberId) throws Exception;
111	111
112	112	// 회원별 등급제 기간내, 최종결제이후 환불총금액
113		- int selectMberGrdRefundSum(String mberId) throws Exception;
	113	+ int selectMberGrdRefundSumAfterLastPay(String mberId) throws Exception;
	114	+
	115	+ // 회원별 등급제 기간내, 최종결제이전 환불총금액
	116	+ int selectMberGrdRefundSumBeforeLastPay(String mberId) throws Exception;
114	117
115	118	// 회원별 등급 히스토리 등록
116	119	public void insertMberGrdHist(MberGrdVO mberGrdVO) throws Exception;

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

...	...	@@ -518,13 +518,22 @@
518	518
519	519	// 회원별 등급제 기간내, 최종결제이후 환불총금액
520	520	@Override
521		- public int selectMberGrdRefundSum(String mberId) throws Exception{
	521	+ public int selectMberGrdRefundSumAfterLastPay(String mberId) throws Exception{
522	522	// 공백제거
523	523	mberId = mberId.trim();
524	524
525		- return mberGrdDAO.selectMberGrdRefundSum(mberId);
	525	+ return mberGrdDAO.selectMberGrdRefundSumAfterLastPay(mberId);
526	526	}
527	527
	528	+ // 회원별 등급제 기간내, 최종결제이전 환불총금액
	529	+ @Override
	530	+ public int selectMberGrdRefundSumBeforeLastPay(String mberId) throws Exception{
	531	+ // 공백제거
	532	+ mberId = mberId.trim();
	533	+
	534	+ return mberGrdDAO.selectMberGrdRefundSumBeforeLastPay(mberId);
	535	+ }
	536	+
528	537	// 회원별 등급 히스토리 등록
529	538	@Override
530	539	public void insertMberGrdHist(MberGrdVO mberGrdVO) throws Exception {

...	...	@@ -439,7 +439,7 @@
439	439	) S2
440	440	) M
441	441	WHERE M.GRD_SET_NO IS NOT NULL
442		- AND M.AMT_SUM > 0
	442	+ /AND M.AMT_SUM > 0/
443	443	LIMIT 1
444	444	]]>
445	445	</select>
...	...	@@ -665,7 +665,7 @@
665	665	) S2
666	666	) M
667	667	WHERE M.GRD_SET_NO IS NOT NULL
668		- AND M.AMT_SUM > 0
	668	+ /AND M.AMT_SUM > 0/
669	669	) B
670	670	ON A.MBER_ID = B.USER_ID
671	671	INNER JOIN MJ_MBER_GRD_SETTING C
...	...	@@ -734,7 +734,7 @@
734	734	) S2
735	735	) M
736	736	WHERE M.GRD_SET_NO IS NOT NULL
737		- AND M.AMT_SUM > 0
	737	+ /AND M.AMT_SUM > 0/
738	738	) B
739	739	ON A.MBER_ID = B.USER_ID
740	740	INNER JOIN MJ_MBER_GRD_SETTING C
...	...	@@ -951,7 +951,8 @@
951	951	</select>
952	952
953	953	<!-- 회원별 등급제 기간내, 최종결제이후 환불총금액 -->
954		- <select id="mberGrdDAO.selectMberGrdRefundSum" parameterClass="String" resultClass="Integer">
	954	+ <select id="mberGrdDAO.selectMberGrdRefundSumAfterLastPay" parameterClass="String" resultClass="Integer">
	955	+ <![CDATA[
955	956	SELECT
956	957	IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) refundSum
957	958	FROM MJ_REFUND R
...	...	@@ -960,8 +961,23 @@
960	961	AND R.REFUND_DIVISION = '1'
961	962	AND R.REFUND_HANDLE_PNTTM >= (SELECT G.GRD_DATE FROM MJ_MBER_GRD_INFO G WHERE G.MBER_ID = #mberId#)
962	963	AND R.REFUND_HANDLE_PNTTM >= (SELECT MAX(S.REG_DATE) FROM MJ_PG S WHERE S.USER_ID = #mberId# AND S.PG_STATUS = '1')
	964	+ ]]>
963	965	</select>
964	966
	967	+ <!-- 회원별 등급제 기간내, 최종결제이전 환불총금액 -->
	968	+ <select id="mberGrdDAO.selectMberGrdRefundSumBeforeLastPay" parameterClass="String" resultClass="Integer">
	969	+ <![CDATA[
	970	+ SELECT
	971	+ IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) refundSum
	972	+ FROM MJ_REFUND R
	973	+ WHERE R.MBER_ID = #mberId#
	974	+ AND R.REFUND_STATUS = '3'
	975	+ AND R.REFUND_DIVISION = '1'
	976	+ AND R.REFUND_HANDLE_PNTTM >= (SELECT G.GRD_DATE FROM MJ_MBER_GRD_INFO G WHERE G.MBER_ID = #mberId#)
	977	+ AND R.REFUND_HANDLE_PNTTM <= (SELECT MAX(S.REG_DATE) FROM MJ_PG S WHERE S.USER_ID = #mberId# AND S.PG_STATUS = '1')
	978	+ ]]>
	979	+ </select>
	980	+
965	981	<!-- 회원별 등급 히스토리 등록 -->
966	982	<insert id="mberGrdDAO.insertMberGrdHist" parameterClass="mberGrdVO">
967	983	INSERT INTO MJ_MBER_GRD_HIST

...	...	@@ -67,7 +67,10 @@
67	67	}
68	68
69	69	// 회원별 등급제 기간내, 최종결제이후 환불총금액
70		- int refundSumAfterLastPay = mberGrdService.selectMberGrdRefundSum(mberGrdVO.getMberId());
	70	+ int refundSumAfterLastPay = mberGrdService.selectMberGrdRefundSumAfterLastPay(mberGrdVO.getMberId());
	71	+
	72	+ // 회원별 등급제 기간내, 최종결제이전 환불총금액
	73	+ int refundSumBeforeLastPay = mberGrdService.selectMberGrdRefundSumBeforeLastPay(mberGrdVO.getMberId());
71	74
72	75	List<MberGrdVO> mberGrdHistList = mberGrdService.selectMberGrdHistByGrdDateList(mberGrdVO);
73	76
...	...	@@ -78,6 +81,7 @@
78	81	model.addAttribute("grdSetNm", mberGrdVO.getGrdSetNm());
79	82	model.addAttribute("totAmt", mberGrdVO.getTotAmt());
80	83	model.addAttribute("refundSumAfterLastPay", refundSumAfterLastPay);
	84	+ model.addAttribute("refundSumBeforeLastPay", refundSumBeforeLastPay);
81	85
82	86	return "/web/grd/MberGrdHistListAjax";
83	87	}

Delete comment